diff options
| author | Ted Gould <ted@gould.cx> | 2012-02-07 20:41:26 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-02-07 20:41:26 -0600 |
| commit | dadd9430e33c73e1a007f280694bc5e908472757 (patch) | |
| tree | 935f6f51b92816c52fab7d8d6d6611add99c7fca /src | |
| parent | 301718cf2414986a9ed20f9aa33b62a478d6fa79 (diff) | |
| parent | f2b3d4838b6a175458f903aeb8a8d04fe7a842a5 (diff) | |
| download | ayatana-indicator-session-dadd9430e33c73e1a007f280694bc5e908472757.tar.gz ayatana-indicator-session-dadd9430e33c73e1a007f280694bc5e908472757.tar.bz2 ayatana-indicator-session-dadd9430e33c73e1a007f280694bc5e908472757.zip | |
Import upstream version 0.3.7.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/user-menu-mgr.c | 4 | ||||
| -rw-r--r-- | src/users-service-dbus.c | 10 | ||||
| -rw-r--r-- | src/users-service-dbus.h | 1 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c index efb3f7d..54e718f 100644 --- a/src/user-menu-mgr.c +++ b/src/user-menu-mgr.c @@ -191,7 +191,7 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode) - if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) { + if (self->user_count > MINIMUM_USERS) { users = g_list_sort (users, (GCompareFunc)compare_users_by_username); } @@ -206,7 +206,7 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode) session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name); } - if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) { + if (self->user_count > MINIMUM_USERS) { mi = dbusmenu_menuitem_new (); dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c index 971b854..09f916d 100644 --- a/src/users-service-dbus.c +++ b/src/users-service-dbus.c @@ -303,7 +303,6 @@ create_accounts_service_proxy (UsersServiceDbus *self) priv->count = users->len; g_ptr_array_free (users, TRUE); - sync_users (self); } @@ -719,7 +718,7 @@ sync_users (UsersServiceDbus *self) g_return_if_fail(IS_USERS_SERVICE_DBUS(self)); UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self); - if (priv->count > MINIMUM_USERS && priv->count < MAXIMUM_USERS) + if (priv->count > MINIMUM_USERS) { GPtrArray *users = NULL; GError *error = NULL; @@ -823,12 +822,7 @@ user_added (DBusGProxy *proxy, UsersServiceDbus *service = (UsersServiceDbus *)user_data; UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (service); priv->count++; - - if (priv->count < MAXIMUM_USERS) - { - sync_users (service); - } - + sync_users (service); g_signal_emit (service, signals[USER_ADDED], 0, diff --git a/src/users-service-dbus.h b/src/users-service-dbus.h index 25942df..b7db690 100644 --- a/src/users-service-dbus.h +++ b/src/users-service-dbus.h @@ -58,7 +58,6 @@ struct _UserData * got some gdm issues worked out. */ #define MINIMUM_USERS 0 -#define MAXIMUM_USERS 7 struct _UsersServiceDbus { GObject parent; |