diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -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 |
7 files changed, 30 insertions, 13 deletions
@@ -1,5 +1,21 @@ # Generated by Makefile. Do not edit. +2011-10-28 Conor Curran <conor.curran@canonical.com> + + fix the invalid utf8 bug and update ignore file + +2011-10-25 Conor Curran <conor.curran@canonical.com> + + update the ignore file with the new translations + +2011-10-25 Conor Curran <conor.curran@canonical.com> + + tidy up + +2011-10-25 Conor Curran <conor.curran@canonical.com> + + removed the redundant max users limit on the user menu + 2011-10-13 Ted Gould <ted@gould.cx> 0.3.7 @@ -2745,7 +2745,7 @@ fi # Define the identity of the package. PACKAGE=indicator-session - VERSION=0.3.7 + VERSION=0.3.7.1 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index b29db0b..0e20a91 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.3.7) +AM_INIT_AUTOMAKE(indicator-session, 0.3.7.1) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index d987fda..52d7424 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-session (0.3.7.1-0ubuntu1) precise; urgency=low + + * New upstream release. + - indicator-session shows name as "[Invalid UTF-8]" if there are + more than 6 user accounts (LP: #874194) + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 28 Oct 2011 11:55:38 -0400 + indicator-session (0.3.7-0ubuntu1) oneiric-proposed; urgency=low * New upstream release. 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; |