Updating the users daemon to have usable generic functions

but no dummy users.

2 files changed, 98 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 383a095..af8d6d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-sus (0.1~ppa2~indicator9) UNRELEASED; urgency=low
+
+  * Updating the users daemon to have usable generic functions
+    but no dummy users.
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 20 Jul 2009 15:19:37 -0500
+
 indicator-sus (0.1~ppa2~indicator8) karmic; urgency=low
 
   * Going Karmic
diff --git a/src/users-service.c b/src/users-service.c
index 409a1d0..731bc4d 100644
--- a/src/users-service.c
+++ b/src/users-service.c
@@ -1,4 +1,6 @@
 
+#include <glib/gi18n.h>
+
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 
@@ -7,22 +9,97 @@
 
 #include "dbus-shared-names.h"
 
+#define GUEST_SESSION_LAUNCHER  "/usr/share/gdm/guest-session/guest-session-launch"
+
+static DBusGConnection * session_bus = NULL;
+static DBusGConnection * system_bus = NULL;
+static DBusGProxy * bus_proxy = NULL;
+static DBusGProxy * gdm_proxy = NULL;
 static DbusmenuMenuitem * root_menuitem = NULL;
 static GMainLoop * mainloop = NULL;
 
-gchar * dummies[] = {
-	"Bob", "Jim", "Alvin", "Mary", NULL
-};
+static gboolean
+check_guest_session (void)
+{
+	if (geteuid() < 500) {
+		/* System users shouldn't have guest account shown.  Mosly
+		   this would be the case of the guest user itself. */
+		return FALSE;
+	}
+	if (!g_file_test(GUEST_SESSION_LAUNCHER, G_FILE_TEST_IS_EXECUTABLE)) {
+		/* It doesn't appear that the Guest session stuff is
+		   installed.  So let's not use it then! */
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static void
+activate_guest_session (DbusmenuMenuitem * mi, gpointer user_data)
+{
+	GError * error = NULL;
+	if (!g_spawn_command_line_async(GUEST_SESSION_LAUNCHER, &error)) {
+		g_warning("Unable to start guest session: %s", error->message);
+		g_error_free(error);
+	}
+
+	return;
+}
+
+static gboolean
+check_new_session (void)
+{
+	if (system_bus == NULL) {
+		system_bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
+	}
+
+	if (system_bus == NULL) {
+		return FALSE;
+	}
+
+	if (gdm_proxy == NULL) {
+		gdm_proxy = dbus_g_proxy_new_for_name(system_bus,
+		                                      "org.gnome.DisplayManager",
+		                                      "/org/gnome/DisplayManager/LocalDisplayFactory",
+		                                      "org.gnome.DisplayManager.LocalDisplayFactory");
+	}
+
+	if (gdm_proxy == NULL) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
 
 static void
-dummy_users (DbusmenuMenuitem * root) {
-	int count;
-	for (count = 0; dummies[count] != NULL; count++) {
-		DbusmenuMenuitem * mi = dbusmenu_menuitem_new();
-		g_debug("Creating item: %d %s", dbusmenu_menuitem_get_id(mi), dummies[count]);
-		g_debug("\tRoot ID: %d", dbusmenu_menuitem_get_id(root));
-		dbusmenu_menuitem_property_set(mi, "label", dummies[count]);
-		dbusmenu_menuitem_child_add_position(root, mi, count);
+activate_new_session (DbusmenuMenuitem * mi, gpointer user_data)
+{
+	GError * error = NULL;
+	if (!g_spawn_command_line_async("gdmflexiserver --startnew", &error)) {
+		g_warning("Unable to start guest session: %s", error->message);
+		g_error_free(error);
+	}
+
+	return;
+}
+
+static void
+create_items (DbusmenuMenuitem * root) {
+	DbusmenuMenuitem * mi = NULL;
+
+	if (check_guest_session()) {
+		mi = dbusmenu_menuitem_new();
+		dbusmenu_menuitem_property_set(mi, "label", _("Guest Session"));
+		dbusmenu_menuitem_child_append(root, mi);
+		g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_guest_session), NULL);
+	}
+
+	if (check_new_session()) {
+		mi = dbusmenu_menuitem_new();
+		dbusmenu_menuitem_property_set(mi, "label", _("New Session..."));
+		dbusmenu_menuitem_child_append(root, mi);
+		g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_new_session), NULL);
 	}
 
 	return;
@@ -33,8 +110,8 @@ main (int argc, char ** argv)
 {
     g_type_init();
 
-    DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+    session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
+    bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
     GError * error = NULL;
     guint nameret = 0;
 
@@ -51,7 +128,7 @@ main (int argc, char ** argv)
     root_menuitem = dbusmenu_menuitem_new();
 	g_debug("Root ID: %d", dbusmenu_menuitem_get_id(root_menuitem));
 
-	dummy_users(root_menuitem);
+	create_items(root_menuitem);
 
     DbusmenuServer * server = dbusmenu_server_new(INDICATOR_USERS_DBUS_OBJECT);
     dbusmenu_server_set_root(server, root_menuitem);