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

Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 209
Merged at revision: 209
Proposed branch: lp:~mterry/ubuntu-app-launch/fix-ftbfs
Merge into: lp:ubuntu-app-launch/16.04
Diff against target: 12 lines (+1/-1)
1 file modified
libubuntu-app-launch/ubuntu-app-launch.c (+1/-1)
To merge this branch: bzr merge lp:~mterry/ubuntu-app-launch/fix-ftbfs
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+279322@code.launchpad.net

This proposal supersedes a proposal from 2015-11-23.

Commit message

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);
  ^

Description of the change

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);
  ^

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntu-app-launch/ubuntu-app-launch.c'
2--- libubuntu-app-launch/ubuntu-app-launch.c 2015-08-17 21:38:29 +0000
3+++ libubuntu-app-launch/ubuntu-app-launch.c 2015-12-02 17:46:05 +0000
4@@ -2403,7 +2403,7 @@
5 const gchar * job_name = g_getenv("UPSTART_JOB");
6 const gchar * instance_name = g_getenv("UPSTART_INSTANCE");
7 const gchar * demangler = g_getenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME");
8- g_return_if_fail(job_name != NULL);
9+ g_return_val_if_fail(job_name != NULL, FALSE);
10
11 GError * error = NULL;
12 GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);

Subscribers

People subscribed via source and target branches