pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-27 14:54:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src: Fix hotkey GTK actions

Browse Source 
"win.<action>" and "app.<action>" were mixed up in a few places.
Smartcard actions use "app" and other actions use "win".

Signed-off-by: Paul Donohue <git@PaulSD.com>
This commit is contained in:
Paul Donohue 2021-04-25 10:48:07 -04:00 committed by Daniel P. Berrangé
parent 64a2ecdfe3
commit dde79e637a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/virt-viewer-app.c
View File

@ -2177,8 +2177,8 @@ virt_viewer_update_smartcard_accels(VirtViewerApp *self)
} else {
g_debug("disabling smartcard shortcuts");
const gchar *no_accels[] = { NULL };
char **old_insert_accels = gtk_application_get_accels_for_action(GTK_APPLICATION(self), "win.smartcard-insert");
char **old_remove_accels = gtk_application_get_accels_for_action(GTK_APPLICATION(self), "win.smartcard-remove");
char **old_insert_accels = gtk_application_get_accels_for_action(GTK_APPLICATION(self), "app.smartcard-insert");
char **old_remove_accels = gtk_application_get_accels_for_action(GTK_APPLICATION(self), "app.smartcard-remove");
if (old_insert_accels) {
g_strfreev(priv->insert_smartcard_accel);
priv->insert_smartcard_accel = old_insert_accels;
@ -2187,8 +2187,8 @@ virt_viewer_update_smartcard_accels(VirtViewerApp *self)
g_strfreev(priv->remove_smartcard_accel);
priv->remove_smartcard_accel = old_remove_accels;
}
gtk_application_set_accels_for_action(GTK_APPLICATION(self), "win.smartcard-insert", no_accels);
gtk_application_set_accels_for_action(GTK_APPLICATION(self), "win.smartcard-remove", no_accels);
gtk_application_set_accels_for_action(GTK_APPLICATION(self), "app.smartcard-insert", no_accels);
gtk_application_set_accels_for_action(GTK_APPLICATION(self), "app.smartcard-remove", no_accels);
}
}
@ -2891,7 +2891,7 @@ virt_viewer_app_set_hotkeys(VirtViewerApp *self, const gchar *hotkeys_str)
} else if (g_str_equal(*hotkey, "smartcard-remove")) {
gtk_application_set_accels_for_action(GTK_APPLICATION(self), "app.smartcard-remove", accels);
} else if (g_str_equal(*hotkey, "usb-device-reset")) {
gtk_application_set_accels_for_action(GTK_APPLICATION(self), "app.usb-device-reset", accels);
gtk_application_set_accels_for_action(GTK_APPLICATION(self), "win.usb-device-reset", accels);
} else {
g_warning("Unknown hotkey command %s", *hotkey);
}