aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-09-29 16:25:35 -0500
committerTed Gould <ted@canonical.com>2009-09-29 16:25:35 -0500
commit9efc81691426e023df3a2124a6d65a7f4e4fb327 (patch)
treec8620267a0a73b148ab428ca2be82d1853e7baec
parent362aaab499e95a699f8fa0749293bed840340cc2 (diff)
downloadayatana-indicator-session-9efc81691426e023df3a2124a6d65a7f4e4fb327.tar.gz
ayatana-indicator-session-9efc81691426e023df3a2124a6d65a7f4e4fb327.tar.bz2
ayatana-indicator-session-9efc81691426e023df3a2124a6d65a7f4e4fb327.zip
Making the locking menu item a global and make it sensitive based on whether there is autologin.
-rw-r--r--src/users-service.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/src/users-service.c b/src/users-service.c
index dc11e8d..894b832 100644
--- a/src/users-service.c
+++ b/src/users-service.c
@@ -53,6 +53,8 @@ static DbusmenuMenuitem *root_menuitem = NULL;
static GMainLoop *mainloop = NULL;
static UsersServiceDbus *dbus_interface = NULL;
+static DbusmenuMenuitem *lock_menuitem = NULL;
+
static DBusGProxy * gdm_settings_proxy = NULL;
static gboolean gdm_auto_login = FALSE;
static const gchar * gdm_auto_login_string = "daemon/AutomaticLoginEnable";
@@ -78,6 +80,14 @@ gdm_settings_change (DBusGProxy * proxy, const gchar * value, const gchar * old,
gdm_auto_login = FALSE;
}
+ if (lock_menuitem != NULL) {
+ if (gdm_auto_login) {
+ dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_SENSITIVE, "false");
+ } else {
+ dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_SENSITIVE, "true");
+ }
+ }
+
return;
}
@@ -277,10 +287,15 @@ rebuild_items (DbusmenuMenuitem *root,
g_list_foreach (children, (GFunc)g_object_unref, NULL);
g_list_free (children);
- mi = dbusmenu_menuitem_new();
- dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));
- g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(lock_screen), NULL);
- dbusmenu_menuitem_child_append(root, mi);
+ 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 (gdm_auto_login) {
+ dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_SENSITIVE, "false");
+ } else {
+ dbusmenu_menuitem_property_set(lock_menuitem, DBUSMENU_MENUITEM_PROP_SENSITIVE, "true");
+ }
if (can_activate == TRUE)
{