← Back to branch summary

~ubuntu-desktop/gnome-settings-daemon/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/correct_logout_action.patch

  • Committer: Iain Lane
  • Date: 2018-07-24 16:02:15 UTC
  • Revision ID: iain@orangesquash.org.uk-20180724160215-2zwqcisylwweql16
Moved to git: lp:~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/correct_logout_action.patch
1
 
# Description: let the logout key do what it's supposed to do
2
 
# Ubuntu: https://launchpad.net/bugs/961501
3
 
# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=671979
4
 
---
5
 
# plugins/media-keys/gsd-media-keys-manager.c |    8 +++++++-
6
 
# 1 file changed, 7 insertions(+), 1 deletion(-)
7
 
#
8
 
--- a/plugins/media-keys/gsd-media-keys-manager.c
9
 
+++ b/plugins/media-keys/gsd-media-keys-manager.c
10
 
@@ -940,6 +940,12 @@ gnome_session_shutdown (GsdMediaKeysMana
11
 
 }
12
 
 
13
 
 static void
14
 
+do_logout_action (GsdMediaKeysManager *manager)
15
 
+{
16
 
+        execute (manager, "gnome-session-quit --logout", FALSE);
17
 
+}
18
 
+
19
 
+static void
20
 
 do_eject_action_cb (GDrive              *drive,
21
 
                     GAsyncResult        *res,
22
 
                     GsdMediaKeysManager *manager)
23
 
@@ -2335,7 +2341,7 @@ do_action (GsdMediaKeysManager *manager,
24
 
                                  SOUND_ACTION_FLAG_IS_OUTPUT | SOUND_ACTION_FLAG_IS_PRECISE);
25
 
                 break;
26
 
         case LOGOUT_KEY:
27
 
-                gnome_session_shutdown (manager);
28
 
+                do_logout_action (manager);
29
 
                 break;
30
 
         case EJECT_KEY:
31
 
                 do_eject_action (manager);