aboutsummaryrefslogtreecommitdiff
path: root/src/session-service.c
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-07-13 13:12:00 +0100
committerConor Curran <conor.curran@canonical.com>2011-07-13 13:12:00 +0100
commit1967b9c58fd2727733fb38c10d610eb80e365ae3 (patch)
tree1329ac1894461ecb93960122fbbca5cb400a01d6 /src/session-service.c
parent8cabcd77fd3788d9b2b3ffeb09b57a46bcfa640e (diff)
downloadayatana-indicator-session-1967b9c58fd2727733fb38c10d610eb80e365ae3.tar.gz
ayatana-indicator-session-1967b9c58fd2727733fb38c10d610eb80e365ae3.tar.bz2
ayatana-indicator-session-1967b9c58fd2727733fb38c10d610eb80e365ae3.zip
tidied up signals and methods for the session service so as the users real name should be available and not the icon, icon should not change on the panel
Diffstat (limited to 'src/session-service.c')
-rw-r--r--src/session-service.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/session-service.c b/src/session-service.c
index c1fad59..d213b6d 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -143,7 +143,6 @@ keybinding_changed (GConfClient *client,
dbusmenu_menuitem_property_set_shortcut_string(lock_menuitem, gconf_value_get_string(value));
}
}
-
return;
}
@@ -161,7 +160,7 @@ ensure_gconf_client (void)
gconf_client_add_dir(gconf_client, KEYBINDING_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
gconf_client_notify_add(gconf_client, KEYBINDING_DIR, keybinding_changed, NULL, NULL, NULL);
}
- return;
+ return;
}
/* Check to see if the lockdown key is protecting from
@@ -541,6 +540,9 @@ rebuild_user_items (DbusmenuMenuitem *root,
dbusmenu_menuitem_property_set_bool (mi,
USER_ITEM_PROP_IS_CURRENT_USER,
logged_in);
+ if (logged_in == TRUE){
+ session_dbus_set_name (session_dbus, user->real_name);
+ }
dbusmenu_menuitem_child_append (root, mi);
g_signal_connect (G_OBJECT (mi),
@@ -800,8 +802,8 @@ main (int argc, char ** argv)
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
textdomain (GETTEXT_PACKAGE);
- IndicatorService * service = indicator_service_new_version(INDICATOR_SESSION_DBUS_NAME,
- INDICATOR_SESSION_DBUS_VERSION);
+ IndicatorService * service = indicator_service_new_version (INDICATOR_SESSION_DBUS_NAME,
+ INDICATOR_SESSION_DBUS_VERSION);
g_signal_connect(G_OBJECT(service),
INDICATOR_SERVICE_SIGNAL_SHUTDOWN,
G_CALLBACK(service_shutdown), NULL);