Merge lp:~mterry/ubuntu-app-launch/fix-ftbfs into lp:ubuntu-app-launch/16.04

[Ted Gould]

Fix build by correcting typo in function name.

Without this change, you see the following error:

/usr/include/glib-2.0/glib/gmessages.h:373:3: error: ‘return’ with no value, in function returning non-void [-Werror]
   return; \
   ^
/home/mike/Work/code/ubuntu-app-launch/warn-on-xapp/libubuntu-app-launch/ubuntu-app-launch.c:2406:2: note: in expansion of macro ‘g_return_if_fail’
  g_return_if_fail(job_name != NULL);
  ^

Fix build by correcting typo in function name.

Without this change, you see the following error:

/usr/include/glib-2.0/glib/gmessages.h:373:3: error: ‘return’ with no value, in function returning non-void [-Werror]
   return; \
   ^
/home/mike/Work/code/ubuntu-app-launch/warn-on-xapp/libubuntu-app-launch/ubuntu-app-launch.c:2406:2: note: in expansion of macro ‘g_return_if_fail’
  g_return_if_fail(job_name != NULL);
  ^

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/20/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/25/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'libubuntu-app-launch/ubuntu-app-launch.c'
--- libubuntu-app-launch/ubuntu-app-launch.c	2015-08-17 21:38:29 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.c	2015-12-02 17:46:05 +0000
@@ -2403,7 +2403,7 @@
 	const gchar * job_name = g_getenv("UPSTART_JOB");
 	const gchar * instance_name = g_getenv("UPSTART_INSTANCE");
 	const gchar * demangler = g_getenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME");
-	g_return_if_fail(job_name != NULL);
+	g_return_val_if_fail(job_name != NULL, FALSE);
 
 	GError * error = NULL;
 	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);