Merge lp:~laney/ubuntu-app-launch/return-right-type into lp:ubuntu-app-launch/16.04

[Iain Lane]

Use g_return_val_if_fail to not return void from a non-void function

See https://launchpadlibrarian.net/229609911/buildlog_ubuntu-xenial-s390x.ubuntu-app-launch_0.5+15.10.20150817-0ubuntu1_BUILDING.txt.gz

There's a function returning void when it should be gboolean

[Iain Lane (laney)]

btw I uploaded this to xenial to unstick some migrations, feel free to overwrite in the ci train

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Iain Lane (laney)]

this seems the same as https://code.launchpad.net/~mterry/ubuntu-app-launch/fix-ftbfs/+merge/279322

review: Disapprove

Unmerged revisions

209. By Iain Lane on 2015-12-10

Use g_return_val_if_fail to not return void from a non-void function

=== 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-10 17:42:08 +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);