r14617 - in /desktop/unstable/gnome-panel/debian: changelog patches/03_gnome-panel-logout.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Feb 16 17:01:31 UTC 2008
Author: joss
Date: Sat Feb 16 17:01:30 2008
New Revision: 14617
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14617
Log:
* 03_gnome-panel-logout.patch: correctly call gtk_main_quit to avoid
leaking processes, d’uh. Closes: #466070.
Modified:
desktop/unstable/gnome-panel/debian/changelog
desktop/unstable/gnome-panel/debian/patches/03_gnome-panel-logout.patch
Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=14617&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Sat Feb 16 17:01:30 2008
@@ -1,3 +1,10 @@
+gnome-panel (2.20.3-3) unstable; urgency=low
+
+ * 03_gnome-panel-logout.patch: correctly call gtk_main_quit to avoid
+ leaking processes, d’uh. Closes: #466070.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 16 Feb 2008 17:52:30 +0100
+
gnome-panel (2.20.3-2) unstable; urgency=low
[ Loic Minier ]
Modified: desktop/unstable/gnome-panel/debian/patches/03_gnome-panel-logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/03_gnome-panel-logout.patch?rev=14617&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/03_gnome-panel-logout.patch (original)
+++ desktop/unstable/gnome-panel/debian/patches/03_gnome-panel-logout.patch Sat Feb 16 17:01:30 2008
@@ -1,9 +1,9 @@
Bugzilla #507391
-Index: gnome-panel-2.20.2/gnome-panel/gnome-panel-logout.c
+Index: gnome-panel-2.20.3/gnome-panel/gnome-panel-logout.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-panel-2.20.2/gnome-panel/gnome-panel-logout.c 2008-01-04 23:43:16.745305133 +0100
++++ gnome-panel-2.20.3/gnome-panel/gnome-panel-logout.c 2008-02-16 17:47:32.099271109 +0100
@@ -0,0 +1,49 @@
+/* GNOME panel : logout/shutdown request standalone binary
+ *
@@ -54,10 +54,10 @@
+ g_object_unref (program);
+ return 0;
+}
-Index: gnome-panel-2.20.2/gnome-panel/panel-session.c
-===================================================================
---- gnome-panel-2.20.2.orig/gnome-panel/panel-session.c 2008-01-04 22:46:22.034711866 +0100
-+++ gnome-panel-2.20.2/gnome-panel/panel-session.c 2008-01-04 22:47:59.320255853 +0100
+Index: gnome-panel-2.20.3/gnome-panel/panel-session.c
+===================================================================
+--- gnome-panel-2.20.3.orig/gnome-panel/panel-session.c 2008-01-07 23:26:25.000000000 +0100
++++ gnome-panel-2.20.3/gnome-panel/panel-session.c 2008-02-16 17:47:32.099271109 +0100
@@ -29,8 +29,10 @@
#include <stdlib.h>
@@ -82,10 +82,10 @@
G_CALLBACK (panel_session_handle_die_request), NULL);
}
+#endif // BUILDING_STANDALONE_LOGOUT
-Index: gnome-panel-2.20.2/gnome-panel/panel-util.c
-===================================================================
---- gnome-panel-2.20.2.orig/gnome-panel/panel-util.c 2008-01-04 23:05:20.691600224 +0100
-+++ gnome-panel-2.20.2/gnome-panel/panel-util.c 2008-01-04 23:48:40.699766245 +0100
+Index: gnome-panel-2.20.3/gnome-panel/panel-util.c
+===================================================================
+--- gnome-panel-2.20.3.orig/gnome-panel/panel-util.c 2008-01-07 23:26:25.000000000 +0100
++++ gnome-panel-2.20.3/gnome-panel/panel-util.c 2008-02-16 17:47:32.099271109 +0100
@@ -31,6 +31,7 @@
#include <libgnomevfs/gnome-vfs-uri.h>
#include <libgnomevfs/gnome-vfs-ops.h>
@@ -147,10 +147,10 @@
g_strdup (text), (GClosureNotify) g_free, 0);
}
+#endif // BUILDING_STANDALONE_LOGOUT
-Index: gnome-panel-2.20.2/configure.in
-===================================================================
---- gnome-panel-2.20.2.orig/configure.in 2008-01-04 23:11:27.372496177 +0100
-+++ gnome-panel-2.20.2/configure.in 2008-01-04 23:13:19.530887720 +0100
+Index: gnome-panel-2.20.3/configure.in
+===================================================================
+--- gnome-panel-2.20.3.orig/configure.in 2008-01-07 23:33:56.000000000 +0100
++++ gnome-panel-2.20.3/configure.in 2008-02-16 17:47:32.099271109 +0100
@@ -72,6 +72,10 @@ PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $O
AC_SUBST(PANEL_CFLAGS)
AC_SUBST(PANEL_LIBS)
@@ -162,10 +162,10 @@
PKG_CHECK_MODULES(LIBPANEL_APPLET, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
AC_SUBST(LIBPANEL_APPLET_CFLAGS)
AC_SUBST(LIBPANEL_APPLET_LIBS)
-Index: gnome-panel-2.20.2/gnome-panel/Makefile.am
-===================================================================
---- gnome-panel-2.20.2.orig/gnome-panel/Makefile.am 2008-01-04 23:06:15.078699568 +0100
-+++ gnome-panel-2.20.2/gnome-panel/Makefile.am 2008-01-04 23:31:33.613235919 +0100
+Index: gnome-panel-2.20.3/gnome-panel/Makefile.am
+===================================================================
+--- gnome-panel-2.20.3.orig/gnome-panel/Makefile.am 2008-01-07 23:26:25.000000000 +0100
++++ gnome-panel-2.20.3/gnome-panel/Makefile.am 2008-02-16 17:47:32.099271109 +0100
@@ -29,6 +29,7 @@ STANDARD_PROPERTIES_CFLAGS = \
bin_PROGRAMS = \
@@ -197,10 +197,10 @@
gnome_desktop_item_edit_SOURCES = \
gnome-desktop-item-edit.c \
panel-ditem-editor.c \
-Index: gnome-panel-2.20.2/gnome-panel/panel-logout.c
-===================================================================
---- gnome-panel-2.20.2.orig/gnome-panel/panel-logout.c 2008-01-04 23:43:39.230586496 +0100
-+++ gnome-panel-2.20.2/gnome-panel/panel-logout.c 2008-01-04 23:57:16.161140715 +0100
+Index: gnome-panel-2.20.3/gnome-panel/panel-logout.c
+===================================================================
+--- gnome-panel-2.20.3.orig/gnome-panel/panel-logout.c 2008-02-16 17:47:30.959270722 +0100
++++ gnome-panel-2.20.3/gnome-panel/panel-logout.c 2008-02-16 17:50:26.587269360 +0100
@@ -177,8 +177,6 @@ panel_logout_response (PanelLogoutDialog
gtk_widget_destroy (GTK_WIDGET (logout_dialog));
@@ -210,19 +210,24 @@
case PANEL_LOGOUT_RESPONSE_LOGOUT:
gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
panel_session_request_logout ();
-@@ -203,8 +201,12 @@ panel_logout_response (PanelLogoutDialog
+@@ -203,6 +201,7 @@ panel_logout_response (PanelLogoutDialog
if (panel_power_manager_can_suspend (power_manager))
panel_power_manager_attempt_suspend (power_manager);
break;
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_NONE:
case GTK_RESPONSE_DELETE_EVENT:
+ break;
+@@ -211,6 +210,9 @@ panel_logout_response (PanelLogoutDialog
+ }
+ g_object_unref (power_manager);
+ g_object_unref (screen);
+#ifdef BUILDING_STANDALONE_LOGOUT
-+ gtk_main_quit ();
++ gtk_main_quit ();
+#endif
- break;
- default:
- g_assert_not_reached ();
+ }
+
+ static gboolean
@@ -307,8 +309,10 @@ panel_logout_new (PanelLogoutDialogType
if (current_dialog != NULL) {
More information about the pkg-gnome-commits
mailing list