[Spice-commits] src/spice-gtk-session.c

[GitLab Mirror]

 src/spice-gtk-session.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3b5fb006bc4ef7b0f014e66d8ef118bbfa426073
Author: Victor Toso <me at victortoso.com>
Date:   Mon Jan 14 09:56:24 2019 +0100

    Revert "gtk: don't request clipboard targets when there is no owner"
    
    Otherwise it breaks client to guest clipboard copy&paste.
    
    This reverts commit 84ea62de2e53b149f65e4d071fb5d70e121f6307.
    Signed-off-by: Victor Toso <victortoso at redhat.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at redhat.com>

diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
index 9d7702c..adc72a2 100644
--- a/src/spice-gtk-session.c
+++ b/src/spice-gtk-session.c
@@ -670,8 +670,7 @@ 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 */
-    GObject *owner = gtk_clipboard_get_owner(clipboard);
-    if (owner == NULL || owner == G_OBJECT(self)) {
+    if (gtk_clipboard_get_owner(clipboard) == G_OBJECT(self)) {
         return;
     }