Merge lp:~marcustomlinson/unity-scope-click/fix-scope-dir into lp:unity-scope-click

[Marcus Tomlinson]

Prepend $SNAP to the store scope icon path

[Paweł Stołowski (stolowski)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2016-11-04 13:30:52 +0000
+++ scope/clickapps/apps-query.cpp	2016-11-08 13:42:56 +0000
@@ -308,9 +308,18 @@
 
     const unity::scopes::CannedQuery store_scope(STORE_SCOPE_ID, querystr, querystr.empty() ? query().department_id() : "");
 
+    auto get_snap_path = []() {
+        const char* env_snap = getenv("SNAP");
+        if (env_snap == nullptr) {
+            return "";
+        }
+        return env_snap;
+    };
+    static const std::string SNAP_PATH{get_snap_path()};
+
     scopes::CategorisedResult res(cat);
     res.set_title(title);
-    res.set_art(STORE_DATA_DIR "/store-scope-icon.svg");
+    res.set_art(SNAP_PATH + STORE_DATA_DIR "/store-scope-icon.svg");
     res.set_uri(store_scope.to_uri());
     res[click::apps::Query::ResultKeys::NAME] = title;
     res[click::apps::Query::ResultKeys::DESCRIPTION] = "";