aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-07 21:09:18 -0600
committerTed Gould <ted@gould.cx>2012-02-07 21:09:18 -0600
commit669d032147326fadfd606eb22efd5ca3e5c4d39a (patch)
tree9f22d3a09d1718d156728596596616231f231692
parent374c13ec920a441b4481db53f6516ca78e79de91 (diff)
parent6c05bbbd892c117777b11662b7e86c0d201398ec (diff)
downloadayatana-indicator-session-669d032147326fadfd606eb22efd5ca3e5c4d39a.tar.gz
ayatana-indicator-session-669d032147326fadfd606eb22efd5ca3e5c4d39a.tar.bz2
ayatana-indicator-session-669d032147326fadfd606eb22efd5ca3e5c4d39a.zip
Merge U. Desktop
-rw-r--r--ChangeLog16
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog57
-rw-r--r--debian/control12
-rw-r--r--debian/copyright92
-rw-r--r--debian/patches/01-remove-dead-gss-handling.patch175
-rw-r--r--debian/patches/series1
-rw-r--r--debian/rules1
-rw-r--r--src/user-menu-mgr.c4
-rw-r--r--src/users-service-dbus.c10
-rw-r--r--src/users-service-dbus.h1
12 files changed, 299 insertions, 74 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/debian/changelog b/debian/changelog
index 1baa28c..2ef82ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,45 @@
-indicator-session (0.3.7-0ubuntu1~ppa1) oneiric; urgency=low
+indicator-session (0.3.7.1-1ubuntu2) precise; urgency=low
+
+ * debian/patches/01-remove-dead-gss-handling.patch: Remove dead GSS
+ throttling code. Let gnome-settings-daemon handle locking the screen
+ when UPower requests it.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 28 Jan 2012 16:56:41 -0500
+
+indicator-session (0.3.7.1-1ubuntu1) precise; urgency=low
+
+ * rebuild for libindicator7
+ * debian/rules
+ - build with no-error=deprecated-declarations
+ * debian/control
+ - set ubuntu-desktop VCS and maintainer
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 25 Jan 2012 09:59:06 -0500
+
+indicator-session (0.3.7.1-1) experimental; urgency=low
+
+ * Merge from Ubuntu.
+ + Doesn't FTBFS with -Werror.
+ Closes: #625356
+ * Update debian/copyright.
+ * Add lintian override for desktop-command-not-in-package,
+ we need an own xdg-screensaver .desktop file.
+
+ -- Evgeni Golov <evgeni@debian.org> Sat, 05 Nov 2011 19:02:56 +0100
+
+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.
* Fix some variant ref issues causing crashes (LP: #863930)
* Handle cases of returned dbus messages from ConsoleKit (LP: #864085)
- * Fixed improperly mapped gconf to gsettings keys (LP: #858798)
-- Ted Gould <ted@ubuntu.com> Thu, 13 Oct 2011 13:19:13 -0500
@@ -231,6 +267,13 @@ indicator-session (0.2.90-0ubuntu1) oneiric; urgency=low
-- Ken VanDine <ken.vandine@canonical.com> Wed, 22 Jun 2011 12:18:18 -0400
+indicator-session (0.2.17-1) unstable; urgency=low
+
+ * Merge new upstream release from Ubuntu.
+ * Standards-Version: 3.9.2
+
+ -- Evgeni Golov <evgeni@debian.org> Sun, 05 Jun 2011 13:28:54 +0200
+
indicator-session (0.2.17-0ubuntu1) natty; urgency=low
* New upstream release.
@@ -245,6 +288,16 @@ indicator-session (0.2.16-0ubuntu1) natty; urgency=low
-- Ted Gould <ted@ubuntu.com> Thu, 07 Apr 2011 12:46:00 -0500
+indicator-session (0.2.15-1) unstable; urgency=low
+
+ * Merge from Ubuntu.
+ Closes: #620671
+ * Standards-Version: 3.9.1
+ * Improve package descriptions.
+ * Update debian/copyright to DEP5 rev173.
+
+ -- Evgeni Golov <evgeni@debian.org> Sun, 03 Apr 2011 14:16:17 +0200
+
indicator-session (0.2.15-0ubuntu1) natty; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index c81ca89..a09befd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: indicator-session
Section: gnome
Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Build-Depends: debhelper (>= 5.0),
cdbs (>= 0.4.41),
libgtk2.0-dev (>= 2.12.0),
@@ -33,7 +33,7 @@ Suggests: lightdm
Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
Replaces: indicator-sus, indicator-me
Breaks: indicator-me
-Description: Indicator showing session management, status and user switching.
+Description: indicator showing session management, status and user switching
This indicator is designed to be placed on the right side of a panel and
give the user easy control for changing their instant message status.
Switching to another user. Starting a guest session. Or controlling the
@@ -52,11 +52,11 @@ Recommends: indicator-applet (>= 0.2) | indicator-renderer
Suggests: lightdm
Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
Replaces: indicator-session (<< 0.2.90)
-Description: Indicator showing session management, status and user switching.
+Description: indicator showing session management, status and user switching
This indicator is designed to be placed on the right side of a panel and
- give the user easy control for changing their instant message status.
- Switching to another user. Starting a guest session. Or controlling the
+ give the user easy control for changing their instant message status,
+ switching to another user, starting a guest session or controlling the
status of their own session.
.
- It requires some way to be hosted into a panel. For the GNOME Panel the
+ It requires some way to be hosted into a panel. For the GNOME Panel the
appropriate package is indicator-applet-session.
diff --git a/debian/copyright b/debian/copyright
index 9a36417..46cbf0e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,39 @@
-This package was debianized by Ted Gould <ted@canonical.com> on
-Thu, 06 Aug 2009 17:23:01 +0100.
-
-It was downloaded from https://launchpad.net/indicator-applet
-
-Upstream Author:
-
- Ted Gould <ted@canonical.com>
-
-Copyright:
-
- Copyright (C) 2009 Canonical Ltd
- Copyright (C) 2004 Gustavo Noronha Silva
-
-License:
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 3 as
- published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Two files (logout-dialog.h logout-dialog.c) are under:
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301 USA
-
-
-The Debian packaging is:
-
- Copyright (C) 2009 Ted Gould <ted@canonical.com>
-
-On Debian/Ubuntu systems, the full text of the LGPL v2 can be found in
-`/usr/share/common-licenses/LGPL-2', the full text of the GPL v3 can be
-found in `/usr/share/common-licenses/GPL-3'
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Upstream-Name: indicator-session
+Upstream-Contact: Ted Gould <ted@canonical.com>
+Source: https://launchpad.net/indicator-session
+
+Files: *
+Copyright: 2009-2011 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: gconf-helper.*
+Copyright: 2009-2011 Christoph Korn <c_korn@gmx.de>
+License: GPL-3
+
+Files: gtk-logout-helper.c
+Copyright: 2009-2011 Ted Gould <ted@canonical.com>, Canonical Ltd.
+ 2009-2011 Christoph Korn <c_korn@gmx.de>
+License: GPL-3
+
+Files: session-service.c
+Copyright: 2009-2011 Ted Gould <ted@canonical.com>, Canonical Ltd.
+ 2009-2011 Christoph Korn <c_korn@gmx.de>
+ 2009-2011 Cody Russell <crussell@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: users-service-dbus.*
+Copyright: 2009-2011 Cody Russell <crussell@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: debian/*
+Copyright: 2011 Evgeni Golov <evgeni@debian.org>
+ 2009-2011 Ted Gould <ted@canonical.com>, Canonical Ltd.
+ 2009-2011 Sebastien Bacher <seb128@ubuntu.com>
+ 2009-2011 Ken VanDine <ken.vandine@canonical.com>
+ 2009-2011 Martin Pitt <martin.pitt@ubuntu.com>
+License: GPL-3
+
+License: GPL-3
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/patches/01-remove-dead-gss-handling.patch b/debian/patches/01-remove-dead-gss-handling.patch
new file mode 100644
index 0000000..914a7a8
--- /dev/null
+++ b/debian/patches/01-remove-dead-gss-handling.patch
@@ -0,0 +1,175 @@
+Description: Remove dead GSS throttling code. Let gnome-settings-daemon
+ handle locking the screen when UPower requests it.
+Author: Marc Deslauriers <marc.deslauriers@canonical.com>
+
+Index: indicator-session-0.3.7.1/src/device-menu-mgr.c
+===================================================================
+--- indicator-session-0.3.7.1.orig/src/device-menu-mgr.c 2012-01-28 17:19:05.650929258 -0500
++++ indicator-session-0.3.7.1/src/device-menu-mgr.c 2012-01-28 17:29:47.274923139 -0500
+@@ -74,7 +74,6 @@
+ static void device_menu_mgr_ensure_settings_client (DeviceMenuMgr* self);
+ static void setup_up (DeviceMenuMgr* self);
+ static void device_menu_mgr_rebuild_items (DeviceMenuMgr *self);
+-static void lock_if_possible (DeviceMenuMgr* self);
+ static void machine_sleep_with_context (DeviceMenuMgr* self,
+ gchar* type);
+ static void show_system_settings_with_context (DbusmenuMenuitem * mi,
+@@ -162,27 +161,6 @@
+ return;
+ }
+
+-/* Check to see if the lockdown key is protecting from
+- locking the screen. If not, lock it. */
+-static void
+-lock_if_possible (DeviceMenuMgr* self) {
+- device_menu_mgr_ensure_settings_client (self);
+-
+- if (!g_settings_get_boolean (lockdown_settings, LOCKDOWN_KEY_SCREENSAVER)) {
+- lock_screen (NULL, 0, NULL);
+- }
+- return;
+-}
+-
+-/* A return from the command to sleep the system. Make sure
+- that we unthrottle the screensaver. */
+-static void
+-sleep_response (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
+-{
+- screensaver_unthrottle();
+- return;
+-}
+-
+ static void
+ machine_sleep_from_suspend (DbusmenuMenuitem * mi,
+ guint timestamp,
+@@ -210,11 +188,9 @@
+ g_warning("Can not %s as no upower proxy", type);
+ }
+
+- screensaver_throttle(type);
+- lock_if_possible (self);
+ dbus_g_proxy_begin_call(up_main_proxy,
+ type,
+- sleep_response,
++ NULL,
+ NULL,
+ NULL,
+ G_TYPE_INVALID);
+Index: indicator-session-0.3.7.1/src/lock-helper.c
+===================================================================
+--- indicator-session-0.3.7.1.orig/src/lock-helper.c 2012-01-28 17:19:05.634929258 -0500
++++ indicator-session-0.3.7.1/src/lock-helper.c 2012-01-28 17:19:07.142929243 -0500
+@@ -29,8 +29,6 @@
+
+ static DBusGProxy * gss_proxy = NULL;
+ static GMainLoop * gss_mainloop = NULL;
+-static guint cookie = 0;
+-static DBusGProxyCall * cookie_call = NULL;
+
+ static gboolean is_guest = FALSE;
+
+@@ -38,90 +36,6 @@
+
+ void build_gss_proxy (void);
+
+-/* Checks to see if there is an error and reports
+- it. Not much else we can do. */
+-static void
+-unthrottle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
+-{
+- GError * error = NULL;
+- dbus_g_proxy_end_call(proxy, call, &error,
+- G_TYPE_INVALID);
+-
+- if (error != NULL) {
+- g_warning("Unable to unthrottle: %s", error->message);
+- }
+- return;
+-}
+-
+-/* Sends an unthrottle if we're throttled. */
+-void
+-screensaver_unthrottle (void)
+-{
+- g_return_if_fail(cookie != 0);
+-
+- build_gss_proxy();
+- g_return_if_fail(gss_proxy != NULL);
+-
+- dbus_g_proxy_begin_call(gss_proxy, "UnThrottle",
+- unthrottle_return, NULL,
+- NULL,
+- G_TYPE_UINT, cookie,
+- G_TYPE_INVALID);
+-
+- cookie = 0;
+- return;
+-}
+-
+-/* Gets there return cookie from the throttle command
+- and sets things valid */
+-static void
+-throttle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
+-{
+- GError * error = NULL;
+- cookie_call = NULL;
+-
+- dbus_g_proxy_end_call(proxy, call, &error,
+- G_TYPE_UINT, &cookie,
+- G_TYPE_INVALID);
+-
+- if (error != NULL) {
+- g_warning("Unable to throttle the screensaver: %s", error->message);
+- return;
+- }
+-
+-
+- if (cookie == 0) {
+- g_warning("We didn't get a throttle cookie!");
+- }
+-
+- return;
+-}
+-
+-/* Throttling the screensaver by using the screen saver
+- command. */
+-void
+-screensaver_throttle (gchar * reason)
+-{
+- g_return_if_fail(cookie_call == NULL);
+- g_return_if_fail(will_lock_screen());
+-
+- if (cookie != 0) {
+- screensaver_unthrottle();
+- }
+-
+- build_gss_proxy();
+- g_return_if_fail(gss_proxy != NULL);
+-
+- cookie_call = dbus_g_proxy_begin_call(gss_proxy, "Throttle",
+- throttle_return, NULL,
+- NULL,
+- G_TYPE_STRING, "Session Menu",
+- G_TYPE_STRING, reason,
+- G_TYPE_INVALID);
+-
+- return;
+-}
+-
+ /* This is our logic on whether the screen should be locked
+ or not. It effects everything else. */
+ gboolean
+Index: indicator-session-0.3.7.1/src/lock-helper.h
+===================================================================
+--- indicator-session-0.3.7.1.orig/src/lock-helper.h 2012-01-28 17:19:05.666929258 -0500
++++ indicator-session-0.3.7.1/src/lock-helper.h 2012-01-28 17:19:07.142929243 -0500
+@@ -24,9 +24,6 @@
+
+ #include <libdbusmenu-glib/menuitem.h>
+
+-void screensaver_throttle (gchar * reason);
+-void screensaver_unthrottle (void);
+-
+ gboolean will_lock_screen (void);
+ void lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data);
+ gboolean lock_screen_setup (gpointer data);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a5ccdc6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-remove-dead-gss-handling.patch
diff --git a/debian/rules b/debian/rules
index a393364..43ffda2 100644
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
+CFLAGS += -Wno-error=deprecated-declarations
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
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;