Merge lp:~stolowski/unity-lens-applications/preview-installable-app-icon into lp:unity-lens-applications

[Paweł Stołowski]

When displaying a preview for installable app, look for icon in /usr/share/app-install/icons.

When displaying a preview for installable app, look for icon in /usr/share/app-install/icons.

[lp:~stolowski/unity-lens-applications/preview-installable-app-icon]

299. By Paweł Stołowski on 2012-09-13

Use FileIcon for installable apps, ThemedIcon for installed apps.

[Michal Hruby (mhr3)]

Cool, looks good!

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-13 11:16:15 +0000
+++ src/daemon.vala	2012-09-13 14:32:19 +0000
@@ -730,13 +730,11 @@
     }
 
     /**
-     * Find app icon in DATADIR/app-install/icons based on preview_installable_icon_file
-     * obtained from S-C data provider.
-     * trying all supported image extensions.
+     * Find app icon in DATADIR/app-install/icons trying all supported image extensions.
      */
-    private string find_app_install_icon_path ()
+    private string find_app_install_icon_path (string icon_name)
     {
-      string icon = @"$ICON_APP_INSTALL_PATH/$preview_installable_icon_file.";
+      string icon = @"$ICON_APP_INSTALL_PATH/$icon_name.";
 
       foreach (string ext in image_extensions)
       {
@@ -1016,7 +1014,7 @@
 
               launcherservice.connect_to_launcher ();
               string desktop_file = preview_installable_desktop_file;
-              string icon = find_app_install_icon_path ();
+              string icon = find_app_install_icon_path (preview_installable_icon_file);
               
               launcherservice.add_launcher_item_from_position (appname, icon, 0, 0, 32, desktop_file, tid);
             }
@@ -1122,11 +1120,12 @@
 
       string pkgname = "";
       string appname = "";
+      bool installed = uri.has_prefix ("application://");
 
-      if (uri.has_prefix ("application://") || uri.has_prefix ("unity-install://"))
+      if (installed || uri.has_prefix ("unity-install://"))
       {
         string desktopfile = null;
-        if (uri.has_prefix ("application://"))
+        if (installed)
         {
           desktopfile = uri.substring (14); //remove "application://" prefix
 
@@ -1166,7 +1165,12 @@
             debug ("Requesting pkg info: %s, %s\n", pkgname, appname);
             sc_data_provider.get_app_details (appname, pkgname);
 
-            Icon icon = new GLib.ThemedIcon (sc_data_provider.icon);         
+            Icon icon;
+            if (installed)
+              icon = new GLib.ThemedIcon (sc_data_provider.icon);
+            else
+              icon = new GLib.FileIcon (File.new_for_path (find_app_install_icon_path (sc_data_provider.icon)));
+
             Icon? screenshot = null;
 
             if (sc_data_provider.screenshot != null)