r19571 - /desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Apr 13 20:16:55 UTC 2009
Author: joss
Date: Mon Apr 13 20:16:55 2009
New Revision: 19571
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19571
Log:
Fix a little bug that led gnome-panel-logout to not exit
Modified:
desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch
Modified: desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch?rev=19571&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch Mon Apr 13 20:16:55 2009
@@ -1,7 +1,7 @@
Index: gnome-panel-2.26.0/configure.in
===================================================================
---- gnome-panel-2.26.0.orig/configure.in 2009-04-12 15:03:07.345981528 +0200
-+++ gnome-panel-2.26.0/configure.in 2009-04-12 15:03:09.161980557 +0200
+--- gnome-panel-2.26.0.orig/configure.in 2009-04-12 16:24:22.861979930 +0200
++++ gnome-panel-2.26.0/configure.in 2009-04-12 16:31:57.189979090 +0200
@@ -74,6 +74,10 @@ PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $O
AC_SUBST(PANEL_CFLAGS)
AC_SUBST(PANEL_LIBS)
@@ -15,8 +15,8 @@
AC_SUBST(LIBPANEL_APPLET_LIBS)
Index: gnome-panel-2.26.0/gnome-panel/Makefile.am
===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am 2009-04-12 15:03:07.317979924 +0200
-+++ gnome-panel-2.26.0/gnome-panel/Makefile.am 2009-04-12 15:03:09.161980557 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am 2009-04-12 16:27:24.557979981 +0200
++++ gnome-panel-2.26.0/gnome-panel/Makefile.am 2009-04-12 16:31:57.193979179 +0200
@@ -31,6 +31,7 @@ STANDARD_PROPERTIES_CFLAGS = \
bin_PROGRAMS = \
@@ -52,8 +52,8 @@
Index: gnome-panel-2.26.0/gnome-panel/gnome-panel-logout.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-panel-2.26.0/gnome-panel/gnome-panel-logout.c 2009-04-12 15:09:18.257979071 +0200
-@@ -0,0 +1,53 @@
++++ gnome-panel-2.26.0/gnome-panel/gnome-panel-logout.c 2009-04-12 16:42:38.889978042 +0200
+@@ -0,0 +1,56 @@
+/* GNOME panel : logout/shutdown request standalone binary
+ *
+ * (C) 2007 Josselin Mouette
@@ -79,6 +79,7 @@
+ GOptionContext *context;
+ GnomeProgram *program;
+ PanelSessionManager *manager;
++ gboolean ret;
+
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -99,18 +100,20 @@
+ manager = panel_session_manager_get ();
+
+ if (shutdown_requested)
-+ panel_session_manager_request_shutdown (manager);
++ ret = panel_session_manager_request_shutdown (manager);
+ else
-+ panel_session_manager_request_logout (manager, PANEL_SESSION_MANAGER_LOGOUT_MODE_NORMAL);
-+
-+ gtk_main ();
++ ret = panel_session_manager_request_logout (manager, PANEL_SESSION_MANAGER_LOGOUT_MODE_NORMAL);
++
++ /* Don’t run gtk_main if gnome-session could be reached through D-Bus */
++ if (!ret)
++ gtk_main ();
+ g_object_unref (program);
+ return 0;
+}
Index: gnome-panel-2.26.0/gnome-panel/panel-logout.c
===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-logout.c 2009-04-12 15:03:07.233980003 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-logout.c 2009-04-12 15:03:09.161980557 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-logout.c 2009-04-12 16:31:56.277978261 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-logout.c 2009-04-12 16:31:57.193979179 +0200
@@ -182,8 +182,6 @@ panel_logout_response (PanelLogoutDialog
gtk_widget_destroy (GTK_WIDGET (logout_dialog));
@@ -164,8 +167,8 @@
}
Index: gnome-panel-2.26.0/gnome-panel/panel-session.c
===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-session.c 2009-04-12 15:03:07.185981375 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-session.c 2009-04-12 15:03:09.161980557 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-session.c 2009-04-12 16:27:24.557979981 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-session.c 2009-04-12 16:31:57.193979179 +0200
@@ -28,7 +28,9 @@
#include <stdlib.h>
@@ -191,8 +194,8 @@
+#endif // BUILDING_STANDALONE_LOGOUT
Index: gnome-panel-2.26.0/gnome-panel/panel-util.c
===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-util.c 2009-04-12 15:03:07.161981327 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-util.c 2009-04-12 15:03:09.165980647 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-util.c 2009-04-12 16:24:22.717980622 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-util.c 2009-04-12 16:31:57.193979179 +0200
@@ -33,6 +33,7 @@
#include <libpanel-util/panel-glib.h>
#include <libpanel-util/panel-keyfile.h>
@@ -300,8 +303,8 @@
+#endif // BUILDING_STANDALONE_LOGOUT
Index: gnome-panel-2.26.0/gnome-panel/panel-lockdown.c
===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-lockdown.c 2009-04-12 15:03:07.085981095 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-lockdown.c 2009-04-12 15:03:09.165980647 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-lockdown.c 2009-04-12 16:24:22.697978709 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-lockdown.c 2009-04-12 16:31:57.197978779 +0200
@@ -26,10 +26,14 @@
#include "panel-lockdown.h"
@@ -355,3 +358,70 @@
g_closure_unref (closure);
}
+#endif /* BUILDING_STANDALONE_LOGOUT */
+Index: gnome-panel-2.26.0/gnome-panel/libpanel-util/panel-session-manager.c
+===================================================================
+--- gnome-panel-2.26.0.orig/gnome-panel/libpanel-util/panel-session-manager.c 2009-04-12 16:40:33.685979698 +0200
++++ gnome-panel-2.26.0/gnome-panel/libpanel-util/panel-session-manager.c 2009-04-12 16:39:38.657980889 +0200
+@@ -83,7 +83,7 @@ panel_session_manager_constructor (GType
+ return obj;
+ }
+
+-void
++gboolean
+ panel_session_manager_request_logout (PanelSessionManager *manager,
+ PanelSessionManagerLogoutType mode)
+ {
+@@ -113,7 +113,7 @@ panel_session_manager_request_logout (Pa
+ default:
+ g_warning ("Invalid mode requested for logout");
+ }
+- return;
++ return FALSE;
+ }
+
+ proxy = panel_dbus_service_get_proxy (PANEL_DBUS_SERVICE (manager));
+@@ -126,9 +126,10 @@ panel_session_manager_request_logout (Pa
+ error->message);
+ g_error_free (error);
+ }
++ return TRUE;
+ }
+
+-void
++gboolean
+ panel_session_manager_request_shutdown (PanelSessionManager *manager)
+ {
+ GError *error;
+@@ -149,7 +150,7 @@ panel_session_manager_request_shutdown (
+ gdk_screen_get_default (),
+ gtk_get_current_event_time ());
+
+- return;
++ return FALSE;
+ }
+
+ proxy = panel_dbus_service_get_proxy (PANEL_DBUS_SERVICE (manager));
+@@ -162,6 +163,7 @@ panel_session_manager_request_shutdown (
+ error->message);
+ g_error_free (error);
+ }
++ return TRUE;
+ }
+
+ gboolean
+Index: gnome-panel-2.26.0/gnome-panel/libpanel-util/panel-session-manager.h
+===================================================================
+--- gnome-panel-2.26.0.orig/gnome-panel/libpanel-util/panel-session-manager.h 2009-04-12 16:35:14.381980796 +0200
++++ gnome-panel-2.26.0/gnome-panel/libpanel-util/panel-session-manager.h 2009-04-12 16:35:26.225979055 +0200
+@@ -60,9 +60,9 @@ typedef enum {
+
+ PanelSessionManager *panel_session_manager_get (void);
+
+-void panel_session_manager_request_logout (PanelSessionManager *session,
++gboolean panel_session_manager_request_logout (PanelSessionManager *session,
+ PanelSessionManagerLogoutType mode);
+-void panel_session_manager_request_shutdown (PanelSessionManager *session);
++gboolean panel_session_manager_request_shutdown (PanelSessionManager *session);
+
+ gboolean panel_session_manager_is_shutdown_available (PanelSessionManager *session);
+
More information about the pkg-gnome-commits
mailing list