Merge lp:~charlesk/hud/lp-1244688 into lp:hud/13.10

Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 341
Merged at revision: 343
Proposed branch: lp:~charlesk/hud/lp-1244688
Merge into: lp:hud/13.10
Diff against target: 22 lines (+4/-1)
1 file modified
src/service.c (+4/-1)
To merge this branch: bzr merge lp:~charlesk/hud/lp-1244688
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+192925@code.launchpad.net

Description of the change

If we can't get the busname, log a g_critical and then exit gracefully instead of abort()ing in g_error.

To post a comment you must log in.
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
=== modified file 'src/service.c'
--- src/service.c 2013-10-08 10:21:35 +0000
+++ src/service.c 2013-10-28 18:27:20 +0000
@@ -18,6 +18,8 @@
1818
19#define G_LOG_DOMAIN "hud-service"19#define G_LOG_DOMAIN "hud-service"
2020
21#include <stdlib.h> /* exit() */
22
21#include <glib.h>23#include <glib.h>
22#include <gio/gio.h>24#include <gio/gio.h>
23#include <glib/gi18n.h>25#include <glib/gi18n.h>
@@ -729,7 +731,8 @@
729 gpointer user_data)731 gpointer user_data)
730{732{
731 g_main_loop_quit (mainloop);733 g_main_loop_quit (mainloop);
732 g_error ("Unable to get name '%s'", name);734 g_critical ("Unable to get name '%s'", name);
735 exit (0);
733}736}
734737
735static void738static void

Subscribers

People subscribed via source and target branches