aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-07 20:41:26 -0600
committerTed Gould <ted@gould.cx>2012-02-07 20:41:26 -0600
commitdadd9430e33c73e1a007f280694bc5e908472757 (patch)
tree935f6f51b92816c52fab7d8d6d6611add99c7fca
parent301718cf2414986a9ed20f9aa33b62a478d6fa79 (diff)
parentf2b3d4838b6a175458f903aeb8a8d04fe7a842a5 (diff)
downloadayatana-indicator-session-dadd9430e33c73e1a007f280694bc5e908472757.tar.gz
ayatana-indicator-session-dadd9430e33c73e1a007f280694bc5e908472757.tar.bz2
ayatana-indicator-session-dadd9430e33c73e1a007f280694bc5e908472757.zip
Import upstream version 0.3.7.1
-rw-r--r--ChangeLog16
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
-rw-r--r--src/user-menu-mgr.c4
-rw-r--r--src/users-service-dbus.c10
-rw-r--r--src/users-service-dbus.h1
6 files changed, 22 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 7028902..3302930 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/configure b/configure
index dd86dae..2e53c0d 100755
--- a/configure
+++ b/configure
@@ -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/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;