Upstream release 0.2.6

∘ Updating sessions to make guest account marked when being
used (LP: #436030)
∘ String "Switch From" is miscapitalized (LP: #540265)
∘ Follow user switching lockdown key (LP: #504360)
∘ Use user avatar images in session menu (LP: #436028)
∘ Don't show suspend/hibernate if disabled in Policy Kit (LP: #432598)
∘ Lock screen when switching users (LP: #536801)
∘ Fix callback prototype (LP: #536990)
∘ Revert back to "Shut Down" instead of "Switch Off" (LP: #540056)
∘ Fix leaked GConf notifications
∘ Add GConf key for showing the "Log Out" item
∘ Adding the ability to specify a desktop file to have at the end
of the menu.
∘ Setting up restart required notification by changing panel icon
and icon in menus.
∘ Use the libindicator image helpers
∘ Set proper translation domain for loadable indicator
∘ Translation update

1 files changed, 49 insertions, 8 deletions

diff --git a/src/gconf-helper.c b/src/gconf-helper.c
index 9262b19..29d8526 100644
--- a/src/gconf-helper.c
+++ b/src/gconf-helper.c
@@ -30,9 +30,12 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/menuitem.h>
 
+#include "dbus-shared-names.h"
 #include "gconf-helper.h"
 
 static GConfClient * gconf_client = NULL;
+static guint confirmation_notify = 0;
+static guint logout_notify = 0;
 
 gboolean
 supress_confirmations (void) {
@@ -42,6 +45,14 @@ supress_confirmations (void) {
 	return gconf_client_get_bool (gconf_client, SUPPRESS_KEY, NULL) ;
 }
 
+gboolean
+show_logout (void) {
+	if(!gconf_client) {
+		gconf_client = gconf_client_get_default ();
+	}
+	return !gconf_client_get_bool (gconf_client, LOGOUT_KEY, NULL) ;
+}
+
 static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GConfEntry  *entry, gpointer data) {
 	RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = (RestartShutdownLogoutMenuItems*) data;
 	GConfValue * value = gconf_entry_get_value (entry);
@@ -50,24 +61,54 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC
 	if(g_strcmp0 (key, SUPPRESS_KEY) == 0) {
 		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, DBUSMENU_MENUITEM_PROP_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->restart_mi, RESTART_ITEM_LABEL, _("Restart"));
+			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, DBUSMENU_MENUITEM_PROP_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->restart_mi, RESTART_ITEM_LABEL, _("Restart..."));
+			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));
 		}
 	}
 }
 
+static void
+update_logout_callback (GConfClient *client, guint cnxn_id, GConfEntry  *entry, gpointer data) {
+	DbusmenuMenuitem * mi = (DbusmenuMenuitem*) data;
+	GConfValue * value = gconf_entry_get_value (entry);
+	const gchar * key = gconf_entry_get_key (entry);
+
+	if(g_strcmp0 (key, LOGOUT_KEY) == 0) {
+		dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !gconf_value_get_bool(value));
+	}
+}
+
 void
-update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) {
+update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi, DbusmenuMenuitem * logoutitem) {
+	/* If we don't have a client, build one. */
 	if(!gconf_client) {
 		gconf_client = gconf_client_get_default ();
 	}
-	gconf_client_add_dir (gconf_client, GLOBAL_DIR,
-				GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-	gconf_client_notify_add (gconf_client, SUPPRESS_KEY,
+
+	/* If we've not gotten any notifications, then we need
+	   to add the directory for notifications to come from. */
+	if (confirmation_notify == 0 || logout_notify == 0) {
+		gconf_client_add_dir (gconf_client, GLOBAL_DIR,
+		                      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+	}
+
+	if (confirmation_notify != 0) {
+		gconf_client_notify_remove (gconf_client, confirmation_notify);
+		confirmation_notify = 0;
+	}
+
+	if (logout_notify != 0) {
+		gconf_client_notify_remove (gconf_client, logout_notify);
+		logout_notify = 0;
+	}
+
+	confirmation_notify = gconf_client_notify_add (gconf_client, SUPPRESS_KEY,
 				update_menu_entries_callback, restart_shutdown_logout_mi, NULL, NULL);
+	logout_notify = gconf_client_notify_add (gconf_client, LOGOUT_KEY,
+				update_logout_callback, logoutitem, NULL, NULL);
 }