diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2012-12-05 13:49:53 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2012-12-20 12:22:14 +0100 |
| commit | 0577c703fb05a74fb1d5c98c2909e4801cc9c465 (patch) | |
| tree | 522de75a6ca28626495e3b504b54b2c3aea210bc /src/virt-viewer-display-spice.c | |
| parent | d01097eed2fa074ed9ec01a47154e75563416b93 (diff) | |
| download | virt-viewer-0577c703fb05a74fb1d5c98c2909e4801cc9c465.tar.gz virt-viewer-0577c703fb05a74fb1d5c98c2909e4801cc9c465.tar.xz virt-viewer-0577c703fb05a74fb1d5c98c2909e4801cc9c465.zip | |
Improve check for overridden grab key combination
remote-viewer can either use the default grab/ungrab handled by
spice-gtk, or override it and use the standard gtk+ accelerator
mechanism. However, the code currently assumes that if any accelerator
is set in remote-viewer, then the grab key has been overridden.
This commit makes sure the grab key is actually overridden before assuming
so.
Diffstat (limited to 'src/virt-viewer-display-spice.c')
| -rw-r--r-- | src/virt-viewer-display-spice.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c index 3865118..22fde46 100644 --- a/src/virt-viewer-display-spice.c +++ b/src/virt-viewer-display-spice.c @@ -227,7 +227,8 @@ enable_accel_changed(VirtViewerApp *app, GParamSpec *pspec G_GNUC_UNUSED, VirtViewerDisplaySpice *self) { - if (virt_viewer_app_get_enable_accel(app)) { + if (virt_viewer_app_get_enable_accel(app) + && gtk_accel_map_lookup_entry("<virt-viewer>/view/release-cursor", NULL)) { SpiceGrabSequence *seq = spice_grab_sequence_new(0, NULL); /* disable default grab sequence */ spice_display_set_grab_keys(self->priv->display, seq); |