Merge lp:~ken-vandine/content-hub/desktop_file_less into lp:content-hub

[Ken VanDine]

Updated the exec-tool helper to fall back to building the exec line manually when no desktop files are installed. Dropped desktop file from content-hub-peer-picker

Updated the exec-tool helper to fall back to building the exec line manually when no desktop files are installed. Dropped desktop file from content-hub-peer-picker

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

FAILED: Continuous integration, rev:320
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/1/
Executed test runs:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/1/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

320. By Ken VanDine on 2017-02-16

merged ual_cpp_multi_instance branch

319. By Ken VanDine on 2017-02-16

Updated the exec-tool helper to fall back to building the exec line manually when no desktop files are installed. Dropped desktop file from content-hub-peer-picker

318. By Ken VanDine on 2017-02-16

Updated the exec-tool helper to fall back to building the exec line manually if there is no desktop file installed

=== modified file 'debian/content-hub.install'
--- debian/content-hub.install	2016-12-07 16:36:53 +0000
+++ debian/content-hub.install	2017-02-16 21:05:41 +0000
@@ -9,7 +9,6 @@
 usr/share/glib-2.0/schemas
 usr/share/locale/*/LC_MESSAGES/content-hub.mo
 usr/share/applications/content-hub-send.desktop
-usr/share/applications/content-hub-peer-picker.desktop
 usr/share/url-dispatcher/urls/content-hub-send.url-dispatcher
 usr/share/content-hub/icons
 debian/apparmor/content-hub-peer-picker etc/apparmor.d

=== modified file 'src/helper/exec-tool.c'
--- src/helper/exec-tool.c	2016-11-09 17:55:06 +0000
+++ src/helper/exec-tool.c	2017-02-16 21:05:41 +0000
@@ -144,6 +144,15 @@
         }
 
         if (exec == NULL) {
+                const gchar * snapdir = g_getenv("SNAP");
+                if (snapdir != NULL) {
+                        exec = g_build_filename(snapdir, "bin", appid,  NULL);
+                } else {
+                        exec = g_build_filename("/", "usr", "bin", appid, NULL);
+                }
+        }
+
+        if (exec == NULL) {
                 const gchar * props[3] = {
                         "AppID",
                         appid,

=== modified file 'tools/peer-picker/CMakeLists.txt'
--- tools/peer-picker/CMakeLists.txt	2016-11-17 19:38:37 +0000
+++ tools/peer-picker/CMakeLists.txt	2017-02-16 21:05:41 +0000
@@ -39,8 +39,3 @@
   TARGETS content-hub-peer-picker
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
-
-install(
-  FILES content-hub-peer-picker.desktop
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
-)

=== removed file 'tools/peer-picker/content-hub-peer-picker.desktop'
--- tools/peer-picker/content-hub-peer-picker.desktop	2016-11-16 18:25:30 +0000
+++ tools/peer-picker/content-hub-peer-picker.desktop	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Content Hub Peer Picker
-Comment=Content Hub Peer Picker
-Exec=content-hub-peer-picker %U
-Icon=
-Terminal=false
-Type=Application
-OnlyShowIn=Old
-X-Ubuntu-Touch=true
-X-Ubuntu-Single-Instance=false
-X-Ubuntu-Splash-Show-Header=true
-X-Ubuntu-Splash-Title=Choose from