can't really use async as we dont' have a mainloop here

1 files changed, 15 insertions, 21 deletions

diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c
index 7973bfc..c8635e6 100644
--- a/src/gtk-dialog/gtk-logout-helper.c
+++ b/src/gtk-dialog/gtk-logout-helper.c
@@ -30,15 +30,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "gconf-helper.h"
 
 static void
-console_kit_action_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
-{
-	g_return_if_fail(DBUS_IS_G_PROXY(proxy));
-	g_return_if_fail(call != NULL);
-
-
-}
-
-static void
 consolekit_fallback (LogoutDialogAction action)
 {
 	DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
@@ -52,25 +43,23 @@ consolekit_fallback (LogoutDialogAction action)
 		return;
 	}
 
+	GError * error = NULL;
+
 	switch (action) {
 		case LOGOUT_DIALOG_LOGOUT:
 			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_SHUTDOWN:
-			dbus_g_proxy_begin_call(proxy,
-			                        "Stop",
-			                        console_kit_action_cb,
-			                        NULL, /* data */
-			                        NULL, /* destroy notifier */
-			                        G_TYPE_INVALID);
+			dbus_g_proxy_call(proxy,
+			                  "Stop",
+			                  &error,
+			                  G_TYPE_INVALID);
 			break;
 		case LOGOUT_DIALOG_RESTART:
-			dbus_g_proxy_begin_call(proxy,
-			                        "Restart",
-			                        console_kit_action_cb,
-			                        NULL, /* data */
-			                        NULL, /* destroy notifier */
-			                        G_TYPE_INVALID);
+			dbus_g_proxy_call(proxy,
+			                  "Restart",
+			                  &error,
+			                  G_TYPE_INVALID);
 			break;
 		default:
 			g_warning("Unknown action");
@@ -79,6 +68,11 @@ consolekit_fallback (LogoutDialogAction action)
 
 	g_object_unref(proxy);
 
+	if (error != NULL) {
+		g_error("Unable to signal ConsoleKit: %s", error->message);
+		g_error_free(error);
+	}
+
 	return;
 }