Merge lp:~renatofilho/messaging-app/fix-snap-paths into lp:messaging-app

[Renato Araujo Oliveira Filho]

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

[lp:~renatofilho/messaging-app/fix-snap-paths]

607. By Renato Araujo Oliveira Filho on 2016-11-17

Fix check for installed app.

608. By Renato Araujo Oliveira Filho on 2016-11-17

Convert QByteArray to QString to avoid problems with function signature.

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

FAILED: Continuous integration, rev:606
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/153/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1991/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1994
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1824/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1824/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1824/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1824/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1824/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1824/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1824/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1824/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1824/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:608
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/154/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1993
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/475
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1996
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1826
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1826
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1826
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1826
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1826
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1826
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1826
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1826
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1826
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1826/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'config.h.in'
--- config.h.in	2016-01-19 17:44:27 +0000
+++ config.h.in	2016-11-17 13:01:48 +0000
@@ -28,6 +28,7 @@
 
 #define I18N_DIRECTORY "@CMAKE_INSTALL_PREFIX@/share/locale"
 #define UNITY8_QML_PATH "@UNITY8_QML_PATH@"
+#define SNAP_PATH       "SNAP"
 
 inline bool isRunningInstalled() {
     static bool installed = (QCoreApplication::applicationDirPath() ==
@@ -36,7 +37,9 @@
 }
 
 inline QString messagingAppDirectory() {
-    if (isRunningInstalled()) {
+    if (qEnvironmentVariableIsSet(SNAP_PATH)) {
+        return QString("%1/@CMAKE_INSTALL_PREFIX@/@MESSAGING_APP_DIR@/").arg(QString(qgetenv(SNAP_PATH)));
+    } else if (isRunningInstalled()) {
         return QString("@CMAKE_INSTALL_PREFIX@/@MESSAGING_APP_DIR@/");
     } else {
         return QString("@CMAKE_SOURCE_DIR@/src/qml/");
@@ -44,7 +47,7 @@
 }
 
 inline QString ubuntuPhonePluginPath() {
-    if (isRunningInstalled()) {
+    if (isRunningInstalled() || qEnvironmentVariableIsSet(SNAP_PATH)) {
         return QString::null;
     } else {
         return QString("@CMAKE_SOURCE_DIR@/");