diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-11-07 18:17:56 +0100 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-11-07 19:43:39 +0100 |
commit | 8565501b1e7d4ab466620729e984e62d2a16d4ca (patch) | |
tree | 0645c45b14e9b6c7371e198efdb43e0e705532d4 /src/virt-viewer-file.c | |
parent | ac2440611abab10ce3505c9a6e2693b1539fd2f8 (diff) | |
download | virt-viewer-8565501b1e7d4ab466620729e984e62d2a16d4ca.tar.gz virt-viewer-8565501b1e7d4ab466620729e984e62d2a16d4ca.tar.xz virt-viewer-8565501b1e7d4ab466620729e984e62d2a16d4ca.zip |
Unify configured hotkey behaviour
Whether the hotkeys are set through command line, controller or file, we
should get the same keybinding result (clear unspecified, and enable
global bindings)
However, when started from command line arguments, without --hotkey
argument, it will have basic non-global default bindings.
https://bugzilla.redhat.com/show_bug.cgi?id=1023447
Diffstat (limited to 'src/virt-viewer-file.c')
-rw-r--r-- | src/virt-viewer-file.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/virt-viewer-file.c b/src/virt-viewer-file.c index 3ff8b35..238ffea 100644 --- a/src/virt-viewer-file.c +++ b/src/virt-viewer-file.c @@ -595,7 +595,7 @@ virt_viewer_file_set_secure_channels(VirtViewerFile* self, const gchar* const* v } static void -spice_hotkey_set_accel(VirtViewerApp *app, const gchar *accel_path, const gchar *key) +spice_hotkey_set_accel(const gchar *accel_path, const gchar *key) { gchar *accel; guint accel_key; @@ -606,8 +606,6 @@ spice_hotkey_set_accel(VirtViewerApp *app, const gchar *accel_path, const gchar g_free(accel); gtk_accel_map_change_entry(accel_path, accel_key, accel_mods, TRUE); - - g_object_set(G_OBJECT(app), "enable-accel", TRUE, NULL); } gboolean @@ -636,6 +634,10 @@ virt_viewer_file_fill_app(VirtViewerFile* self, VirtViewerApp *app, GError **err if (virt_viewer_file_is_set(self, "title")) virt_viewer_app_set_title(app, virt_viewer_file_get_title(self)); + + virt_viewer_app_clear_hotkeys(app); + g_object_set(G_OBJECT(app), "enable-accel", TRUE, NULL); + { gchar *val; static const struct { @@ -654,7 +656,7 @@ virt_viewer_file_fill_app(VirtViewerFile* self, VirtViewerApp *app, GError **err if (!virt_viewer_file_is_set(self, accels[i].prop)) continue; g_object_get(self, accels[i].prop, &val, NULL); - spice_hotkey_set_accel(app, accels[i].accel, val); + spice_hotkey_set_accel(accels[i].accel, val); g_free(val); } } |