From 9631736c86733243e55b82b6e3f0ce2bc8489d8c Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Thu, 25 Aug 2011 18:52:42 +0100
Subject: fix the min users bug plus guest label utf8 issue

---
 src/user-menu-mgr.c | 48 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

(limited to 'src/user-menu-mgr.c')

diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c
index 64b29c5..1b404d3 100644
--- a/src/user-menu-mgr.c
+++ b/src/user-menu-mgr.c
@@ -188,17 +188,29 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
 
     for (u = users; u != NULL; u = g_list_next (u)) {
       user = u->data;
-      g_debug ("%p: %s", user, user->real_name);      
+      //g_debug ("%p: %s", user, user->real_name);      
       user->service = self->users_dbus_interface;
-
+      gboolean current_user = g_strcmp0 (user->user_name, g_get_user_name()) == 0;  
+      if (current_user == TRUE){
+        if (check_guest_session()){
+          g_debug ("about to set the users real name to %s for user %s",
+                    user->real_name, user->user_name);
+          session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name);
+        }
+        else{
+          g_debug ("about to set the users real name to GUEST");            
+          session_dbus_set_users_real_name (self->session_dbus_interface,
+                                            _("Guest"));            
+        }            
+      }
+           
+      
       if (g_strcmp0(user->user_name, "guest") == 0) {
         /* Check to see if the guest has sessions and so therefore should
            get a check mark. */
-        if (user->sessions != NULL) {
-          dbusmenu_menuitem_property_set_bool (guest_mi,
-                                               USER_ITEM_PROP_LOGGED_IN,
-                                               TRUE);
-        }
+        dbusmenu_menuitem_property_set_bool (guest_mi,
+                                             USER_ITEM_PROP_LOGGED_IN,
+                                             user->sessions != NULL);
         /* If we're showing user accounts, keep going through the list */
         if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) {
           continue;
@@ -217,7 +229,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 ("%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);
@@ -238,28 +250,14 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
                                           USER_ITEM_ICON_DEFAULT);
         }
         
-        gboolean logged_in = g_strcmp0 (user->user_name, g_get_user_name()) == 0;       
         
-        g_debug ("user name = %s and g user name = %s",
+        /*g_debug ("user name = %s and g user name = %s",
                  user->user_name,
-                 g_get_user_name());
+                 g_get_user_name());*/
                  
         dbusmenu_menuitem_property_set_bool (mi,
                                              USER_ITEM_PROP_IS_CURRENT_USER,
-                                             logged_in);          
-        if (logged_in == TRUE){
-          if (check_guest_session()){
-            g_debug ("about to set the users real name to %s for user %s",
-                      user->real_name, user->user_name);
-            session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name);
-          }
-          else{
-            g_debug ("about to set the users real name to GUEST");            
-            session_dbus_set_users_real_name (self->session_dbus_interface,
-                                              _("Guest"));            
-          }            
-        }
-        
+                                             current_user);                  
         dbusmenu_menuitem_child_append (self->root_item, mi);
         g_signal_connect (G_OBJECT (mi),
                           DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-- 
cgit v1.2.3