From c0e6bba3332cbe1e74e0e2f60e734d43eb4937f9 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 19 Feb 2010 10:45:06 -0500 Subject: releasing version 0.2.3-0ubuntu2 --- debian/changelog | 8 ++++ debian/patches/fix-session-menu-without-gdm.patch | 46 +++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 debian/patches/fix-session-menu-without-gdm.patch diff --git a/debian/changelog b/debian/changelog index ff381c0..4c608d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-session (0.2.3-0ubuntu2) lucid; urgency=low + + * debian/patches/fix-session-menu-without-gdm.patch + - Don't fail with a g_error when we fail to get a list of user sessions + from gdm (LP: #506683) + + -- Ken VanDine Fri, 19 Feb 2010 09:43:14 -0500 + indicator-session (0.2.3-0ubuntu1) lucid; urgency=low * Upstream release 0.2.3 diff --git a/debian/patches/fix-session-menu-without-gdm.patch b/debian/patches/fix-session-menu-without-gdm.patch new file mode 100644 index 0000000..7b4b197 --- /dev/null +++ b/debian/patches/fix-session-menu-without-gdm.patch @@ -0,0 +1,46 @@ +=== modified file 'src/users-service-dbus.c' +--- src/users-service-dbus.c 2010-02-09 23:24:23 +0000 ++++ src/users-service-dbus.c 2010-02-19 12:22:47 +0000 +@@ -1,3 +1,4 @@ ++/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */ + /* + * Copyright 2009 Canonical Ltd. + * +@@ -183,7 +184,8 @@ + create_ck_proxy (self); + create_seat_proxy (self); + +- users_loaded (priv->gdm_proxy, self); ++ if (priv->gdm_proxy) ++ users_loaded (priv->gdm_proxy, self); + } + + static void +@@ -214,7 +216,7 @@ + { + if (error != NULL) + { +- g_error ("Unable to get DisplayManager proxy on system bus: %s", error->message); ++ g_warning ("Unable to get DisplayManager proxy on system bus: %s", error->message); + g_error_free (error); + } + +@@ -679,6 +681,8 @@ + GError *error = NULL; + gint count; + ++ g_return_if_fail (proxy != NULL); ++ + service = (UsersServiceDbus *)user_data; + priv = USERS_SERVICE_DBUS_GET_PRIVATE (service); + +@@ -859,6 +863,8 @@ + start_new_user_session (UsersServiceDbus *self, + UserData *user) + { ++ g_return_val_if_fail (IS_USERS_SERVICE_DBUS (self), FALSE); ++ + UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self); + GError *error = NULL; + char *ssid; + -- cgit v1.2.3 From b713998c9af2c9929c6b2667174cec5c4af75041 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 2 Mar 2010 16:03:59 +0100 Subject: releasing version 0.2.4-0ubuntu2 --- debian/changelog | 6 ++++++ src/gtk-dialog/logout-dialog.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 043f650..68d8e57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-session (0.2.4-0ubuntu2) lucid; urgency=low + + * Backport upstream change to fix decoration rendering issues + + -- Sebastien Bacher Tue, 02 Mar 2010 16:03:20 +0100 + indicator-session (0.2.4-0ubuntu1) lucid; urgency=low * Upstream release 0.2.4 diff --git a/src/gtk-dialog/logout-dialog.c b/src/gtk-dialog/logout-dialog.c index 65df9fe..98806ca 100644 --- a/src/gtk-dialog/logout-dialog.c +++ b/src/gtk-dialog/logout-dialog.c @@ -278,7 +278,6 @@ logout_dialog_init (LogoutDialog *logout_dialog) gtk_widget_realize(GTK_WIDGET(logout_dialog)); /* remove superfluous window buttons */ gdk_window_set_functions (GTK_WIDGET(logout_dialog)->window, 0); - gdk_window_set_decorations (GTK_WIDGET(logout_dialog)->window, GDK_DECOR_BORDER | GDK_DECOR_TITLE); /* center window */ gtk_window_set_position (GTK_WINDOW(logout_dialog), GTK_WIN_POS_CENTER); -- cgit v1.2.3