diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2015-06-10 18:11:56 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2015-06-15 11:08:40 +0200 |
| commit | 21c71767e3849a7f469dc032393c6deaefc1d3df (patch) | |
| tree | 5f0957173cdf541a0db920e35bd19e04248aaa18 | |
| parent | 9c1f0dccde92f945f512eaf79e859f316e63b13f (diff) | |
Enable hotkeys after setting them in virt_viewer_app_set_hotkeys
Enabling hotkeys will trigger a rebuild of the 'send keys' menu
containing the new hotkeys. virt_viewer_app_set_hotkeys() was clearing
and then enabling the hotkeys before parsing the string containing the
new hotkeys. This was causing these hotkeys to be missing from the 'Send
keys' menu when they are set through the spice controller because the
'send keys' menu was rebuilt before the new hotkeys are set.
Resolves: rhbz#1055600
| -rw-r--r-- | src/virt-viewer-app.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c index 8a08b6b..2bf74f7 100644 --- a/src/virt-viewer-app.c +++ b/src/virt-viewer-app.c @@ -2068,7 +2068,6 @@ virt_viewer_app_set_hotkeys(VirtViewerApp *self, const gchar *hotkeys_str) } virt_viewer_app_clear_hotkeys(self); - virt_viewer_app_set_enable_accel(self, TRUE); for (hotkey = hotkeys; *hotkey != NULL; hotkey++) { gchar *key = strstr(*hotkey, "="); @@ -2100,6 +2099,7 @@ virt_viewer_app_set_hotkeys(VirtViewerApp *self, const gchar *hotkeys_str) } g_strfreev(hotkeys); + virt_viewer_app_set_enable_accel(self, TRUE); virt_viewer_update_smartcard_accels(self); } |