← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/indicator-session/oneiric-proposed

« back to all changes in this revision

Viewing changes to src/user-menu-mgr.c

  • Committer: Package Import Robot
  • Author(s): Ken VanDine, Ken VanDine, Ted Gould
  • Date: 2011-09-01 13:53:50 UTC
  • mfrom: (1.1.37 upstream)
  • Revision ID: package-import@ubuntu.com-20110901135350-sl5g84ls1z0r7kwc
Tags: 0.3.4.1-0ubuntu1
https://launchpad.net/bugs/834948
https://launchpad.net/bugs/837246
https://launchpad.net/bugs/837658
https://launchpad.net/bugs/824243
https://launchpad.net/bugs/833965
https://launchpad.net/bugs/833965
[Ken VanDine]
* New upstream release.
  - in a Guest session user menu is not visible (LP: #834948)
  - User name shown as [Invalid UTF-8] in live session (LP: #837246)
  - "Reboot Required" menu opens Update Manager, doesn't reboot (LP: #837658)
  - indicator-session-service crashed with SIGSEGV in 
    g_str_hash() (LP: #824243)
  - indicator-session-service crashed with SIGSEGV in 
    g_variant_unref() (LP: #833965)
* +debian/patches/revert_icon_change.patch
  - revert the icon change in greeter mode until a UIF exception is 
    approved
* +debian/source/format

[Ted Gould]
* debian/control: Adding a depend on gnome-settings-daemon to ensure that
  the required schemas are available.  (LP: #833965)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/user-menu-mgr.c
168
168
      users_service_dbus_set_guest_item (self->users_dbus_interface,
169
169
                                         guest_mi);
170
170
    }
 
171
    else{
 
172
      session_dbus_set_users_real_name (self->session_dbus_interface,
 
173
                                        _("Guest"));      
 
174
    }
171
175
    
172
176
    GList * users = NULL;
173
177
    users = users_service_dbus_get_user_list (self->users_dbus_interface);
176
180
    gboolean user_menu_is_visible = FALSE;
177
181
    
178
182
    if (!greeter_mode){
179
 
      user_menu_is_visible = self->user_count > 1 || check_guest_session();
 
183
      user_menu_is_visible = TRUE;
180
184
    }
181
185
    
182
186
    session_dbus_set_user_menu_visibility (self->session_dbus_interface,
188
192
 
189
193
    for (u = users; u != NULL; u = g_list_next (u)) {
190
194
      user = u->data;
191
 
      //g_debug ("%p: %s", user, user->real_name);      
 
195
      g_debug ("%s: %s", user->user_name, user->real_name);      
192
196
      user->service = self->users_dbus_interface;
193
197
      gboolean current_user = g_strcmp0 (user->user_name, g_get_user_name()) == 0;  
194
198
      if (current_user == TRUE){
195
 
        if (check_guest_session()){
196
 
          g_debug ("about to set the users real name to %s for user %s",
197
 
                    user->real_name, user->user_name);
198
 
          session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name);
199
 
        }
200
 
        else{
201
 
          g_debug ("about to set the users real name to GUEST");            
202
 
          session_dbus_set_users_real_name (self->session_dbus_interface,
203
 
                                            _("Guest"));            
204
 
        }            
 
199
        g_debug ("about to set the users real name to %s for user %s",
 
200
                  user->real_name, user->user_name);
 
201
        session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name);
205
202
      }
206
203
           
207
 
      
208
 
      if (g_strcmp0(user->user_name, "guest") == 0) {
209
 
        /* Check to see if the guest has sessions and so therefore should
210
 
           get a check mark. */
211
 
        dbusmenu_menuitem_property_set_bool (guest_mi,
212
 
                                             USER_ITEM_PROP_LOGGED_IN,
213
 
                                             user->sessions != NULL);
214
 
        /* If we're showing user accounts, keep going through the list */
215
 
        if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) {
216
 
          continue;
217
 
        }
218
 
        /* If not, we can stop here */
219
 
        break;
220
 
      }
221
 
 
222
204
      if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) {
223
205
        mi = dbusmenu_menuitem_new ();
224
206
        dbusmenu_menuitem_property_set (mi,