[gnome-settings-daemon] media-keys: Make the "log out" key really do that

[Bastien Nocera <hadess src gnome org>]

commit ab84878bc5b2492858ea81f1a510b91db51e1ae9
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Oct 27 15:21:09 2010 +0100

    media-keys: Make the "log out" key really do that
    
    We already have a power key, as handled by gnome-power-manager, so make
    the key described as "log out" really offer the user to log out, and not
    power down the machine.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=244699

 data/gnome-settings-daemon.convert                 |    2 +-
 ...ngs-daemon.plugins.media-keys.gschema.xml.in.in |    2 +-
 plugins/media-keys/acme.h                          |    4 ++--
 plugins/media-keys/gsd-media-keys-manager.c        |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index 69ea3de..fab1786 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -53,11 +53,11 @@ email = /apps/gnome_settings_daemon/keybindings/email
 eject = /apps/gnome_settings_daemon/keybindings/eject
 help = /apps/gnome_settings_daemon/keybindings/help
 home = /apps/gnome_settings_daemon/keybindings/home
+logout = /apps/gnome_settings_daemon/keybindings/power
 media = /apps/gnome_settings_daemon/keybindings/media
 next = /apps/gnome_settings_daemon/keybindings/next
 pause = /apps/gnome_settings_daemon/keybindings/pause
 play = /apps/gnome_settings_daemon/keybindings/play
-power = /apps/gnome_settings_daemon/keybindings/power
 previous = /apps/gnome_settings_daemon/keybindings/previous
 priority = /apps/gnome_settings_daemon/plugins/keybindings/priority
 screensaver = /apps/gnome_settings_daemon/keybindings/screensaver
diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
index fbd066a..e2c3388 100644
--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
@@ -55,7 +55,7 @@
       <_summary>Play (or play/pause)</_summary>
       <_description>Binding to start playback (or toggle play/pause).</_description>
     </key>
-    <key name="power" type="s">
+    <key name="logout" type="s">
       <default>'&lt;Control&gt;&lt;Alt&gt;Delete'</default>
       <_summary>Log out</_summary>
       <_description>Binding to log out.</_description>
diff --git a/plugins/media-keys/acme.h b/plugins/media-keys/acme.h
index db3878e..28acaf8 100644
--- a/plugins/media-keys/acme.h
+++ b/plugins/media-keys/acme.h
@@ -30,7 +30,7 @@ enum {
         MUTE_KEY,
         VOLUME_DOWN_KEY,
         VOLUME_UP_KEY,
-        POWER_KEY,
+        LOGOUT_KEY,
         EJECT_KEY,
         HOME_KEY,
         MEDIA_KEY,
@@ -57,7 +57,7 @@ static struct {
         { MUTE_KEY, "volume-mute",NULL },
         { VOLUME_DOWN_KEY, "volume-down", NULL },
         { VOLUME_UP_KEY, "volume-up", NULL },
-        { POWER_KEY, "power", NULL },
+        { LOGOUT_KEY, "logout", NULL },
         { EJECT_KEY, "eject", NULL },
         { HOME_KEY, "home", NULL },
         { MEDIA_KEY, "media", NULL },
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index a20767a..253d249 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -477,9 +477,9 @@ do_media_action (GsdMediaKeysManager *manager)
 }
 
 static void
-do_exit_action (GsdMediaKeysManager *manager)
+do_logout_action (GsdMediaKeysManager *manager)
 {
-        execute (manager, "gnome-session-save --shutdown-dialog", FALSE, FALSE);
+        execute (manager, "gnome-session-save --logout", FALSE, FALSE);
 }
 
 static void
@@ -842,8 +842,8 @@ do_action (GsdMediaKeysManager *manager,
                 do_sound_action (manager, type);
 #endif /* HAVE_PULSE */
                 break;
-        case POWER_KEY:
-                do_exit_action (manager);
+        case LOGOUT_KEY:
+                do_logout_action (manager);
                 break;
         case EJECT_KEY:
                 do_eject_action (manager);