[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [muon] libmuon: Have App::screenshotUrl fall back to trying extras.ubuntu.com package's screenshot u
From:       Jonathan Thomas <echidnaman () kubuntu ! org>
Date:       2012-03-31 17:12:32
Message-ID: 20120331171232.9CE89A60BB () git ! kde ! org
[Download RAW message or body]

Git commit 9a355f5da534e68a27f83948cf40b49982346f30 by Jonathan Thomas.
Committed on 31/03/2012 at 19:11.
Pushed by jmthomas into branch 'master'.

Have App::screenshotUrl fall back to trying extras.ubuntu.com package's screenshot \
url if a thumbnail isn't available.

M  +6    -1    libmuon/Application.cpp

http://commits.kde.org/muon/9a355f5da534e68a27f83948cf40b49982346f30

diff --git a/libmuon/Application.cpp b/libmuon/Application.cpp
index b6c5720..4c92e23 100644
--- a/libmuon/Application.cpp
+++ b/libmuon/Application.cpp
@@ -268,9 +268,14 @@ QString Application::categories()
 KUrl Application::screenshotUrl(QApt::ScreenshotType type)
 {
     QString appUrl;
+    KUrl url;
+
+    // Try to get a screenshot for extras.ubuntu.com packages
     switch (type) {
     case QApt::Thumbnail:
         appUrl = package()->controlField(QLatin1String("Thumbnail-Url"));
+        if (appUrl.isEmpty()) // Fallback, some extras.ubuntu.com don't have \
thumbnails +            appUrl = \
package()->controlField(QLatin1String("Screenshot-Url"));  break;
     case QApt::Screenshot:
         appUrl = package()->controlField(QLatin1String("Screenshot-Url"));
@@ -279,7 +284,7 @@ KUrl Application::screenshotUrl(QApt::ScreenshotType type)
         break;
     }
 
-    KUrl url;
+    // Otherwise, just check screenshots.debian.net
     if (appUrl.isEmpty()) {
         url = package()->screenshotUrl(type);
     } else {


[prev in list] [next in list] [prev in thread] [next in thread]