r15273 - in /desktop/unstable/gnome-power-manager/debian: changelog patches/01-use-panel-logout.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Tue Mar 18 13:04:26 2008
New Revision: 15273

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15273
Log:
* debian/patches/01-use-panel-logout.patch:
  - Updated

Modified:
    desktop/unstable/gnome-power-manager/debian/changelog
    desktop/unstable/gnome-power-manager/debian/patches/01-use-panel-logout.patch

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=15273&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog Tue Mar 18 13:04:26 2008
@@ -6,12 +6,14 @@
 
   [ Sjoerd Simons ]
   * New upstream release
+  * debian/patches/01-use-panel-logout.patch:
+    - Updated
   * debian/patches/02.gnome-power-manager.desktop.in.patch:
     - Dropped
   * debian/patches/73-getbrightness-returns-int.patch:
     - Updated
 
- -- Sjoerd Simons <sjoerd at debian.org>  Tue, 18 Mar 2008 13:45:37 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 18 Mar 2008 14:04:11 +0100
 
 gnome-power-manager (2.20.2-3) unstable; urgency=low
 

Modified: desktop/unstable/gnome-power-manager/debian/patches/01-use-panel-logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/01-use-panel-logout.patch?rev=15273&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/01-use-panel-logout.patch (original)
+++ desktop/unstable/gnome-power-manager/debian/patches/01-use-panel-logout.patch Tue Mar 18 13:04:26 2008
@@ -1,23 +1,24 @@
-Bugzilla #507393
---- src/gpm-manager.c.orig	2008-01-05 00:26:15.424255671 +0100
-+++ src/gpm-manager.c	2008-01-05 00:42:32.699947439 +0100
-@@ -474,11 +474,17 @@
+Index: src/gpm-manager.c
+===================================================================
+--- src/gpm-manager.c	(revision 2734)
++++ src/gpm-manager.c	(working copy)
+@@ -471,11 +471,16 @@
  		gpm_control_shutdown (manager->priv->control, NULL);
  
  	} else if (strcmp (action, ACTION_INTERACTIVE) == 0) {
 +		const gchar *const argv[] = { "gnome-panel-logout", "--shutdown", NULL };
  		gpm_info_explain_reason (manager->priv->info, GPM_EVENT_NOTIFICATION,
- 					_("GNOME interactive logout"), reason);
+-					_("GNOME interactive logout."), reason);
 -		gnome_client_request_save (gnome_master_client (),
 -					   GNOME_SAVE_GLOBAL,
 -					   TRUE, GNOME_INTERACT_ANY, FALSE, TRUE);
++					_("GNOME interactive logout"), reason);
 +		if (!g_spawn_async (NULL, (gchar **) argv, NULL, G_SPAWN_SEARCH_PATH,
-+				    NULL, NULL, NULL, NULL)) {
-+			/* gnome-panel-logout doesn't exist *
-+			 * use the classical session save request instead */
-+			gnome_client_request_save (gnome_master_client (),
-+						   GNOME_SAVE_GLOBAL,
-+						   TRUE, GNOME_INTERACT_ANY, FALSE, TRUE);
++				NULL, NULL, NULL, NULL)) {
++				/* gnome-panel-logout doesn't exist *
++				 * use the classical session save request instead */
++				gnome_client_request_save (gnome_master_client (),
++				GNOME_SAVE_GLOBAL, TRUE, GNOME_INTERACT_ANY, FALSE, TRUE);
 +		}
  	} else {
  		gpm_warning ("unknown action %s", action);