1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
=== modified file 'configure.ac'
--- configure.ac 2012-11-16 18:13:45 +0000
+++ configure.ac 2012-11-29 22:09:57 +0000
@@ -46,7 +46,6 @@
PKG_CHECK_MODULES(SESSIONSERVICE, glib-2.0 >= $GLIB_REQUIRED_VERSION
dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- dbus-glib-1
gio-unix-2.0
indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
packagekit-glib2)
=== modified file 'src/gtk-logout-helper.c'
--- src/gtk-logout-helper.c 2012-06-20 19:33:06 +0000
+++ src/gtk-logout-helper.c 2012-11-29 22:09:57 +0000
@@ -26,109 +26,123 @@
#include <locale.h>
#include <glib.h>
#include <glib/gi18n.h> /* textdomain(), bindtextdomain() */
-#include <dbus/dbus-glib.h>
#include <gtk/gtk.h>
#include "dialog.h"
#include "shared-names.h"
+static GVariant *
+call_console_kit (const gchar *method, GVariant *parameters, GError **error)
+{
+ GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, error);
+ if (!bus)
+ {
+ g_variant_unref (parameters);
+ return NULL;
+ }
+
+ GVariant *result = g_dbus_connection_call_sync(bus,
+ "org.freedesktop.ConsoleKit",
+ "/org/freedesktop/ConsoleKit/Manager",
+ "org.freedesktop.ConsoleKit.Manager",
+ method,
+ parameters,
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ error);
+ g_object_unref (bus);
+
+ return result;
+}
+
static void
consolekit_fallback (LogoutDialogType action)
{
+ GError * error = NULL;
+ GVariant *result = NULL;
+
g_debug("Falling back to using ConsoleKit for action");
- DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
- g_return_if_fail(sbus != NULL); /* worst case */
- DBusGProxy * proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
- "/org/freedesktop/ConsoleKit/Manager",
- "org.freedesktop.ConsoleKit.Manager");
-
- if (proxy == NULL) {
- g_warning("Unable to get consolekit proxy");
- return;
- }
-
- GError * error = NULL;
-
switch (action) {
case LOGOUT_DIALOG_TYPE_LOG_OUT:
g_warning("Unable to fallback to ConsoleKit for logout as it's a session issue. We need some sort of session handler.");
break;
case LOGOUT_DIALOG_TYPE_SHUTDOWN:
g_debug("Telling ConsoleKit to 'Stop'");
- dbus_g_proxy_call(proxy,
- "Stop",
- &error,
- G_TYPE_INVALID,
- G_TYPE_INVALID);
+ result = call_console_kit ("Stop", g_variant_new ("()"), &error);
break;
case LOGOUT_DIALOG_TYPE_RESTART:
g_debug("Telling ConsoleKit to 'Restart'");
- dbus_g_proxy_call(proxy,
- "Restart",
- &error,
- G_TYPE_INVALID,
- G_TYPE_INVALID);
+ result = call_console_kit ("Restart", g_variant_new ("()"), &error);
break;
default:
g_warning("Unknown action");
break;
}
- g_object_unref(proxy);
+ if (!result) {
+ if (error != NULL) {
+ g_warning ("ConsoleKit action failed: %s", error->message);
+ } else {
+ g_warning ("ConsoleKit action failed: unknown error");
+ }
- if (error != NULL) {
- g_warning("Unable to signal ConsoleKit");
- g_error_free(error);
+ consolekit_fallback(action);
}
+ else
+ g_variant_unref (result);
+ g_clear_error (&error);
return;
}
+static GVariant *
+call_gnome_session (const gchar *method, GVariant *parameters, GError **error)
+{
+ GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, error);
+ if (!bus)
+ {
+ g_variant_unref (parameters);
+ return NULL;
+ }
+
+ GVariant *result = g_dbus_connection_call_sync(bus,
+ "org.gnome.SessionManager",
+ "/org/gnome/SessionManager",
+ "org.gnome.SessionManager",
+ method,
+ parameters,
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ G_MAXINT,
+ NULL,
+ error);
+ g_object_unref (bus);
+
+ return result;
+}
+
static void
session_action (LogoutDialogType action)
{
- DBusGConnection * sbus;
- DBusGProxy * sm_proxy;
GError * error = NULL;
- gboolean res = FALSE;
-
- sbus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
- if (sbus == NULL) {
- g_warning("Unable to get DBus session bus.");
- return;
- }
- sm_proxy = dbus_g_proxy_new_for_name_owner (sbus,
- "org.gnome.SessionManager",
- "/org/gnome/SessionManager",
- "org.gnome.SessionManager",
- &error);
- if (sm_proxy == NULL) {
- g_warning("Unable to get DBus proxy to SessionManager interface: %s", error->message);
- g_error_free(error);
+ GVariant *result = NULL;
- consolekit_fallback(action);
- return;
- }
-
- g_clear_error (&error);
-
if (action == LOGOUT_DIALOG_TYPE_LOG_OUT) {
g_debug("Asking Session manager to 'Logout'");
- res = dbus_g_proxy_call_with_timeout (sm_proxy, "Logout", INT_MAX, &error,
- G_TYPE_UINT, 1, G_TYPE_INVALID, G_TYPE_INVALID);
+ result = call_gnome_session ("Logout", g_variant_new ("(u)", 1), &error);
} else if (action == LOGOUT_DIALOG_TYPE_SHUTDOWN) {
g_debug("Asking Session manager to 'RequestShutdown'");
- res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestShutdown", INT_MAX, &error,
- G_TYPE_INVALID, G_TYPE_INVALID);
+ result = call_gnome_session ("RequestShutdown", g_variant_new ("()"), &error);
} else if (action == LOGOUT_DIALOG_TYPE_RESTART) {
g_debug("Asking Session manager to 'RequestReboot'");
- res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestReboot", INT_MAX, &error,
- G_TYPE_INVALID, G_TYPE_INVALID);
+ result = call_gnome_session ("RequestReboot", g_variant_new ("()"), &error);
} else {
g_warning ("Unknown session action");
}
- if (!res) {
+ if (!result) {
if (error != NULL) {
g_warning ("SessionManager action failed: %s", error->message);
} else {
@@ -137,8 +151,8 @@
consolekit_fallback(action);
}
-
- g_object_unref(sm_proxy);
+ else
+ g_variant_unref (result);
g_clear_error (&error);
return;
|