diff options
| -rw-r--r-- | .bzrignore | 28 | ||||
| -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 |
4 files changed, 32 insertions, 11 deletions
@@ -213,3 +213,31 @@ data/indicator-session-lock-screen.desktop.in data/indicator-session-lock-screen.desktop test-ascii-quotes test-space-ellipsis +po/af.gmo +po/an.gmo +po/bo.gmo +po/ca@valencia.gmo +po/cy.gmo +po/dv.gmo +po/fur.gmo +po/fy.gmo +po/gd.gmo +po/gv.gmo +po/hy.gmo +po/ka.gmo +po/km.gmo +po/ky.gmo +po/mg.gmo +po/mk.gmo +po/ml.gmo +po/my.gmo +po/ne.gmo +po/ny.gmo +po/os.gmo +po/sc.gmo +po/sd.gmo +po/ta.gmo +po/ta_LK.gmo +po/tt.gmo +po/ur.gmo +po/vec.gmo 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; |