Merge lp:~mhr3/unity-scope-home/fix-1223940 into lp:unity-scope-home

[Michal Hruby]

Support non-FileIcons coming from the smart scopes server.

Support non-FileIcons coming from the smart scopes server.

[Paweł Stołowski (stolowski)]

LGTM, +1.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/smart-scopes-default-parser.vala'
--- src/smart-scopes-default-parser.vala	2013-08-16 14:56:38 +0000
+++ src/smart-scopes-default-parser.vala	2013-09-11 15:37:08 +0000
@@ -39,16 +39,9 @@
       if (result_uri.has_prefix("scopes-query"))
         result_uri = "x-unity-no-preview-" + result_uri;
 
-      string? image_uri = null;
+      string? icon_hint = null;
       if (result_dict.has_member ("icon_hint"))
-        image_uri = result_dict.get_string_member ("icon_hint");
-
-      Icon? icon = null;
-      if (image_uri != null && image_uri != "")
-      {
-        var file = File.new_for_uri (image_uri);
-        icon = new FileIcon (file);
-      }
+        icon_hint = result_dict.get_string_member ("icon_hint");
 
       Variant? metadata_var = null;
       try
@@ -65,15 +58,17 @@
         metadata_var = new Variant.array (VariantType.VARDICT.element (), {} );
       }
 
+      var uri_variant = new Variant.string (result_uri);
+
       Variant row[9] = {
-        result_uri,
-        icon != null ? icon.to_string () : "",
+        uri_variant,
+        new Variant.string (icon_hint != null ? icon_hint : ""),
         new Variant.uint32 (0), //global category
         new Variant.uint32 (Unity.ResultType.DEFAULT),
         new Variant.string ("text/html"),
         new Variant.string (result_dict.get_string_member ("title")),
         new Variant.string (result_dict.has_member ("comment") ? result_dict.get_string_member ("comment") : ""),
-        new Variant.string (result_uri),
+        uri_variant,
         metadata_var
       };