Merge lp:~ken-vandine/ubuntu-system-settings/lp1501428 into lp:ubuntu-system-settings

[Ken VanDine]

Use ubuntu_app_launch_application_info to get the proper desktop file

Use ubuntu_app_launch_application_info to get the proper desktop file

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1540
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2422/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4454/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/197/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/606/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4451/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2422/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

I think there has to be a changelog for the debian/ changes.

Unmerged revisions

1540. By Ken VanDine on 2015-10-01

convert short id to proper app_id

1539. By Ken VanDine on 2015-09-30

Build depend on libubuntu-app-launch2-dev

1538. By Ken VanDine on 2015-09-30

Use ubuntu_app_launch_application_info to get the proper desktop file

=== modified file 'debian/control'
--- debian/control	2015-09-18 14:20:22 +0000
+++ debian/control	2015-10-01 13:50:39 +0000
@@ -20,6 +20,7 @@
                libqmenumodel-dev,
                libtimezonemap1-dev (>= 0.4.1),
                libtrust-store-dev,
+               libubuntu-app-launch2-dev,
                libunity-api-dev,
                libupower-glib-dev,
                pkg-config,

=== modified file 'plugins/security-privacy/CMakeLists.txt'
--- plugins/security-privacy/CMakeLists.txt	2015-05-21 13:32:41 +0000
+++ plugins/security-privacy/CMakeLists.txt	2015-10-01 13:50:39 +0000
@@ -47,10 +47,12 @@
 qt5_use_modules(UbuntuSecurityPrivacyPanel Qml Quick DBus)
 
 pkg_check_modules(TRUST_STORE REQUIRED trust-store)
+pkg_check_modules(UBUNTU_LAUNCH REQUIRED ubuntu-app-launch-2)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${TRUST_STORE_INCLUDE_DIRS}
+    ${UBUNTU_LAUNCH_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
 )
 
@@ -60,6 +62,7 @@
     ${ACCOUNTSSERVICE_LDFLAGS}
     ${GOBJECT_LDFLAGS}
     ${TRUST_STORE_LDFLAGS}
+    ${UBUNTU_LAUNCH_LDFLAGS}
     ${GLIB_LDFLAGS}
 )
 install(TARGETS UbuntuSecurityPrivacyPanel UbuntuSecurityPrivacyHelper DESTINATION ${PLUG_DIR})

=== modified file 'plugins/security-privacy/trust-store-model.cpp'
--- plugins/security-privacy/trust-store-model.cpp	2015-03-16 13:51:36 +0000
+++ plugins/security-privacy/trust-store-model.cpp	2015-10-01 13:50:39 +0000
@@ -31,6 +31,7 @@
 #include <core/trust/store.h>
 
 #include <glib.h>
+#include <ubuntu-app-launch.h>
 
 class Application
 {
@@ -83,27 +84,25 @@
     }
 
     QString resolveDesktopFilename(const QString &id) {
-        QString localShare =
-            QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-        QString desktopFilename(QString("%1/applications/%2.desktop").
-                                arg(localShare).arg(id));
-        if (QFile(desktopFilename).exists())
-            return desktopFilename;
-
-        /* search the directory for a matching filename */
-        QDir dir(QString("%1/applications").arg(localShare));
-        dir.setFilter(QDir::Files);
-        QStringList fileList = dir.entryList();
-        QString pattern = QString("%1*.desktop").arg(id);
-        for (int i = 0; i < fileList.count(); i++) {
-            /* stop at the first match */
-            if (QDir::match(pattern, fileList[i])) {
-                return QString("%1/applications/%2").arg(localShare).arg(fileList[i]);
-            }
+        char * dir = nullptr;
+        char * file = nullptr;
+
+        QString fileName;
+        std::string appId;
+
+        appId = std::string(ubuntu_app_launch_triplet_to_app_id(id.toStdString().c_str(),
+                                                                "first-listed-app",
+                                                                "current-user-version"));
+
+        if (ubuntu_app_launch_application_info(appId.c_str(), &dir, &file)) {
+            fileName = QString::fromUtf8(g_strjoin("/", dir, file, NULL));
+        } else {
+            qWarning() << "No desktop file found for app id: " << id;
         }
 
-        qWarning() << "No desktop file found for app id: " << id;
-        return QString();
+        g_free (dir);
+        g_free (file);
+        return fileName;
     }
 
     QString resolveIcon(const QString &iconName, const QString &basePath) {

=== modified file 'tests/plugins/security-privacy/CMakeLists.txt'
--- tests/plugins/security-privacy/CMakeLists.txt	2014-09-29 11:02:28 +0000
+++ tests/plugins/security-privacy/CMakeLists.txt	2015-10-01 13:50:39 +0000
@@ -1,11 +1,12 @@
 set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../../plugins/security-privacy ${GLIB_INCLUDE_DIRS})
+pkg_check_modules(UBUNTU_LAUNCH REQUIRED ubuntu-app-launch-2)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../../plugins/security-privacy ${GLIB_INCLUDE_DIRS} ${UBUNTU_LAUNCH_INCLUDE_DIRS})
 add_definitions(-DTESTS)
 
 add_executable(tst-trust-store-model
     tst_trust_store_model.cpp
     ../../../plugins/security-privacy/trust-store-model.cpp
 )
-target_link_libraries (tst-trust-store-model ${GLIB_LDFLAGS})
+target_link_libraries (tst-trust-store-model ${GLIB_LDFLAGS} ${UBUNTU_LAUNCH_LDFLAGS})
 qt5_use_modules(tst-trust-store-model Core Gui DBus Qml Test)
 add_test(NAME tst-trust-store-model COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-trust-store-model)