← 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: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2011-08-10 16:23:33 UTC
  • mfrom: (1.1.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20110810162333-e1elpqez16qr18ya
Tags: 0.3.1-0ubuntu1
https://launchpad.net/bugs/815077
https://launchpad.net/bugs/811853
https://launchpad.net/bugs/818602
* New upstream release.
  - restart is missing from SessionMenu (LP: #815077)
  - Don't allow starting programs via the greeter indicators (LP: #811853)
  - Printer menu item should launch system-config-printer (LP: #818602)
  - gudev integration
  - apt restart required awareness
* debian/control
  - Added build depends on libgudev-1.0-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/user-menu-mgr.c
149
149
 
150
150
    for (u = users; u != NULL; u = g_list_next (u)) {
151
151
      user = u->data;
 
152
      g_debug ("%p: %s", user, user->real_name);      
152
153
      user->service = self->users_dbus_interface;
153
154
 
154
 
      g_debug ("%i %s", (gint)user->uid, user->user_name);
155
 
 
156
155
      if (g_strcmp0(user->user_name, "guest") == 0) {
157
156
        /* Check to see if the guest has sessions and so therefore should
158
157
           get a check mark. */
171
170
 
172
171
      if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) {
173
172
        mi = dbusmenu_menuitem_new ();
174
 
        dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE);
 
173
        dbusmenu_menuitem_property_set (mi,
 
174
                                        DBUSMENU_MENUITEM_PROP_TYPE,
 
175
                                        USER_ITEM_TYPE);
175
176
        if (user->real_name_conflict) {
176
177
          gchar * conflictedname = g_strdup_printf("%s (%s)", user->real_name, user->user_name);
177
178
          dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, conflictedname);
178
179
          g_free(conflictedname);
179
180
        } else {
180
 
          dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name);
 
181
          //g_debug ("%i %s", (gint)user->uid, user->real_name);
 
182
          //g_debug ("users uid = %i", (gint)user->uid);
 
183
          //g_debug ("users real name = %s", user->real_name);
 
184
          if (user == NULL){
 
185
            g_debug ("USER pointer is NULL");
 
186
            return;
 
187
          }
 
188
          g_debug ("%p: %s", user, user->real_name);      
 
189
          
 
190
          dbusmenu_menuitem_property_set (mi,
 
191
                                          USER_ITEM_PROP_NAME,
 
192
                                          user->real_name);
181
193
        }
182
194
        dbusmenu_menuitem_property_set_bool (mi,
183
195
                                             USER_ITEM_PROP_LOGGED_IN,