Only lock screensaver if the screensaver is set to lock.

3 files changed, 99 insertions, 15 deletions

diff --git a/src/lock-helper.c b/src/lock-helper.c
index 47dcb71..ba6b182 100644
--- a/src/lock-helper.c
+++ b/src/lock-helper.c
@@ -19,9 +19,14 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <glib/gi18n.h>
+#include <gconf/gconf-client.h>
 #include <dbus/dbus-glib.h>
 #include "lock-helper.h"
 
+#define GCONF_DIR  "/apps/gnome-screensaver"
+#define GCONF_KEY  GCONF_DIR "/lock_enabled"
+
 static DBusGProxy * gss_proxy = NULL;
 static GMainLoop * gss_mainloop = NULL;
 static guint cookie = 0;
@@ -29,6 +34,8 @@ static DBusGProxyCall * cookie_call = NULL;
 
 static gboolean is_guest = FALSE;
 
+static GConfClient * gconf_client = NULL;
+
 void build_gss_proxy (void);
 
 /* Checks to see if there is an error and reports
@@ -124,7 +131,11 @@ will_lock_screen (void)
 		return FALSE;
 	}
 
-	return TRUE;
+	if (gconf_client == NULL) {
+		gconf_client = gconf_client_get_default();
+	}
+
+	return gconf_client_get_bool (gconf_client, GCONF_KEY, NULL);
 }
 
 /* When the screensave go active, if we've got a mainloop
@@ -175,24 +186,45 @@ activate_timeout (gpointer data)
 	return FALSE;
 }
 
+/* Handle errors from activating the screensaver */
+static void
+active_cb (DBusGProxy * proxy, DBusGProxyCall * call, gpointer user_data)
+{
+	GError * error = NULL;
+
+	dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_INVALID);
+
+	if (error != NULL) {
+		g_warning("Unable to activate screensaver: %s", error->message);
+		g_error_free(error);
+	}
+
+	return;
+}
+
 /* A fun little function to actually lock the screen.  If,
    that's what you want, let's do it! */
 void
 lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data)
 {
 	g_debug("Lock Screen");
-	if (!will_lock_screen()) {
-		g_debug("\tUser is guest, blocking lock");
-		return;
-	}
 
 	build_gss_proxy();
 	g_return_if_fail(gss_proxy != NULL);
 
-	dbus_g_proxy_call_no_reply(gss_proxy,
-	                           "Lock",
-	                           G_TYPE_INVALID,
-	                           G_TYPE_INVALID);
+	if (will_lock_screen()) {
+		dbus_g_proxy_call_no_reply(gss_proxy,
+		                           "Lock",
+		                           G_TYPE_INVALID,
+		                           G_TYPE_INVALID);
+	} else {
+		dbus_g_proxy_begin_call(gss_proxy,
+		                        "SetActive",
+		                        active_cb, NULL,
+		                        NULL,
+		                        G_TYPE_BOOLEAN, TRUE,
+		                        G_TYPE_INVALID);
+	}
 
 	if (gss_mainloop == NULL) {
 		gss_mainloop = g_main_loop_new(NULL, FALSE);
@@ -221,3 +253,53 @@ lock_screen_setup (gpointer data)
 	return FALSE;
 }
 
+/* When the GConf key changes we need to adjust the text on
+   what we're going to do with the menu item */
+static void
+lockscreen_update (GConfClient *client, guint cnxn_id, GConfEntry  *entry, gpointer data) {
+	DbusmenuMenuitem * mi = (DbusmenuMenuitem*) data;
+	const gchar * key = gconf_entry_get_key (entry);
+
+	if(g_strcmp0 (key, GCONF_KEY) == 0) {
+		if (will_lock_screen()) {
+			dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));
+		} else {
+			dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Start Screensaver"));
+		}
+	}
+}
+
+/* Notification handler for lock menuitems. */
+static guint lock_notify = 0;
+
+/* Sets the menu item to be updating.  There can
+   only be one.  So we clear and reset if we get
+   another. */
+void
+lock_screen_update_item (DbusmenuMenuitem * mi)
+{
+	if (gconf_client == NULL) {
+		gconf_client = gconf_client_get_default();
+	}
+
+	if (lock_notify == 0) {
+		gconf_client_add_dir (gconf_client,
+		                      GCONF_DIR,
+		                      GCONF_CLIENT_PRELOAD_ONELEVEL,
+		                      NULL);
+	}
+
+	if (lock_notify != 0) {
+		gconf_client_notify_remove(gconf_client, lock_notify);
+		lock_notify = 0;
+	}
+
+	lock_notify = gconf_client_notify_add(gconf_client,
+	                                      GCONF_KEY,
+	                                      lockscreen_update,
+	                                      mi,
+	                                      NULL,
+	                                      NULL);
+
+	return;
+}
diff --git a/src/lock-helper.h b/src/lock-helper.h
index 37f1448..1d707d8 100644
--- a/src/lock-helper.h
+++ b/src/lock-helper.h
@@ -31,4 +31,6 @@ gboolean will_lock_screen (void);
 void lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data);
 gboolean lock_screen_setup (gpointer data);
 
+void lock_screen_update_item (DbusmenuMenuitem * mi);
+
 #endif /* LOCK_HELPER_H__ */
diff --git a/src/session-service.c b/src/session-service.c
index d2c2c74..ee1a9af 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -509,14 +509,14 @@ 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);
+	lock_screen_update_item(lock_menuitem);
   }
 
   /* Build all of the user switching items */