rpms/gnome-settings-daemon/devel power-button.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.66, 1.67

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4867

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	power-button.patch 
Log Message:
show shutdown dialog when power button is pressed


power-button.patch:

--- NEW FILE power-button.patch ---
diff -up gnome-settings-daemon-2.24.0/plugins/media-keys/gsd-media-keys-manager.c.power-button gnome-settings-daemon-2.24.0/plugins/media-keys/gsd-media-keys-manager.c
--- gnome-settings-daemon-2.24.0/plugins/media-keys/gsd-media-keys-manager.c.power-button	2008-10-14 14:28:35.000000000 -0400
+++ gnome-settings-daemon-2.24.0/plugins/media-keys/gsd-media-keys-manager.c	2008-10-14 14:29:19.000000000 -0400
@@ -556,7 +556,7 @@ do_www_action (GsdMediaKeysManager *mana
 static void
 do_exit_action (GsdMediaKeysManager *manager)
 {
-        execute (manager, "gnome-session-save --kill", FALSE, FALSE);
+        execute (manager, "gnome-session-save --shutdown-dialog", FALSE, FALSE);
 }
 
 static void


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-settings-daemon.spec	14 Oct 2008 13:42:27 -0000	1.66
+++ gnome-settings-daemon.spec	14 Oct 2008 18:35:03 -0000	1.67
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.24.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -40,6 +40,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=555873 
 Patch9:		fix-gdm-layout.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=556307
+Patch10:	power-button.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -62,6 +65,7 @@
 %patch7 -p1 -b .fnf7-cycle
 %patch8 -p1 -b .fade
 %patch9 -p1 -b .fix-gdm-layout
+%patch1o -p1 -b .power-button
 
 %build
 aclocal
@@ -161,6 +165,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Oct 14 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-10
+- Show the shutdown dialog when the power button is pressed
+
 * Tue Oct 14 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-9
 - Drop a patch that is no longer needed with the evdev ruleset
   in xkeyboard-config