Merge lp:~ted/indicator-session/lp740382 into lp:indicator-session/0.1

Proposed by Ted Gould on 2011-09-27
Status: Merged
Merged at revision: 220
Proposed branch: lp:~ted/indicator-session/lp740382
Merge into: lp:indicator-session/0.1
Diff against target: 27 lines (+3/-1)
1 file modified
src/gtk-logout-helper.c (+3/-1)
To merge this branch: bzr merge lp:~ted/indicator-session/lp740382
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve on 2011-09-27
Indicator Applet Developers 2011-09-27 Pending
Review via email: mp+77176@code.launchpad.net

Description of the change

Fixing and abort and adding an INVALID to the params so we have the proper
two so that we should get less errors that cause the abort.

To post a comment you must log in.
Andrea Cimitan (cimi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gtk-logout-helper.c'
2--- src/gtk-logout-helper.c 2011-09-08 03:09:01 +0000
3+++ src/gtk-logout-helper.c 2011-09-27 14:58:23 +0000
4@@ -55,6 +55,7 @@
5 dbus_g_proxy_call(proxy,
6 "Stop",
7 &error,
8+ G_TYPE_INVALID,
9 G_TYPE_INVALID);
10 break;
11 case LOGOUT_DIALOG_TYPE_RESTART:
12@@ -62,6 +63,7 @@
13 dbus_g_proxy_call(proxy,
14 "Restart",
15 &error,
16+ G_TYPE_INVALID,
17 G_TYPE_INVALID);
18 break;
19 default:
20@@ -72,7 +74,7 @@
21 g_object_unref(proxy);
22
23 if (error != NULL) {
24- g_error("Unable to signal ConsoleKit");
25+ g_warning("Unable to signal ConsoleKit");
26 g_error_free(error);
27 }
28

Subscribers

People subscribed via source and target branches