From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 17 Mar 2014 20:06:27 +0000 (-0400)
Subject: gtk: Use ctrl+alt+q for quit accelerator
X-Git-Tag: qemu-xen-4.6.0-rc1~483^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=db1da1f2b5f3a2383030438553988f0734a97dbe;p=qemu-xen.git

gtk: Use ctrl+alt+q for quit accelerator

Using the standard ctrl+q makes it too easy to kill the whole VM. Using
ctrl+alt+FOO is consistent with our other accelerators.

https://bugzilla.redhat.com/show_bug.cgi?id=1062393
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/ui/gtk.c b/ui/gtk.c
index 7e87e35f45..c85aea3409 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -93,6 +93,7 @@ static inline void gdk_drawable_get_size(GdkWindow *w, gint *ww, gint *wh)
 #define GDK_KEY_2 GDK_2
 #define GDK_KEY_f GDK_f
 #define GDK_KEY_g GDK_g
+#define GDK_KEY_q GDK_q
 #define GDK_KEY_plus GDK_plus
 #define GDK_KEY_minus GDK_minus
 #endif
@@ -1378,7 +1379,7 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState *s, GtkAccelGroup *acce
     gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->quit_item),
                                  "<QEMU>/Machine/Quit");
     gtk_accel_map_add_entry("<QEMU>/Machine/Quit",
-                            GDK_KEY_q, GDK_CONTROL_MASK);
+                            GDK_KEY_q, HOTKEY_MODIFIERS);
     gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), s->quit_item);
 
     return machine_menu;