Merge lp:~renatofilho/dialer-app/fix-snap-path into lp:dialer-app

[Renato Araujo Oliveira Filho]

Append "SNAP" path into the base application path, when that var is set.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:557
https://jenkins.canonical.com/system-apps/job/lp-dialer-app-ci/28/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1992/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1995
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1825/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1825/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1825/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-dialer-app-ci/28/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'config.h.in'
--- config.h.in	2014-05-28 20:27:06 +0000
+++ config.h.in	2016-11-17 13:04:41 +0000
@@ -27,6 +27,7 @@
 #include <QtDBus/QDBusReply>
 
 #define I18N_DIRECTORY "@CMAKE_INSTALL_PREFIX@/share/locale"
+#define SNAP_PATH       "SNAP"
 
 inline bool isRunningInstalled() {
     static bool installed = (QCoreApplication::applicationDirPath() ==
@@ -35,7 +36,9 @@
 }
 
 inline QString dialerAppDirectory() {
-    if (isRunningInstalled()) {
+    if (qEnvironmentVariableIsSet(SNAP_PATH)) {
+        return QString("%1/@CMAKE_INSTALL_PREFIX@/@DIALER_APP_DIR@/").arg(QString(qgetenv(SNAP_PATH)));
+    } else if (isRunningInstalled()) {
         return QString("@CMAKE_INSTALL_PREFIX@/@DIALER_APP_DIR@/");
     } else {
         return QString("@CMAKE_SOURCE_DIR@/src/qml/");
@@ -43,7 +46,7 @@
 }
 
 inline QString ubuntuPhonePluginPath() {
-    if (isRunningInstalled()) {
+    if (isRunningInstalled() || qEnvironmentVariableIsSet(SNAP_PATH)) {
         return QString::null;
     } else {
         return QString("@CMAKE_SOURCE_DIR@/");