Merge lp:~charlesk/indicator-datetime/lp-1238737 into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

Proposed by Charles Kerr on 2013-10-16
Status: Merged
Approved by: Lars Karlitski on 2013-10-16
Approved revision: 273
Merged at revision: 274
Proposed branch: lp:~charlesk/indicator-datetime/lp-1238737
Merge into: lp:~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 13 lines (+0/-3)
1 file modified
src/service.c (+0/-3)
To merge this branch: bzr merge lp:~charlesk/indicator-datetime/lp-1238737
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-10-16
Lars Karlitski (community) 2013-10-16 Approve on 2013-10-16
Review via email: mp+191429@code.launchpad.net

Commit message

Remove the g_error() call that caused an abort() in the call to on_name_lost() in our bus handler.

Description of the change

Remove the g_error() call that caused an abort() in the call to on_name_lost() in our bus handler.

The g_error() is there because we thought this case shouldn't happen, but there is a valid case for it when the greeter's bus is force-closed. So when this is reached we should just exit gracefully.

To post a comment you must log in.
Lars Karlitski (larsu) wrote :

Thanks!

review: Approve
review: Approve (continuous-integration)

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-15 19:44:23 +0000
3+++ src/service.c 2013-10-16 14:54:25 +0000
4@@ -1815,9 +1815,6 @@
5 {
6 IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE (gself);
7
8- if (connection == NULL)
9- g_error ("Unable to get bus connection to own name '%s'", name);
10-
11 g_debug ("%s %s name lost %s", G_STRLOC, G_STRFUNC, name);
12
13 unexport (self);

Subscribers

People subscribed via source and target branches