From 9bfcbd2b420b19a43d1704c6562d4709ebb570f6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 12 Mar 2010 12:39:47 -0600
Subject: Changing the service to use the new menu item

---
 src/session-service.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index febf007..51a930a 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -555,10 +555,11 @@ rebuild_items (DbusmenuMenuitem *root,
 	g_signal_connect(G_OBJECT(hibernate_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Hibernate");
 
 	restart_mi = dbusmenu_menuitem_new();
+	dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_TYPE, RESTART_ITEM_TYPE);
 	if (supress_confirmations()) {
-		dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart"));
+		dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));
 	} else {
-		dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart..."));
+		dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart..."));
 	}
 	dbusmenu_menuitem_child_append(root, restart_mi);
 	g_signal_connect(G_OBJECT(restart_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "restart");
@@ -615,18 +616,18 @@ restart_dir_changed (void)
 
 	if (restart_required) {
 		if (supress_confirmations()) {
-			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required"));
+			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required"));
 		} else {
-			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required..."));
+			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required..."));
 		}
-		dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "emblem-important");
+		dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "emblem-important");
 	} else {	
 		if (supress_confirmations()) {
-			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart"));
+			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));
 		} else {
-			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart..."));
+			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart..."));
 		}
-		dbusmenu_menuitem_property_remove(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME);
+		dbusmenu_menuitem_property_remove(restart_mi, RESTART_ITEM_ICON);
 	}
 
 	return;
-- 
cgit v1.2.3


From e504d1d019cf0af9b210d8150a5822f5e4878f4f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 12 Mar 2010 14:37:58 -0600
Subject: Creating our little dbus-object.

---
 src/session-dbus.c    | 6 ++++++
 src/session-dbus.h    | 1 +
 src/session-service.c | 4 ++++
 3 files changed, 11 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-dbus.c b/src/session-dbus.c
index fd506ad..60002d0 100644
--- a/src/session-dbus.c
+++ b/src/session-dbus.c
@@ -97,6 +97,12 @@ _session_dbus_server_get_icon (SessionDbus * service, gchar ** icon, GError ** e
 	return TRUE;
 }
 
+SessionDbus *
+session_dbus_new (void)
+{
+	return SESSION_DBUS(g_object_new(SESSION_DBUS_TYPE, NULL));
+}
+
 void
 session_dbus_set_name (SessionDbus * session, const gchar * name)
 {
diff --git a/src/session-dbus.h b/src/session-dbus.h
index 67c151c..2169b49 100644
--- a/src/session-dbus.h
+++ b/src/session-dbus.h
@@ -26,6 +26,7 @@ struct _SessionDbus {
 };
 
 GType session_dbus_get_type (void);
+SessionDbus * session_dbus_new (void);
 void  session_dbus_set_name (SessionDbus * session, const gchar * name);
 
 G_END_DECLS
diff --git a/src/session-service.c b/src/session-service.c
index febf007..693c73a 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -43,6 +43,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "gconf-helper.h"
 
+#include "session-dbus.h"
 #include "users-service-dbus.h"
 #include "lock-helper.h"
 
@@ -65,6 +66,7 @@ struct _ActivateData
 static DBusGConnection   *system_bus = NULL;
 static DBusGProxy        *gdm_proxy = NULL;
 static UsersServiceDbus  *dbus_interface = NULL;
+static SessionDbus       *session_dbus = NULL;
 
 static DbusmenuMenuitem  *lock_menuitem = NULL;
 static DbusmenuMenuitem  *switch_menuitem = NULL;
@@ -691,6 +693,8 @@ main (int argc, char ** argv)
     DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT);
     dbusmenu_server_set_root(server, root_menuitem);
 
+	session_dbus = session_dbus_new();
+
     mainloop = g_main_loop_new(NULL, FALSE);
     g_main_loop_run(mainloop);
 
-- 
cgit v1.2.3


From 5d784227da6b87b8588724ac1d894c6116fc2b01 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 12 Mar 2010 15:52:13 -0600
Subject: Setting the icon when the restart is touched.

---
 src/session-service.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 693c73a..6c4dd1b 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -622,6 +622,7 @@ restart_dir_changed (void)
 			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required..."));
 		}
 		dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "emblem-important");
+		session_dbus_set_name(session_dbus, ICON_RESTART);
 	} else {	
 		if (supress_confirmations()) {
 			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart"));
@@ -629,6 +630,7 @@ restart_dir_changed (void)
 			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart..."));
 		}
 		dbusmenu_menuitem_property_remove(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME);
+		session_dbus_set_name(session_dbus, ICON_DEFAULT);
 	}
 
 	return;
-- 
cgit v1.2.3


From 78211dc46ae22a439653df6db0f3b6e9c67160f0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 12 Mar 2010 16:07:33 -0600
Subject: Protecting from a NULL object

---
 src/session-service.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 6c4dd1b..b88ee30 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -622,15 +622,19 @@ restart_dir_changed (void)
 			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required..."));
 		}
 		dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "emblem-important");
-		session_dbus_set_name(session_dbus, ICON_RESTART);
-	} else {	
+		if (session_dbus != NULL) {
+			session_dbus_set_name(session_dbus, ICON_RESTART);
+		}
+	} else {
 		if (supress_confirmations()) {
 			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart"));
 		} else {
 			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart..."));
 		}
 		dbusmenu_menuitem_property_remove(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME);
-		session_dbus_set_name(session_dbus, ICON_DEFAULT);
+		if (session_dbus != NULL) {
+			session_dbus_set_name(session_dbus, ICON_DEFAULT);
+		}
 	}
 
 	return;
-- 
cgit v1.2.3


From 91d75debaa1a5aa7c210da029ab123c96633225b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 12 Mar 2010 16:08:28 -0600
Subject: Making our service come up a little earlier

---
 src/session-service.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index b88ee30..75c8650 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -674,6 +674,8 @@ main (int argc, char ** argv)
 	                 INDICATOR_SERVICE_SIGNAL_SHUTDOWN,
 	                 G_CALLBACK(service_shutdown), NULL);
 
+	session_dbus = session_dbus_new();
+
 	g_idle_add(lock_screen_setup, NULL);
 
     root_menuitem = dbusmenu_menuitem_new();
@@ -699,8 +701,6 @@ main (int argc, char ** argv)
     DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT);
     dbusmenu_server_set_root(server, root_menuitem);
 
-	session_dbus = session_dbus_new();
-
     mainloop = g_main_loop_new(NULL, FALSE);
     g_main_loop_run(mainloop);
 
-- 
cgit v1.2.3


From 7f489865a78b866ce22627c3ac5fb224a8bec4d1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 12 Mar 2010 17:23:04 -0600
Subject: Changing the emblem to system-restart-panel

---
 src/session-service.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 51a930a..7d21c38 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -620,7 +620,7 @@ restart_dir_changed (void)
 		} else {
 			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required..."));
 		}
-		dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "emblem-important");
+		dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel");
 	} else {	
 		if (supress_confirmations()) {
 			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));
-- 
cgit v1.2.3


From 501c8a7e9add926f34b6dbbcce9d9e6f81706445 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 12 Mar 2010 21:54:12 -0600
Subject: Looking for a desktop file, and if it exists, putting it as a final
 menu item.

---
 src/session-service.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 51a930a..c98ecff 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -28,6 +28,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
+#include <gio/gdesktopappinfo.h>
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
@@ -50,6 +51,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define UP_OBJECT     "/org/freedesktop/UPower"
 #define UP_INTERFACE  "org.freedesktop.UPower"
 
+#define DESKTOP_FILE  "/usr/share/applications/indicator-session-extra.desktop"
+
 #define GUEST_SESSION_LAUNCHER  "/usr/share/gdm/guest-session/guest-session-launch"
 
 #define LOCKDOWN_DIR  "/desktop/gnome/lockdown"
@@ -415,6 +418,16 @@ compare_users_by_username (const gchar *a,
   return retval;
 }
 
+/* Take a desktop file and execute it */
+static void
+desktop_activate_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer data)
+{
+	GAppInfo * appinfo = G_APP_INFO(data);
+	g_return_if_fail(appinfo != NULL);
+	g_app_info_launch(appinfo, NULL, NULL, NULL);
+	return;
+}
+
 /* Builds up the menu for us */
 static void
 rebuild_items (DbusmenuMenuitem *root,
@@ -580,6 +593,21 @@ rebuild_items (DbusmenuMenuitem *root,
 
 	update_menu_entries(restart_shutdown_logout_mi);
 
+	if (g_file_test(DESKTOP_FILE, G_FILE_TEST_EXISTS)) {
+		GAppInfo * appinfo = G_APP_INFO(g_desktop_app_info_new_from_filename(DESKTOP_FILE));
+
+		if (appinfo != NULL) {
+			DbusmenuMenuitem * separator = dbusmenu_menuitem_new();
+			dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
+			dbusmenu_menuitem_child_append(root, separator);
+
+			DbusmenuMenuitem * desktop_mi = dbusmenu_menuitem_new();
+			dbusmenu_menuitem_property_set(desktop_mi, DBUSMENU_MENUITEM_PROP_LABEL, g_app_info_get_name(appinfo));
+			g_signal_connect(G_OBJECT(desktop_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(desktop_activate_cb), appinfo);
+			dbusmenu_menuitem_child_append(root, desktop_mi);
+		}
+	}
+
 	return;
 }
 
-- 
cgit v1.2.3


From 8ea0fde8939236cca0d11aa726fe5d98f6de6526 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 13:10:43 -0500
Subject: Changing the define name to have room for more locdown keys

---
 src/session-service.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index f6b666f..a64f701 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -56,8 +56,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define GUEST_SESSION_LAUNCHER  "/usr/share/gdm/guest-session/guest-session-launch"
 
-#define LOCKDOWN_DIR  "/desktop/gnome/lockdown"
-#define LOCKDOWN_KEY  LOCKDOWN_DIR "/disable_user_switching"
+#define LOCKDOWN_DIR              "/desktop/gnome/lockdown"
+#define LOCKDOWN_KEY_USER         LOCKDOWN_DIR "/disable_user_switching"
 
 typedef struct _ActivateData ActivateData;
 struct _ActivateData
@@ -103,7 +103,7 @@ lockdown_changed (GConfClient *client,
   if (!value || !key)
     return;
 
-  if (g_strcmp0 (key, LOCKDOWN_KEY) == 0)
+  if (g_strcmp0 (key, LOCKDOWN_KEY_USER) == 0)
     {
       if (switch_menuitem)
         {
@@ -127,7 +127,7 @@ ensure_gconf_client (void)
       gconf_client = gconf_client_get_default ();
 
       notify_lockdown_id = gconf_client_notify_add (gconf_client,
-                                                    LOCKDOWN_KEY,
+                                                    LOCKDOWN_KEY_USER,
                                                     lockdown_changed,
                                                     NULL,
                                                     NULL,
@@ -484,7 +484,7 @@ rebuild_items (DbusmenuMenuitem *root,
           dbusmenu_menuitem_child_append (root, switch_menuitem);
           g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL);
 
-          if (gconf_client_get_bool (gconf_client, LOCKDOWN_KEY, NULL))
+          if (gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_USER, NULL))
             {
               dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
             }
-- 
cgit v1.2.3


From df71f47685081f5125fb12c7bb170d88538e9523 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 13:28:19 -0500
Subject: Reacting to changes in the screensaver lockdown key.

---
 src/session-service.c | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index a64f701..7ebc00a 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -58,6 +58,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define LOCKDOWN_DIR              "/desktop/gnome/lockdown"
 #define LOCKDOWN_KEY_USER         LOCKDOWN_DIR "/disable_user_switching"
+#define LOCKDOWN_KEY_SCREENSAVER  LOCKDOWN_DIR "/disable_lock_screen"
 
 typedef struct _ActivateData ActivateData;
 struct _ActivateData
@@ -97,26 +98,32 @@ lockdown_changed (GConfClient *client,
                   GConfEntry  *entry,
                   gpointer     user_data)
 {
-  GConfValue  *value = gconf_entry_get_value (entry);
-  const gchar *key   = gconf_entry_get_key (entry);
+	GConfValue  *value = gconf_entry_get_value (entry);
+	const gchar *key   = gconf_entry_get_key (entry);
 
-  if (!value || !key)
-    return;
+	if (value == NULL || key == NULL) {
+		return;
+	}
 
-  if (g_strcmp0 (key, LOCKDOWN_KEY_USER) == 0)
-    {
-      if (switch_menuitem)
-        {
-          if (gconf_value_get_bool (value))
-            {
-              dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-            }
-          else
-            {
-              dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-            }
-        }
-    }
+	if (g_strcmp0 (key, LOCKDOWN_KEY_USER) == 0) {
+		if (switch_menuitem != NULL) {
+			if (gconf_value_get_bool (value)) {
+				dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+			} else {
+				dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+			}
+		}
+	} if (g_strcmp0 (key, LOCKDOWN_KEY_SCREENSAVER) == 0) {
+		if (lock_menuitem != NULL) {
+			if (gconf_value_get_bool (value)) {
+				dbusmenu_menuitem_property_set_bool (lock_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+			} else {
+				dbusmenu_menuitem_property_set_bool (lock_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+			}
+		}
+	}
+
+	return;
 }
 
 static void
-- 
cgit v1.2.3


From aa52289c19291ffa9bc4ed70f67d1f683cbf6381 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 13:29:01 -0500
Subject: Embarassing 4 letter word to forget.  Guess the compiler would add it
 back anyway though.

---
 src/session-service.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 7ebc00a..24623aa 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -113,7 +113,7 @@ lockdown_changed (GConfClient *client,
 				dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
 			}
 		}
-	} if (g_strcmp0 (key, LOCKDOWN_KEY_SCREENSAVER) == 0) {
+	} else if (g_strcmp0 (key, LOCKDOWN_KEY_SCREENSAVER) == 0) {
 		if (lock_menuitem != NULL) {
 			if (gconf_value_get_bool (value)) {
 				dbusmenu_menuitem_property_set_bool (lock_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-- 
cgit v1.2.3


From da365cbe9598860cc4e74938ded3ad735a6db396 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 14:11:55 -0500
Subject: Tracking the separator next to the lock item as well.

---
 src/session-service.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 24623aa..b976236 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -73,6 +73,7 @@ static UsersServiceDbus  *dbus_interface = NULL;
 static SessionDbus       *session_dbus = NULL;
 
 static DbusmenuMenuitem  *lock_menuitem = NULL;
+static DbusmenuMenuitem  *lock_separator = NULL;
 static DbusmenuMenuitem  *switch_menuitem = NULL;
 
 static DbusmenuMenuitem * root_menuitem = NULL;
@@ -116,9 +117,11 @@ lockdown_changed (GConfClient *client,
 	} else if (g_strcmp0 (key, LOCKDOWN_KEY_SCREENSAVER) == 0) {
 		if (lock_menuitem != NULL) {
 			if (gconf_value_get_bool (value)) {
-				dbusmenu_menuitem_property_set_bool (lock_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+				dbusmenu_menuitem_property_set_bool (lock_menuitem,  DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+				dbusmenu_menuitem_property_set_bool (lock_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
 			} else {
-				dbusmenu_menuitem_property_set_bool (lock_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+				dbusmenu_menuitem_property_set_bool (lock_menuitem,  DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+				dbusmenu_menuitem_property_set_bool (lock_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
 			}
 		}
 	}
@@ -464,12 +467,14 @@ rebuild_items (DbusmenuMenuitem *root,
   } else {
     dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
   }
+  lock_separator = NULL;
 
   if (can_activate == TRUE)
     {
 	  DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new();
 	  dbusmenu_menuitem_property_set(separator1, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
 	  dbusmenu_menuitem_child_append(root, separator1);
+	  lock_separator = separator1;
 
       if (check_guest_session ())
         {
@@ -554,6 +559,9 @@ rebuild_items (DbusmenuMenuitem *root,
 	DbusmenuMenuitem * separator = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
 	dbusmenu_menuitem_child_append(root, separator);
+	if (lock_separator == NULL) {
+		lock_separator = separator;
+	}
 
 	logout_mi = dbusmenu_menuitem_new();
 	if (supress_confirmations()) {
-- 
cgit v1.2.3


From 065984db24fa4e8723d9dd5add9eec0e71d43ace Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 14:45:48 -0500
Subject: Switching around the GConf notification setup to do an entire
 directory.

---
 src/session-service.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index b976236..72a93eb 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -91,7 +91,6 @@ static DbusmenuMenuitem * restart_mi = NULL;
 static DbusmenuMenuitem * shutdown_mi = NULL;
 
 static GConfClient * gconf_client = NULL;
-static guint notify_lockdown_id = 0;
 
 static void
 lockdown_changed (GConfClient *client,
@@ -129,20 +128,17 @@ lockdown_changed (GConfClient *client,
 	return;
 }
 
+/* Ensures that we have a GConf client and if we build one
+   set up the signal handler. */
 static void
 ensure_gconf_client (void)
 {
-  if (!gconf_client)
-    {
-      gconf_client = gconf_client_get_default ();
-
-      notify_lockdown_id = gconf_client_notify_add (gconf_client,
-                                                    LOCKDOWN_KEY_USER,
-                                                    lockdown_changed,
-                                                    NULL,
-                                                    NULL,
-                                                    NULL);
-    }
+	if (!gconf_client) {
+		gconf_client = gconf_client_get_default ();
+		gconf_client_add_dir(gconf_client, LOCKDOWN_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+		gconf_client_notify_add(gconf_client, LOCKDOWN_DIR, lockdown_changed, NULL, NULL, NULL);
+	}
+	return;
 }
 
 /* A return from the command to sleep the system.  Make sure
-- 
cgit v1.2.3


From 523c02493e72d1e99e23082e9b14af51fd54ae18 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 15:21:26 -0500
Subject: Switching from hiding entries to just rebuilding the menus.

---
 src/session-service.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 72a93eb..c0703bb 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -92,6 +92,8 @@ static DbusmenuMenuitem * shutdown_mi = NULL;
 
 static GConfClient * gconf_client = NULL;
 
+static void rebuild_items (DbusmenuMenuitem *root, UsersServiceDbus *service);
+
 static void
 lockdown_changed (GConfClient *client,
                   guint        cnxd_id,
@@ -105,24 +107,8 @@ lockdown_changed (GConfClient *client,
 		return;
 	}
 
-	if (g_strcmp0 (key, LOCKDOWN_KEY_USER) == 0) {
-		if (switch_menuitem != NULL) {
-			if (gconf_value_get_bool (value)) {
-				dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-			} else {
-				dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-			}
-		}
-	} else if (g_strcmp0 (key, LOCKDOWN_KEY_SCREENSAVER) == 0) {
-		if (lock_menuitem != NULL) {
-			if (gconf_value_get_bool (value)) {
-				dbusmenu_menuitem_property_set_bool (lock_menuitem,  DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-				dbusmenu_menuitem_property_set_bool (lock_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-			} else {
-				dbusmenu_menuitem_property_set_bool (lock_menuitem,  DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-				dbusmenu_menuitem_property_set_bool (lock_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-			}
-		}
+	if (g_strcmp0 (key, LOCKDOWN_KEY_USER) == 0 || g_strcmp0 (key, LOCKDOWN_KEY_SCREENSAVER) == 0) {
+		rebuild_items(root_menuitem, dbus_interface);
 	}
 
 	return;
-- 
cgit v1.2.3


From 29bd57b57fe4cf4e964fdecf034cb2ecb8cd04b1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 15:33:36 -0500
Subject: Changing the lockdown key to do all the switching instead of just the
 switch user item.

---
 src/session-service.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index c0703bb..66d468f 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -434,7 +434,10 @@ rebuild_items (DbusmenuMenuitem *root,
   gboolean can_activate;
   GList *children;
 
-  can_activate = users_service_dbus_can_activate_session (service);
+  ensure_gconf_client ();
+
+  can_activate = users_service_dbus_can_activate_session (service) &&
+      !gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_USER, NULL);
 
   children = dbusmenu_menuitem_take_children (root);
   g_list_foreach (children, (GFunc)g_object_unref, NULL);
@@ -470,22 +473,12 @@ rebuild_items (DbusmenuMenuitem *root,
 
       if (check_new_session ())
         {
-          ensure_gconf_client ();
 
           switch_menuitem = dbusmenu_menuitem_new ();
 		  dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_TYPE, MENU_SWITCH_TYPE);
 		  dbusmenu_menuitem_property_set (switch_menuitem, MENU_SWITCH_USER, g_get_user_name());
           dbusmenu_menuitem_child_append (root, switch_menuitem);
           g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL);
-
-          if (gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_USER, NULL))
-            {
-              dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-            }
-          else
-            {
-              dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-            }
         }
 
 		GList * users = NULL;
-- 
cgit v1.2.3


From c334ecccf05654c102b112cf7d76d2f38768924f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 15:36:48 -0500
Subject: Removing the lock separator as we don't need it anymore.

---
 src/session-service.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 66d468f..cadce43 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -73,7 +73,6 @@ static UsersServiceDbus  *dbus_interface = NULL;
 static SessionDbus       *session_dbus = NULL;
 
 static DbusmenuMenuitem  *lock_menuitem = NULL;
-static DbusmenuMenuitem  *lock_separator = NULL;
 static DbusmenuMenuitem  *switch_menuitem = NULL;
 
 static DbusmenuMenuitem * root_menuitem = NULL;
@@ -452,14 +451,12 @@ rebuild_items (DbusmenuMenuitem *root,
   } else {
     dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
   }
-  lock_separator = NULL;
 
   if (can_activate == TRUE)
     {
 	  DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new();
 	  dbusmenu_menuitem_property_set(separator1, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
 	  dbusmenu_menuitem_child_append(root, separator1);
-	  lock_separator = separator1;
 
       if (check_guest_session ())
         {
@@ -534,9 +531,6 @@ rebuild_items (DbusmenuMenuitem *root,
 	DbusmenuMenuitem * separator = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
 	dbusmenu_menuitem_child_append(root, separator);
-	if (lock_separator == NULL) {
-		lock_separator = separator;
-	}
 
 	logout_mi = dbusmenu_menuitem_new();
 	if (supress_confirmations()) {
-- 
cgit v1.2.3


From bdba7e5c6a5081c599ade54e4798f9f1af0b536e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 15:52:17 -0500
Subject: Handling the locking of the screen in the rebuild function.

---
 src/session-service.c | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index cadce43..53c305c 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -431,32 +431,38 @@ rebuild_items (DbusmenuMenuitem *root,
   GList *u;
   UserData *user;
   gboolean can_activate;
+  gboolean can_lockscreen;
   GList *children;
 
   ensure_gconf_client ();
 
   can_activate = users_service_dbus_can_activate_session (service) &&
       !gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_USER, NULL);
+  can_lockscreen = !gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_SCREENSAVER, NULL);
 
   children = dbusmenu_menuitem_take_children (root);
   g_list_foreach (children, (GFunc)g_object_unref, NULL);
   g_list_free (children);
 
-  lock_menuitem = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));
-  g_signal_connect(G_OBJECT(lock_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(lock_screen), NULL);
-  dbusmenu_menuitem_child_append(root, lock_menuitem);
-  if (!will_lock_screen()) {
-    dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
-  } else {
-    dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+  if (can_lockscreen) {
+	lock_menuitem = dbusmenu_menuitem_new();
+	dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));
+	g_signal_connect(G_OBJECT(lock_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(lock_screen), NULL);
+	dbusmenu_menuitem_child_append(root, lock_menuitem);
+	if (!will_lock_screen()) {
+		dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
+	} else {
+		dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+	}
   }
 
   if (can_activate == TRUE)
     {
-	  DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new();
-	  dbusmenu_menuitem_property_set(separator1, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
-	  dbusmenu_menuitem_child_append(root, separator1);
+		if (can_lockscreen) {
+			DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new();
+			dbusmenu_menuitem_property_set(separator1, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
+			dbusmenu_menuitem_child_append(root, separator1);
+		}
 
       if (check_guest_session ())
         {
@@ -528,9 +534,11 @@ rebuild_items (DbusmenuMenuitem *root,
 		g_list_free(users);
 	}
 
-	DbusmenuMenuitem * separator = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
-	dbusmenu_menuitem_child_append(root, separator);
+	if (can_lockscreen || can_activate) {
+		DbusmenuMenuitem * separator = dbusmenu_menuitem_new();
+		dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
+		dbusmenu_menuitem_child_append(root, separator);
+	}
 
 	logout_mi = dbusmenu_menuitem_new();
 	if (supress_confirmations()) {
-- 
cgit v1.2.3


From acc3a9675f035777b3b32335edb7854860bfb9ba Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 16:00:43 -0500
Subject: Adding some comments to describe a long function.

---
 src/session-service.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 53c305c..3ee1f6c 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -434,16 +434,21 @@ rebuild_items (DbusmenuMenuitem *root,
   gboolean can_lockscreen;
   GList *children;
 
+  /* Make sure we have a valid GConf client, and build one
+     if needed */
   ensure_gconf_client ();
 
+  /* Check to see which menu items we're allowed to have */
   can_activate = users_service_dbus_can_activate_session (service) &&
       !gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_USER, NULL);
   can_lockscreen = !gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_SCREENSAVER, NULL);
 
+  /* Remove the old menu items if that makes sense */
   children = dbusmenu_menuitem_take_children (root);
   g_list_foreach (children, (GFunc)g_object_unref, NULL);
   g_list_free (children);
 
+  /* Lock screen item */
   if (can_lockscreen) {
 	lock_menuitem = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));
@@ -456,6 +461,7 @@ rebuild_items (DbusmenuMenuitem *root,
 	}
   }
 
+  /* Build all of the user switching items */
   if (can_activate == TRUE)
     {
 		if (can_lockscreen) {
@@ -534,12 +540,16 @@ rebuild_items (DbusmenuMenuitem *root,
 		g_list_free(users);
 	}
 
+	/* If there were a bunch of items before us, we need a
+	   separator. */
 	if (can_lockscreen || can_activate) {
 		DbusmenuMenuitem * separator = dbusmenu_menuitem_new();
 		dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
 		dbusmenu_menuitem_child_append(root, separator);
 	}
 
+	/* Start going through the session based items. */
+
 	logout_mi = dbusmenu_menuitem_new();
 	if (supress_confirmations()) {
 		dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));
-- 
cgit v1.2.3


From eb8756b0a8b55f904dd74103fa33d67b1da11575 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 16:02:06 -0500
Subject: Only setup signals if we're building the proxy for the first time.

---
 src/session-service.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 3ee1f6c..9cde4b0 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -266,19 +266,19 @@ setup_up (void) {
 		                                           UP_ADDRESS,
 		                                           UP_OBJECT,
 		                                           DBUS_INTERFACE_PROPERTIES);
+		/* Connect to changed signal */
+		dbus_g_proxy_add_signal(up_main_proxy,
+		                        "Changed",
+		                        G_TYPE_INVALID);
+
+		dbus_g_proxy_connect_signal(up_main_proxy,
+		                            "Changed",
+		                            G_CALLBACK(up_changed_cb),
+		                            NULL,
+		                            NULL);
 	}
 	g_return_if_fail(up_prop_proxy != NULL);
 
-	/* Connect to changed signal */
-	dbus_g_proxy_add_signal(up_main_proxy,
-	                        "Changed",
-	                        G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(up_main_proxy,
-	                            "Changed",
-	                            G_CALLBACK(up_changed_cb),
-	                            NULL,
-	                            NULL);
 
 	/* Force an original "changed" event */
 	up_changed_cb(up_main_proxy, NULL);
-- 
cgit v1.2.3


From cef6711749d305967d0341920f08aef46d6390d7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 16:16:53 -0500
Subject: Switching the suspend/hibernate handling to a cached value.  And that
 way we can regen the menus without looking up the values.

---
 src/session-service.c | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 9cde4b0..9eb6d88 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -89,6 +89,9 @@ static DbusmenuMenuitem * logout_mi = NULL;
 static DbusmenuMenuitem * restart_mi = NULL;
 static DbusmenuMenuitem * shutdown_mi = NULL;
 
+static gboolean can_hibernate = TRUE;
+static gboolean can_suspend = TRUE;
+
 static GConfClient * gconf_client = NULL;
 
 static void rebuild_items (DbusmenuMenuitem *root, UsersServiceDbus *service);
@@ -175,8 +178,10 @@ suspend_prop_cb (DBusGProxy * proxy, DBusGProxyCall * call, gpointer userdata)
 	}
 	g_debug("Got Suspend: %s", g_value_get_boolean(&candoit) ? "true" : "false");
 
-	if (suspend_mi != NULL) {
-		dbusmenu_menuitem_property_set_value(suspend_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, &candoit);
+	gboolean local_can_suspend = g_value_get_boolean(&candoit);
+	if (local_can_suspend != can_suspend) {
+		can_suspend = local_can_suspend;
+		rebuild_items(root_menuitem, dbus_interface);
 	}
 
 	return;
@@ -198,8 +203,10 @@ hibernate_prop_cb (DBusGProxy * proxy, DBusGProxyCall * call, gpointer userdata)
 	}
 	g_debug("Got Hibernate: %s", g_value_get_boolean(&candoit) ? "true" : "false");
 
-	if (suspend_mi != NULL) {
-		dbusmenu_menuitem_property_set_value(hibernate_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, &candoit);
+	gboolean local_can_hibernate = g_value_get_boolean(&candoit);
+	if (local_can_hibernate != can_hibernate) {
+		can_hibernate = local_can_hibernate;
+		rebuild_items(root_menuitem, dbus_interface);
 	}
 
 	return;
@@ -559,17 +566,19 @@ rebuild_items (DbusmenuMenuitem *root,
 	dbusmenu_menuitem_child_append(root, logout_mi);
 	g_signal_connect(G_OBJECT(logout_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "logout");
 
-	suspend_mi = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set_bool(suspend_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-	dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sleep"));
-	dbusmenu_menuitem_child_append(root, suspend_mi);
-	g_signal_connect(G_OBJECT(suspend_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Suspend");
-
-	hibernate_mi = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set_bool(hibernate_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-	dbusmenu_menuitem_property_set(hibernate_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Hibernate"));
-	dbusmenu_menuitem_child_append(root, hibernate_mi);
-	g_signal_connect(G_OBJECT(hibernate_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Hibernate");
+	if (can_suspend) {
+		suspend_mi = dbusmenu_menuitem_new();
+		dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sleep"));
+		dbusmenu_menuitem_child_append(root, suspend_mi);
+		g_signal_connect(G_OBJECT(suspend_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Suspend");
+	}
+
+	if (can_hibernate) {
+		hibernate_mi = dbusmenu_menuitem_new();
+		dbusmenu_menuitem_property_set(hibernate_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Hibernate"));
+		dbusmenu_menuitem_child_append(root, hibernate_mi);
+		g_signal_connect(G_OBJECT(hibernate_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Hibernate");
+	}
 
 	restart_mi = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_TYPE, RESTART_ITEM_TYPE);
-- 
cgit v1.2.3


From 03a2de405664a797b723dd8bd542b26817dd44e6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 16:55:39 -0500
Subject: Adding properties for allowing the suspend and hibernate

---
 src/session-service.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 4820f59..a915884 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -91,6 +91,8 @@ static DbusmenuMenuitem * shutdown_mi = NULL;
 
 static gboolean can_hibernate = TRUE;
 static gboolean can_suspend = TRUE;
+static gboolean allow_hibernate = TRUE;
+static gboolean allow_suspend = TRUE;
 
 static GConfClient * gconf_client = NULL;
 
@@ -566,14 +568,14 @@ rebuild_items (DbusmenuMenuitem *root,
 	dbusmenu_menuitem_child_append(root, logout_mi);
 	g_signal_connect(G_OBJECT(logout_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "logout");
 
-	if (can_suspend) {
+	if (can_suspend && allow_suspend) {
 		suspend_mi = dbusmenu_menuitem_new();
 		dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sleep"));
 		dbusmenu_menuitem_child_append(root, suspend_mi);
 		g_signal_connect(G_OBJECT(suspend_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Suspend");
 	}
 
-	if (can_hibernate) {
+	if (can_hibernate && allow_hibernate) {
 		hibernate_mi = dbusmenu_menuitem_new();
 		dbusmenu_menuitem_property_set(hibernate_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Hibernate"));
 		dbusmenu_menuitem_child_append(root, hibernate_mi);
-- 
cgit v1.2.3


From 28ef20a9ad4b4b5e931b6eb4833accf44c65951f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 17:15:16 -0500
Subject: Use the upower allowed interface to check to see if PK is blocking
 suspend and hibernate

---
 src/session-service.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index a915884..9dd50bf 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -47,6 +47,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "session-dbus.h"
 #include "users-service-dbus.h"
 #include "lock-helper.h"
+#include "upower-client.h"
 
 #define UP_ADDRESS    "org.freedesktop.UPower"
 #define UP_OBJECT     "/org/freedesktop/UPower"
@@ -254,6 +255,20 @@ up_changed_cb (DBusGProxy * proxy, gpointer user_data)
 	return;
 }
 
+/* Handle the callback from the allow functions to check and
+   see if we're changing the value, and if so, rebuilding the
+   menus based on that info. */
+static void
+allowed_cb (DBusGProxy *proxy, gboolean OUT_allowed, GError *error, gpointer userdata)
+{
+	gboolean * can_do = (gboolean *)userdata;
+
+	if (OUT_allowed != *can_do) {
+		*can_do = OUT_allowed;
+		rebuild_items (root_menuitem, dbus_interface);
+	}
+}
+
 /* This function goes through and sets up what we need for
    DKp checking.  We're even setting up the calls for the props
    we need */
@@ -292,6 +307,14 @@ setup_up (void) {
 	/* Force an original "changed" event */
 	up_changed_cb(up_main_proxy, NULL);
 
+	/* Check to see if these are getting blocked by PolicyKit */
+	org_freedesktop_UPower_suspend_allowed_async(up_main_proxy,
+	                                             allowed_cb,
+	                                             &allow_suspend);
+	org_freedesktop_UPower_hibernate_allowed_async(up_main_proxy,
+	                                               allowed_cb,
+	                                               &allow_hibernate);
+
 	return;
 }
 
-- 
cgit v1.2.3


From 2d17c4577bdf36b417ede0eb12c771f89be74a99 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 17:17:39 -0500
Subject: Checking the error to make sure we're getting back reasonable data or
 reporting the error.

---
 src/session-service.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 9dd50bf..7c7e513 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -261,6 +261,11 @@ up_changed_cb (DBusGProxy * proxy, gpointer user_data)
 static void
 allowed_cb (DBusGProxy *proxy, gboolean OUT_allowed, GError *error, gpointer userdata)
 {
+	if (error != NULL) {
+		g_warning("Unable to get information on what is allowed from UPower: %s", error->message);
+		return;
+	}
+
 	gboolean * can_do = (gboolean *)userdata;
 
 	if (OUT_allowed != *can_do) {
-- 
cgit v1.2.3


From c90b0b458471bf826dbe0402d13bfc9f95793ed7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 20:19:27 -0500
Subject: Lock the screen in the various activate functions.

---
 src/session-service.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index fa90da2..aff963d 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -342,6 +342,9 @@ static void
 activate_guest_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
 {
 	GError * error = NULL;
+
+	lock_screen(mi, timestamp, user_data);
+
 	if (!g_spawn_command_line_async(GUEST_SESSION_LAUNCHER, &error)) {
 		g_warning("Unable to start guest session: %s", error->message);
 		g_error_free(error);
@@ -382,6 +385,9 @@ static void
 activate_new_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
 {
 	GError * error = NULL;
+
+	lock_screen(mi, timestamp, user_data);
+
 	if (!g_spawn_command_line_async("gdmflexiserver --startnew", &error)) {
 		g_warning("Unable to start new session: %s", error->message);
 		g_error_free(error);
@@ -397,6 +403,8 @@ activate_user_session (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data
   UserData *user = (UserData *)user_data;
   UsersServiceDbus *service = user->service;
 
+  lock_screen(mi, timestamp, user_data);
+
   users_service_dbus_activate_user_session (service, user);
 }
 
-- 
cgit v1.2.3


From 40e7ac045c4c4cb93b71bf532187891f67825ce3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 20:46:01 -0500
Subject: Making a small little wrapper to check the lockdown key.

---
 src/session-service.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 3832e89..020aad3 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -129,6 +129,20 @@ ensure_gconf_client (void)
 	return;
 }
 
+/* Check to see if the lockdown key is protecting from
+   locking the screen.  If not, lock it. */
+static void
+lock_if_possible (void) {
+	ensure_gconf_client ();
+
+	if (!gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_SCREENSAVER, NULL)) {
+		lock_screen(NULL, 0, NULL);
+	}
+
+	return;
+}
+
+
 /* A return from the command to sleep the system.  Make sure
    that we unthrottle the screensaver. */
 static void
@@ -150,7 +164,7 @@ machine_sleep (DbusmenuMenuitem * mi, guint timestamp, gpointer userdata)
 	}
 
 	screensaver_throttle(type);
-	lock_screen(NULL, 0, NULL);
+	lock_if_possible();
 
 	dbus_g_proxy_begin_call(up_main_proxy,
 	                        type,
@@ -341,7 +355,7 @@ activate_guest_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_da
 {
 	GError * error = NULL;
 
-	lock_screen(mi, timestamp, user_data);
+	lock_if_possible();
 
 	if (!g_spawn_command_line_async(GUEST_SESSION_LAUNCHER, &error)) {
 		g_warning("Unable to start guest session: %s", error->message);
@@ -384,7 +398,7 @@ activate_new_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data
 {
 	GError * error = NULL;
 
-	lock_screen(mi, timestamp, user_data);
+	lock_if_possible();
 
 	if (!g_spawn_command_line_async("gdmflexiserver --startnew", &error)) {
 		g_warning("Unable to start new session: %s", error->message);
@@ -401,7 +415,7 @@ activate_user_session (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data
   UserData *user = (UserData *)user_data;
   UsersServiceDbus *service = user->service;
 
-  lock_screen(mi, timestamp, user_data);
+  lock_if_possible();
 
   users_service_dbus_activate_user_session (service, user);
 }
-- 
cgit v1.2.3


From ae2c94b40826bfa0274a3eae8ae515d99b07adb5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Mar 2010 21:51:14 -0500
Subject: Add in checking whether the logout button is shown, and get it
 changing with the others.

---
 src/session-service.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index fa90da2..6f27d2c 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -554,6 +554,7 @@ rebuild_items (DbusmenuMenuitem *root,
 	} else {
 		dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out..."));
 	}
+	dbusmenu_menuitem_property_set_bool(logout_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_logout());
 	dbusmenu_menuitem_child_append(root, logout_mi);
 	g_signal_connect(G_OBJECT(logout_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "logout");
 
@@ -593,7 +594,7 @@ rebuild_items (DbusmenuMenuitem *root,
 	restart_shutdown_logout_mi->restart_mi = restart_mi;
 	restart_shutdown_logout_mi->shutdown_mi = shutdown_mi;
 
-	update_menu_entries(restart_shutdown_logout_mi);
+	update_menu_entries(restart_shutdown_logout_mi, logout_mi);
 
 	if (g_file_test(DESKTOP_FILE, G_FILE_TEST_EXISTS)) {
 		GAppInfo * appinfo = G_APP_INFO(g_desktop_app_info_new_from_filename(DESKTOP_FILE));
-- 
cgit v1.2.3


From 9bf67d563e8b819364327c1635095ea885faf543 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 16 Mar 2010 16:02:04 -0500
Subject: Instead of making the item disabled, change the text when we won't
 lock the screen.

---
 src/session-service.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index fb20f3b..5614ab4 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -509,14 +509,13 @@ rebuild_items (DbusmenuMenuitem *root,
   /* Lock screen item */
   if (can_lockscreen) {
 	lock_menuitem = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));
-	g_signal_connect(G_OBJECT(lock_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(lock_screen), NULL);
-	dbusmenu_menuitem_child_append(root, lock_menuitem);
-	if (!will_lock_screen()) {
-		dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
+	if (will_lock_screen()) {
+		dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));
 	} else {
-		dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+		dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Start Screensaver"));
 	}
+	g_signal_connect(G_OBJECT(lock_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(lock_screen), NULL);
+	dbusmenu_menuitem_child_append(root, lock_menuitem);
   }
 
   /* Build all of the user switching items */
-- 
cgit v1.2.3


From c5050f03e27166026a55b21353d3ee058e077523 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 16 Mar 2010 16:16:50 -0500
Subject: Connecting in the update item.

---
 src/session-service.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 5614ab4..b5fb42e 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -516,6 +516,7 @@ rebuild_items (DbusmenuMenuitem *root,
 	}
 	g_signal_connect(G_OBJECT(lock_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(lock_screen), NULL);
 	dbusmenu_menuitem_child_append(root, lock_menuitem);
+	lock_screen_update_item(lock_menuitem);
   }
 
   /* Build all of the user switching items */
-- 
cgit v1.2.3


From 94cd451d64dec28a5649038b3de1c5971f8f6137 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 16 Mar 2010 19:58:54 -0500
Subject: Adding a way to activate the guest session through GDM

---
 src/session-service.c    | 7 +++++++
 src/users-service-dbus.c | 8 ++++++++
 src/users-service-dbus.h | 1 +
 3 files changed, 16 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index fb20f3b..cb36e9c 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -386,6 +386,13 @@ activate_guest_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_da
 
 	lock_if_possible();
 
+	if (dbusmenu_menuitem_property_get_bool(mi, USER_ITEM_PROP_LOGGED_IN)) {
+		if (users_service_dbus_activate_guest_session(USERS_SERVICE_DBUS(user_data))) {
+			return;
+		}
+		g_warning("Unable to activate guest session, falling back to command line activation.");
+	}
+
 	if (!g_spawn_command_line_async(GUEST_SESSION_LAUNCHER, &error)) {
 		g_warning("Unable to start guest session: %s", error->message);
 		g_error_free(error);
diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c
index 4aefdff..556af98 100644
--- a/src/users-service-dbus.c
+++ b/src/users-service-dbus.c
@@ -1005,6 +1005,14 @@ users_service_dbus_get_user_list (UsersServiceDbus *self)
   return g_hash_table_get_values (priv->users);
 }
 
+/* Activates the guest account if it can. */
+gboolean
+users_service_dbus_activate_guest_session (UsersServiceDbus *self)
+{
+
+	return FALSE;
+}
+
 gboolean
 users_service_dbus_activate_user_session (UsersServiceDbus *self,
                                           UserData         *user)
diff --git a/src/users-service-dbus.h b/src/users-service-dbus.h
index bba88a7..29f6690 100644
--- a/src/users-service-dbus.h
+++ b/src/users-service-dbus.h
@@ -80,6 +80,7 @@ GList    *users_service_dbus_get_user_list         (UsersServiceDbus *self);
 gboolean  users_service_dbus_can_activate_session  (UsersServiceDbus *self);
 gboolean  users_service_dbus_activate_user_session (UsersServiceDbus *self,
                                                     UserData         *user);
+gboolean  users_service_dbus_activate_guest_session (UsersServiceDbus *self);
 
 G_END_DECLS
 
-- 
cgit v1.2.3


From 6b1354f942d4482e85c1f15b3d3649cb7c20ea63 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 16 Mar 2010 21:47:45 -0500
Subject: Setting the menuitem for the user.

---
 src/session-service.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index cb36e9c..bc88473 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -599,6 +599,7 @@ rebuild_items (DbusmenuMenuitem *root,
 				dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL);
 				dbusmenu_menuitem_child_append (root, mi);
 				g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user);
+				user->menuitem = mi;
 			}
 		}
 
-- 
cgit v1.2.3


From 2e0cbb1a5a969eb5b983e9b899a3638d5b8136d1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 16 Mar 2010 21:58:59 -0500
Subject: Setting the guest item once it gets built.

---
 src/session-service.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index bc88473..379a0a2 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -526,6 +526,9 @@ rebuild_items (DbusmenuMenuitem *root,
 	}
   }
 
+  /* Set to NULL just incase we don't end up building one */
+  users_service_dbus_set_guest_item(service, NULL);
+
   /* Build all of the user switching items */
   if (can_activate == TRUE)
     {
@@ -543,6 +546,7 @@ rebuild_items (DbusmenuMenuitem *root,
           dbusmenu_menuitem_property_set_bool (guest_mi, USER_ITEM_PROP_LOGGED_IN, FALSE);
           dbusmenu_menuitem_child_append (root, guest_mi);
           g_signal_connect (G_OBJECT (guest_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), NULL);
+          users_service_dbus_set_guest_item(service, guest_mi);
         }
 
       if (check_new_session ())
-- 
cgit v1.2.3


From 3564afb27f1ace2d516507a1b3132bc7eb815b32 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Mar 2010 16:26:16 -0500
Subject: Setting the user icon

---
 src/session-service.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index fb20f3b..97ed013 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -590,6 +590,11 @@ rebuild_items (DbusmenuMenuitem *root,
 					dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name);
 				}
 				dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL);
+				if (user->icon_url != NULL && user->icon_url[0] != '\0') {
+					dbusmenu_menuitem_property_set(mi, USER_ITEM_PROP_ICON, user->icon_url);
+				} else {
+					dbusmenu_menuitem_property_set(mi, USER_ITEM_PROP_ICON, USER_ITEM_ICON_DEFAULT);
+				}
 				dbusmenu_menuitem_child_append (root, mi);
 				g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user);
 			}
-- 
cgit v1.2.3


From e879ad7063226f453d362dbc03f2a654570ea7ce Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Mar 2010 16:50:28 -0500
Subject: Handling the file URIs

---
 src/session-service.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/session-service.c b/src/session-service.c
index 97ed013..d2c2c74 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -590,8 +590,8 @@ rebuild_items (DbusmenuMenuitem *root,
 					dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name);
 				}
 				dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL);
-				if (user->icon_url != NULL && user->icon_url[0] != '\0') {
-					dbusmenu_menuitem_property_set(mi, USER_ITEM_PROP_ICON, user->icon_url);
+				if (user->icon_url != NULL && user->icon_url[0] != '\0' && g_str_has_prefix(user->icon_url, "file://")) {
+					dbusmenu_menuitem_property_set(mi, USER_ITEM_PROP_ICON, user->icon_url + strlen("file://"));
 				} else {
 					dbusmenu_menuitem_property_set(mi, USER_ITEM_PROP_ICON, USER_ITEM_ICON_DEFAULT);
 				}
-- 
cgit v1.2.3


From 1c7fe734fb887d7a998fef539d90eb612b2baf02 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 18 Mar 2010 14:01:25 -0500
Subject: Reverting from 'Switch Off' to 'Shut Down'

---
 src/gconf-helper.c    | 4 ++--
 src/session-service.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/session-service.c')

diff --git a/src/gconf-helper.c b/src/gconf-helper.c
index 77fde1d..29d8526 100644
--- a/src/gconf-helper.c
+++ b/src/gconf-helper.c
@@ -62,11 +62,11 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC
 		if (gconf_value_get_bool (value)) {
 			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));
 			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart"));
-			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off"));
+			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));
 		} else {
 			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out..."));
 			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart..."));
-			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off..."));
+			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));
 		}
 	}
 }
diff --git a/src/session-service.c b/src/session-service.c
index 514a86f..c1c2e57 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -661,9 +661,9 @@ rebuild_items (DbusmenuMenuitem *root,
 
 	shutdown_mi = dbusmenu_menuitem_new();
 	if (supress_confirmations()) {
-		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off"));
+		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));
 	} else {
-		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off..."));
+		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));
 	}
 	dbusmenu_menuitem_child_append(root, shutdown_mi);
 	g_signal_connect(G_OBJECT(shutdown_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown");
-- 
cgit v1.2.3