Merge lp:~dobey/indicator-transfer/snap-plugins-dir into lp:indicator-transfer

[dobey]

Load plug-ins from $SNAP path too.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:48
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-transfer-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1229
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1236
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1019
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1019/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1019
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1019/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1019
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1019/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1019
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1019/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1019
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1019/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1019
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1019/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-transfer-ci/12/rebuild

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'src/plugin-source.cpp'
--- src/plugin-source.cpp	2015-07-29 19:26:12 +0000
+++ src/plugin-source.cpp	2016-12-02 21:42:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 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
@@ -36,9 +36,19 @@
   Impl(PluginSource& owner, const std::string& plugin_dir):
     m_owner(owner)
   {
+    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()};
+    std::string real_path = SNAP_PATH + plugin_dir;
+
     GError * error = nullptr;
-    g_debug("plugin_dir '%s'", plugin_dir.c_str());
-    GDir * dir = g_dir_open(plugin_dir.c_str(), 0, &error);
+    g_debug("plugin_dir '%s'", real_path.c_str());
+    GDir * dir = g_dir_open(real_path.c_str(), 0, &error);
     if (dir != nullptr)
     {
       const gchar * name;
@@ -46,7 +56,7 @@
       {
         if (g_str_has_suffix(name, G_MODULE_SUFFIX))
         {
-          gchar * filename = g_build_filename(plugin_dir.c_str(), name, nullptr);
+          gchar * filename = g_build_filename(real_path.c_str(), name, nullptr);
           GModule * mod = g_module_open(filename, G_MODULE_BIND_LOCAL);
           gpointer symbol {};