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

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Jan  4 23:50:28 2008
New Revision: 14035

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14035
Log:
* 01-use-panel-logout.patch: use gnome-panel-logout if available 
  instead of the session's logout window, for the sake of consistency 
  across the desktop.

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

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=14035&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog Fri Jan  4 23:50:28 2008
@@ -1,3 +1,11 @@
+gnome-power-manager (2.20.2-2) UNRELEASED; urgency=low
+
+  * 01-use-panel-logout.patch: use gnome-panel-logout if available 
+    instead of the session's logout window, for the sake of consistency 
+    across the desktop.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 05 Jan 2008 00:43:42 +0100
+
 gnome-power-manager (2.20.2-1) unstable; urgency=low
 
   * New upstream bugfix release:

Added: 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=14035&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/01-use-panel-logout.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/01-use-panel-logout.patch Fri Jan  4 23:50:28 2008
@@ -1,0 +1,23 @@
+--- 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 @@
+ 		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_client_request_save (gnome_master_client (),
+-					   GNOME_SAVE_GLOBAL,
+-					   TRUE, GNOME_INTERACT_ANY, FALSE, TRUE);
++		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);
++		}
+ 	} else {
+ 		gpm_warning ("unknown action %s", action);
+ 	}