Merge lp:~dobey/unity-scope-click/fallback-app-icon into lp:unity-scope-click

[dobey]

Add the fallback attribute to the result components.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/682/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/82/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/682/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2015-11-24 18:23:23 +0000
+++ scope/clickapps/apps-query.cpp	2016-01-06 18:08:53 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -62,7 +62,8 @@
             "art" : {
                 "field": "art",
                 "aspect-ratio": 1.6,
-                "fill-mode": "fit"
+                "fill-mode": "fit",
+                "fallback": "image://theme/placeholder-app-icon"
             }
         }
     }

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2015-11-24 18:23:23 +0000
+++ scope/clickstore/store-query.cpp	2016-01-06 18:08:53 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -76,7 +76,8 @@
             "attributes": { "field": "attributes", "max-count": 4 },
             "art" : {
                 "field": "art",
-                "aspect-ratio": 1.13
+                "aspect-ratio": 1.13,
+                "fallback": "image://theme/placeholder-app-icon"
             }
         }
     }
@@ -95,7 +96,8 @@
             "attributes": { "field": "attributes", "max-count": 1 },
             "art" : {
                 "field": "art",
-                "aspect-ratio": 0.55
+                "aspect-ratio": 0.55,
+                "fallback": "image://theme/placeholder-app-icon"
             }
         }
     }
@@ -114,7 +116,8 @@
         "attributes": { "field": "attributes", "max-count": 4 },
         "art": {
             "aspect-ratio": 2.5,
-            "field": "art"
+            "field": "art",
+            "fallback": "image://theme/placeholder-app-icon"
         }
     }
 })";
@@ -132,7 +135,8 @@
             "title" : "title",
             "art" : {
                 "field": "art",
-                "aspect-ratio": 1.13
+                "aspect-ratio": 1.13,
+                "fallback": "image://theme/placeholder-app-icon"
             },
             "subtitle": "subtitle",
             "attributes": { "field": "attributes", "max-count": 3 }