[virt-tools-list] [virt-viewer] Enable hotkeys after setting them in virt_viewer_app_set_hotkeys

[Pavel Grunt]

On Thu, 2015-06-11 at 10:27 +0200, Christophe Fergeau wrote:
> 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
> ---
>  src/virt-viewer-app.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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);
>  }
>  

Ack,

Pavel