Conor Curran has proposed merging
lp:~cjcurran/indicator-session/redundant-max-users-limit into
lp:indicator-session.
Requested reviews:
Ted Gould (ted)
Related bugs:
Bug #874194 in Session Menu: "indicator-session shows name as "[Invalid
UTF-8]" for some users"
https://bugs.launchpad.net/indicator-session/+bug/874194
For more details, see:
https://code.launchpad.net/~cjcurran/indicator-session/redundant-max-users-limit/+merge/80394
fixes bug attached. No need for Max users limit now that the users have their
own menu.
--
https://code.launchpad.net/~cjcurran/indicator-session/redundant-max-users-limit/+merge/80394
Your team ayatana-commits is subscribed to branch lp:indicator-session.
=== modified file '.bzrignore'
--- .bzrignore 2011-08-24 21:03:53 +0000
+++ .bzrignore 2011-10-25 21:52:23 +0000
@@ -213,3 +213,31 @@
data/indicator-session-lock-screen.desktop
test-ascii-quotes
test-space-ellipsis
+po/af.gmo
+po/an.gmo
+po/bo.gmo
+po/c...@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
=== modified file 'src/user-menu-mgr.c'
--- src/user-menu-mgr.c 2011-09-07 20:02:44 +0000
+++ src/user-menu-mgr.c 2011-10-25 21:52:23 +0000
@@ -191,7 +191,7 @@
- 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 @@
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,
=== modified file 'src/users-service-dbus.c'
--- src/users-service-dbus.c 2011-09-21 05:47:17 +0000
+++ src/users-service-dbus.c 2011-10-25 21:52:23 +0000
@@ -303,7 +303,6 @@
priv->count = users->len;
g_ptr_array_free (users, TRUE);
-
sync_users (self);
}
@@ -719,7 +718,7 @@
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 @@
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,
=== modified file 'src/users-service-dbus.h'
--- src/users-service-dbus.h 2011-09-07 20:02:44 +0000
+++ src/users-service-dbus.h 2011-10-25 21:52:23 +0000
@@ -58,7 +58,6 @@
* got some gdm issues worked out.
*/
#define MINIMUM_USERS 0
-#define MAXIMUM_USERS 7
struct _UsersServiceDbus {
GObject parent;
_______________________________________________
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
