r19887 - in /desktop/experimental/gnome-panel/debian: changelog patches/02_panel_logout.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon May 4 08:16:06 UTC 2009 

Author: joss
Date: Mon May  4 08:16:04 2009
New Revision: 19887

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19887
Log:
02_panel_logout.patch: correctly check whether GDM allows shutdown 
in case gnome-session 2.26 is not running. Closes: #526807.

Modified:
    desktop/experimental/gnome-panel/debian/changelog
    desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch

Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=19887&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog (original)
+++ desktop/experimental/gnome-panel/debian/changelog Mon May  4 08:16:04 2009
@@ -1,6 +1,8 @@
 gnome-panel (2.26.0-2) UNRELEASED; urgency=low
 
   * Require gnome-desktop 2.26. Closes: #526680.
+  * 02_panel_logout.patch: correctly check whether GDM allows shutdown 
+    in case gnome-session 2.26 is not running. Closes: #526807.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 04 May 2009 09:51:52 +0200
 

Modified: desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch?rev=19887&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch Mon May  4 08:16:04 2009
@@ -4,7 +4,7 @@
 Index: gnome-panel-2.26.0/gnome-panel/panel-gdm.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-panel-2.26.0/gnome-panel/panel-gdm.c	2009-04-12 14:11:25.650477350 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-gdm.c	2009-05-04 10:08:57.617386288 +0200
 @@ -0,0 +1,417 @@
 +/*
 + * gdm-protocol.c: GDM logout action protocol implementation
@@ -426,7 +426,7 @@
 Index: gnome-panel-2.26.0/gnome-panel/panel-logout.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-panel-2.26.0/gnome-panel/panel-logout.c	2009-04-12 14:11:25.650477350 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-logout.c	2009-05-04 10:08:57.617386288 +0200
 @@ -0,0 +1,402 @@
 +/*
 + * panel-logout.c:
@@ -833,7 +833,7 @@
 Index: gnome-panel-2.26.0/gnome-panel/panel-gdm.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-panel-2.26.0/gnome-panel/panel-gdm.h	2009-04-12 14:11:25.722478471 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-gdm.h	2009-05-04 10:08:57.621385818 +0200
 @@ -0,0 +1,52 @@
 +/*
 + * gdm-logout-action.h: GDM logout action protocol implementation
@@ -890,7 +890,7 @@
 Index: gnome-panel-2.26.0/gnome-panel/panel-logout.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-panel-2.26.0/gnome-panel/panel-logout.h	2009-04-12 14:11:25.722478471 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-logout.h	2009-05-04 10:08:57.621385818 +0200
 @@ -0,0 +1,66 @@
 +/*
 + * panel-logout.h:
@@ -961,7 +961,7 @@
 Index: gnome-panel-2.26.0/gnome-panel/panel-session.c
 ===================================================================
 --- gnome-panel-2.26.0.orig/gnome-panel/panel-session.c	2009-03-16 23:37:12.000000000 +0100
-+++ gnome-panel-2.26.0/gnome-panel/panel-session.c	2009-04-12 14:11:25.726478560 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-session.c	2009-05-04 10:08:57.621385818 +0200
 @@ -32,6 +32,34 @@
  
  #include "panel-session.h"
@@ -1000,8 +1000,8 @@
 Index: gnome-panel-2.26.0/gnome-panel/panel-session.h
 ===================================================================
 --- gnome-panel-2.26.0.orig/gnome-panel/panel-session.h	2009-03-16 23:37:12.000000000 +0100
-+++ gnome-panel-2.26.0/gnome-panel/panel-session.h	2009-04-12 14:11:25.726478560 +0200
-@@ -29,6 +29,7 @@ G_BEGIN_DECLS
++++ gnome-panel-2.26.0/gnome-panel/panel-session.h	2009-05-04 10:08:57.621385818 +0200
+@@ -29,6 +29,7 @@
  
  void panel_session_init           (void);
  void panel_session_do_not_restart (void);
@@ -1012,8 +1012,8 @@
 Index: gnome-panel-2.26.0/gnome-panel/Makefile.am
 ===================================================================
 --- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am	2009-03-16 23:37:12.000000000 +0100
-+++ gnome-panel-2.26.0/gnome-panel/Makefile.am	2009-04-12 14:11:25.726478560 +0200
-@@ -97,6 +97,8 @@ panel_sources =			\
++++ gnome-panel-2.26.0/gnome-panel/Makefile.am	2009-05-04 10:08:57.621385818 +0200
+@@ -97,6 +97,8 @@
  	panel-force-quit.c	\
  	panel-lockdown.c	\
  	panel-addto.c		\
@@ -1022,7 +1022,7 @@
  	panel-ditem-editor.c	\
  	$(NULL)
  
-@@ -143,6 +145,8 @@ panel_headers =			\
+@@ -143,6 +145,8 @@
  	panel-force-quit.h	\
  	panel-lockdown.h	\
  	panel-addto.h		\
@@ -1034,8 +1034,8 @@
 Index: gnome-panel-2.26.0/po/POTFILES.in
 ===================================================================
 --- gnome-panel-2.26.0.orig/po/POTFILES.in	2009-03-16 23:37:19.000000000 +0100
-+++ gnome-panel-2.26.0/po/POTFILES.in	2009-04-12 14:11:25.726478560 +0200
-@@ -59,6 +59,7 @@ gnome-panel/panel-force-quit.c
++++ gnome-panel-2.26.0/po/POTFILES.in	2009-05-04 10:08:57.621385818 +0200
+@@ -59,6 +59,7 @@
  gnome-panel/panel-frame.c
  gnome-panel/panel-general.schemas.in
  gnome-panel/panel-global.schemas.in
@@ -1045,9 +1045,9 @@
  gnome-panel/panel-menu-items.c
 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 14:18:36.173979221 +0200
-+++ gnome-panel-2.26.0/gnome-panel/libpanel-util/panel-session-manager.c	2009-04-12 14:22:10.458480743 +0200
-@@ -23,10 +23,13 @@
+--- gnome-panel-2.26.0.orig/gnome-panel/libpanel-util/panel-session-manager.c	2009-03-16 23:37:10.000000000 +0100
++++ gnome-panel-2.26.0/gnome-panel/libpanel-util/panel-session-manager.c	2009-05-04 10:15:02.526413413 +0200
+@@ -23,10 +23,14 @@
   */
  
  #include <dbus/dbus-glib.h>
@@ -1058,10 +1058,11 @@
  
 +#include "panel-logout.h"
 +#include "panel-session.h"
++#include "panel-gdm.h"
  #include "panel-session-manager.h"
  
  static GObject *panel_session_manager_constructor (GType                  type,
-@@ -96,6 +99,20 @@ panel_session_manager_request_logout (Pa
+@@ -96,6 +100,20 @@
  		g_warning ("Could not connect to session manager: %s",
  			   error->message);
  		g_error_free (error);
@@ -1082,7 +1083,7 @@
  		return;
  	}
  
-@@ -126,6 +143,12 @@ panel_session_manager_request_shutdown (
+@@ -126,6 +144,12 @@
  		g_warning ("Could not connect to session manager: %s",
  			   error->message);
  		g_error_free (error);
@@ -1095,3 +1096,13 @@
  		return;
  	}
  
+@@ -158,7 +182,8 @@
+ 			   error->message);
+ 		g_error_free (error);
+ 
+-		return FALSE;
++		/* Fall back to the old code */
++		return gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
+ 	}
+ 
+ 	proxy = panel_dbus_service_get_proxy (PANEL_DBUS_SERVICE (manager));

More information about the pkg-gnome-commits mailing list