Basically getting this session stuff working. Well, all

the stuff that kills data.

2 files changed, 129 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index db9dd34..a9ce333 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-sus (0.1~ppa2~indicator9ubuntu4) UNRELEASED; urgency=low
+
+  * Basically getting this session stuff working.  Well, all
+    the stuff that kills data.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 23 Jul 2009 16:07:12 -0500
+
 indicator-sus (0.1~ppa2~indicator9ubuntu3) karmic; urgency=low
 
   * Wrong function, building a path instead of a filename.  Err.
diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c
index f6598bc..75ab63f 100644
--- a/src/gtk-dialog/gtk-logout-helper.c
+++ b/src/gtk-dialog/gtk-logout-helper.c
@@ -1,14 +1,134 @@
 
+#include <glib.h>
 #include <gtk/gtk.h>
+#include <dbus/dbus-glib.h>
 #include "logout-dialog.h"
+#include "ck-pk-helper.h"
+
+static void
+session_action (LogoutDialogAction 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);
+		return;
+	}		
+	
+	g_clear_error (&error);
+	
+	if (action == LOGOUT_DIALOG_LOGOUT) {
+		res = dbus_g_proxy_call_with_timeout (sm_proxy, "Logout", INT_MAX, &error, 
+											  G_TYPE_UINT, 1, G_TYPE_INVALID, G_TYPE_INVALID);
+	} else if (action == LOGOUT_DIALOG_SHUTDOWN) {
+		res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestShutdown", INT_MAX, &error, 
+											  G_TYPE_INVALID, G_TYPE_INVALID);
+	} else if (action == LOGOUT_DIALOG_RESTART) {
+		res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestReboot", INT_MAX, &error, 
+											  G_TYPE_INVALID, G_TYPE_INVALID);
+	} else {
+		g_warning ("Unknown session action");
+	}
+	
+	if (!res) {
+		if (error != NULL) {
+			g_warning ("SessionManager action failed: %s", error->message);
+		} else {
+			g_warning ("SessionManager action failed: unknown error");
+		}
+	}
+	
+	g_object_unref(sm_proxy);
+	
+	if (error != NULL) {
+		g_error_free(error);
+	}
+	
+	return;
+}	
+
+static LogoutDialogAction type = LOGOUT_DIALOG_LOGOUT;
+
+static gboolean
+option_logout (const gchar * arg, const gchar * value, gpointer data, GError * error)
+{
+	type = LOGOUT_DIALOG_LOGOUT;
+	return TRUE;
+}
+
+static gboolean
+option_shutdown (const gchar * arg, const gchar * value, gpointer data, GError * error)
+{
+	type = LOGOUT_DIALOG_SHUTDOWN;
+	return TRUE;
+}
+
+static gboolean
+option_restart (const gchar * arg, const gchar * value, gpointer data, GError * error)
+{
+	type = LOGOUT_DIALOG_RESTART;
+	return TRUE;
+}
+
+static GOptionEntry options[] = {
+	{"logout",     'l',  G_OPTION_FLAG_NO_ARG,  G_OPTION_ARG_CALLBACK,  option_logout,   "Log out of the current session",   NULL},
+	{"shutdown",   's',  G_OPTION_FLAG_NO_ARG,  G_OPTION_ARG_CALLBACK,  option_shutdown, "Shutdown the entire system",       NULL},
+	{"restart",    'r',  G_OPTION_FLAG_NO_ARG,  G_OPTION_ARG_CALLBACK,  option_restart,  "Restart the system",               NULL},
+
+	{NULL}
+};
 
 int
 main (int argc, char * argv[])
 {
 	gtk_init(&argc, &argv);
 
-	GtkWidget * dialog = logout_dialog_new(LOGOUT_DIALOG_LOGOUT);
-	gtk_dialog_run(GTK_DIALOG(dialog));
+	GError * error = NULL;
+	GOptionContext * context = g_option_context_new(" - logout of the current session");
+	g_option_context_add_main_entries(context, options, "gtk-logout-helper");
+	g_option_context_add_group(context, gtk_get_option_group(TRUE));
+	g_option_context_set_help_enabled(context, TRUE);
+
+	if (!g_option_context_parse(context, &argc, &argv, &error)) {
+		g_debug("Option parsing failed: %s", error->message);
+		g_error_free(error);
+		return 1;
+	}
+
+	GtkWidget * dialog = NULL;
+	if (!pk_require_auth(type)) {	
+		dialog = logout_dialog_new(type);
+	}
+
+	if (dialog != NULL) {
+		GtkResponseType response = gtk_dialog_run(GTK_DIALOG(dialog));
+		gtk_widget_hide(dialog);
+
+		if (response == GTK_RESPONSE_HELP) {
+			type = LOGOUT_DIALOG_RESTART;
+			response = GTK_RESPONSE_OK;
+		}
+
+		if (response != GTK_RESPONSE_OK) {
+			return 0;
+		}
+	}
+
+	session_action(type);
 
 	return 0;
 }