[Spice-devel] [PATCH spice-gtk] gtk: don't request clipboard targets when there is no owner

Victor Toso victortoso at redhat.com
Fri Jan 11 10:46:48 UTC 2019


On Fri, Jan 11, 2019 at 02:39:52PM +0400, marcandre.lureau at redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau at redhat.com>
> 
> After a clipboard-clear, the owner-changed signal is triggered, with
> no owner. Let's avoid requesting for targets, that would lead to a
> failure.
> 
> Fixes:
> (lt-spicy:23226): GSpice-DEBUG: 13:36:38.741: spice-gtk-session.c:797 clipboard_clear
> (lt-spicy:23226): GSpice-DEBUG: 13:36:38.742: spice-gtk-session.c:547 clipboard_get_targets:
> (lt-spicy:23226): GSpice-DEBUG: 13:36:38.742: spice-gtk-session.c:555 Retrieving the clipboard data has failed
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
Acked-by: Victor Toso <victortoso at redhat.com>
> ---
>  src/spice-gtk-session.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
> index adc72a2..9d7702c 100644
> --- a/src/spice-gtk-session.c
> +++ b/src/spice-gtk-session.c
> @@ -670,7 +670,8 @@ static void clipboard_owner_change(GtkClipboard        *clipboard,
>  
>      /* This situation happens when clipboard is being cleared by us, when agent
>       * sends a release-grab for instance */
> -    if (gtk_clipboard_get_owner(clipboard) == G_OBJECT(self)) {
> +    GObject *owner = gtk_clipboard_get_owner(clipboard);
> +    if (owner == NULL || owner == G_OBJECT(self)) {
>          return;
>      }
>  
> -- 
> 2.20.1.98.gecbdaf0899
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20190111/837d993e/attachment.sig>


More information about the Spice-devel mailing list