Merge lp:~lool/ubuntu-app-launch/desktop-file-hint-for-mir into lp:ubuntu-app-launch/13.10

[Loïc Minier]

Also pass --desktop_file_hint= in the Mir case; LP: #1232588.

Also pass --desktop_file_hint= in the Mir case; LP: #1232588.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-saucy-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-saucy-armhf-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-saucy-i386-ci/104

Click here to trigger a rebuild:
http://s-jenkins:8080/job/upstart-app-launch-ci/104/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

As per the discussion on the bug it doesn't seem this is needed. Marking as "Rejected" as we have no nicer option.

Unmerged revisions

69. By Loïc Minier on 2013-09-28

Also pass --desktop_file_hint= in the Mir case; LP: #1232588.

=== modified file 'application-click.conf.in'
--- application-click.conf.in	2013-09-23 17:19:20 +0000
+++ application-click.conf.in	2013-09-28 22:56:44 +0000
@@ -15,13 +15,7 @@
 
 apparmor switch ${APP_ID}
 
-pre-start script
-	if pgrep -u system surfaceflinger ; then
-		initctl set-env USING_SURFACE_FLINGER=1
-	fi
-
-	exec @pkglibexecdir@/click-exec
-end script
+pre-start exec @pkglibexecdir@/click-exec
 
 # Remember, this is confined
 exec @pkglibexecdir@/exec-line-exec

=== modified file 'application-legacy.conf.in'
--- application-legacy.conf.in	2013-09-23 17:19:20 +0000
+++ application-legacy.conf.in	2013-09-28 22:56:44 +0000
@@ -16,13 +16,7 @@
 # This will be set to "unconfined" by desktop-exec if there is no confinement defined
 apparmor switch $APP_EXEC_POLICY
 
-pre-start script
-	if pgrep -u system surfaceflinger ; then
-		initctl set-env USING_SURFACE_FLINGER=1
-	fi
-
-	exec @pkglibexecdir@/desktop-exec
-end script
+pre-start exec @pkglibexecdir@/desktop-exec
 
 exec @pkglibexecdir@/exec-line-exec
 

=== modified file 'exec-line-exec.c'
--- exec-line-exec.c	2013-09-23 19:42:54 +0000
+++ exec-line-exec.c	2013-09-28 22:56:44 +0000
@@ -65,8 +65,8 @@
 		return 1;
 	}
 
-	/* Surface flinger check */
-	if (g_getenv("USING_SURFACE_FLINGER") != NULL && app_desktop != NULL) {
+	/* --desktop_file_hint to identify a process as belonging to an app */
+	if (app_desktop != NULL) {
 		gchar * sf = g_strdup_printf("--desktop_file_hint=%s", app_desktop);
 		g_array_append_val(newargv, sf);
 	}