qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
	Anthony Liguori <aliguori@amazon.com>,
	Cole Robinson <crobinso@redhat.com>
Subject: [Qemu-devel] [PULL 5/7] gtk: Use ctrl+alt+q for quit accelerator
Date: Thu, 13 Mar 2014 11:46:10 +0100	[thread overview]
Message-ID: <1394707572-15112-6-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1394707572-15112-1-git-send-email-kraxel@redhat.com>

From: Cole Robinson <crobinso@redhat.com>

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>
---
 ui/gtk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index ba4f6e2..79babc9 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1297,7 +1297,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;
-- 
1.8.3.1

  parent reply	other threads:[~2014-03-13 10:46 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-13 10:46 [Qemu-devel] [PULL 0/7] gtk: cleanups and fixes Gerd Hoffmann
2014-03-13 10:46 ` [Qemu-devel] [PULL 1/7] gtk: Allow to activate grab-on-hover from the command line Gerd Hoffmann
2014-03-13 10:46 ` [Qemu-devel] [PULL 2/7] gtk: Don't use deprecated gtk_image_menu_item_new_with_mnemonic Gerd Hoffmann
2014-03-13 10:46 ` [Qemu-devel] [PULL 3/7] gtk: Don't use deprecated vte_terminal_get_adjustment Gerd Hoffmann
2014-03-13 10:46 ` [Qemu-devel] [PULL 4/7] gtk: Remove use of deprecated stock items Gerd Hoffmann
2014-03-13 10:46 ` Gerd Hoffmann [this message]
2014-03-13 10:46 ` [Qemu-devel] [PULL 6/7] gtk: Fix mouse warping with gtk3 Gerd Hoffmann
2014-03-13 10:46 ` [Qemu-devel] [PULL 7/7] gtk: Don't warp absolute pointer Gerd Hoffmann
2014-03-17  4:12   ` Dave Airlie
2014-03-13 18:55 ` [Qemu-devel] [PULL 0/7] gtk: cleanups and fixes Peter Maydell
2014-03-13 19:05   ` Cole Robinson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1394707572-15112-6-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=crobinso@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).