aboutsummaryrefslogtreecommitdiff
path: root/src/user-menu-mgr.c
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-08-22 15:53:07 +0100
committerConor Curran <conor.curran@canonical.com>2011-08-22 15:53:07 +0100
commit881e921a24838b3091ce4356d656e55137a1e953 (patch)
treede0967d0321766384f6e309bb4cf0aa6f5ce2d5b /src/user-menu-mgr.c
parent84a75758a3a76b024168612b3932d7b09e5bd1a8 (diff)
downloadayatana-indicator-session-881e921a24838b3091ce4356d656e55137a1e953.tar.gz
ayatana-indicator-session-881e921a24838b3091ce4356d656e55137a1e953.tar.bz2
ayatana-indicator-session-881e921a24838b3091ce4356d656e55137a1e953.zip
user images now being loaded into the user menu
Diffstat (limited to 'src/user-menu-mgr.c')
-rw-r--r--src/user-menu-mgr.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c
index 30ea0ff..1bd7468 100644
--- a/src/user-menu-mgr.c
+++ b/src/user-menu-mgr.c
@@ -92,8 +92,6 @@ static void
user_menu_mgr_class_init (UserMenuMgrClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- //GObjectClass* parent_class = G_OBJECT_CLASS (klass);
-
object_class->finalize = user_menu_mgr_finalize;
}
@@ -212,15 +210,7 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, conflictedname);
g_free(conflictedname);
} else {
- //g_debug ("%i %s", (gint)user->uid, user->real_name);
- //g_debug ("users uid = %i", (gint)user->uid);
- //g_debug ("users real name = %s", user->real_name);
- if (user == NULL){
- g_debug ("USER pointer is NULL");
- return;
- }
- g_debug ("%p: %s", user, user->real_name);
-
+ g_debug ("%p: %s", user, user->real_name);
dbusmenu_menuitem_property_set (mi,
USER_ITEM_PROP_NAME,
user->real_name);
@@ -229,9 +219,16 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
USER_ITEM_PROP_LOGGED_IN,
user->sessions != NULL);
if (user->icon_file != NULL && user->icon_file[0] != '\0') {
- dbusmenu_menuitem_property_set(mi, USER_ITEM_PROP_ICON, user->icon_file);
+ g_debug ("user %s has this icon : %s",
+ user->user_name,
+ user->icon_file);
+ dbusmenu_menuitem_property_set (mi,
+ USER_ITEM_PROP_ICON,
+ user->icon_file);
} else {
- dbusmenu_menuitem_property_set(mi, USER_ITEM_PROP_ICON, USER_ITEM_ICON_DEFAULT);
+ dbusmenu_menuitem_property_set (mi,
+ USER_ITEM_PROP_ICON,
+ USER_ITEM_ICON_DEFAULT);
}
gboolean logged_in = g_strcmp0 (user->user_name, g_get_user_name()) == 0;