Unity HUD

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

  1. lp-1244688
  2. Merge into trunk.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 :

PASSED: Continuous integration, rev:341
http://jenkins.qa.ubuntu.com/job/hud-13.10-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-i386-ci/2

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/hud-13.10-ci/2/rebuild

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 'src/service.c'
2--- src/service.c 2013-10-08 10:21:35 +0000
3+++ src/service.c 2013-10-28 18:27:20 +0000
4@@ -18,6 +18,8 @@
5
6 #define G_LOG_DOMAIN "hud-service"
7
8+#include <stdlib.h> /* exit() */
9+
10 #include <glib.h>
11 #include <gio/gio.h>
12 #include <glib/gi18n.h>
13@@ -729,7 +731,8 @@
14 gpointer user_data)
15 {
16 g_main_loop_quit (mainloop);
17- g_error ("Unable to get name '%s'", name);
18+ g_critical ("Unable to get name '%s'", name);
19+ exit (0);
20 }
21
22 static void

Subscribers

People subscribed via source and target branches