Related: rhbz#1362451 avoid recursive ownerchanged signal during ownerchange

8 years ago · 7146e88183
parent 8c7c27d299
commit 7146e88183
2 changed files with 119 additions and 1 deletions
--- a/0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch
+++ b/0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch
@ -0,0 +1,115 @@
+From 8a382d4ad190cf07cbd6b1fd6b903975134b0cf1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Thu, 1 Sep 2016 15:50:20 +0100
+Subject: [PATCH] Related: rhbz#1362451 avoid recursive ownerchanged handling
+ during ownerchange
+
+Change-Id: Id9c12b7ce6458348890d7c7ff7fdb2cd37c4601c
+---
+ vcl/unx/gtk3/gtk3gtkinst.cxx | 55 ++++++++++++++++++++++++++------------------
+ 1 file changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
+index 7c04b1d..7148882 100644
+--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
+@@ -364,6 +364,29 @@ namespace
+     }
+ }
+ 
+namespace
+{
+    void ClipboardGetFunc(GtkClipboard *clipboard, GtkSelectionData *selection_data,
+                          guint info,
+                          gpointer user_data_or_owner)
+    {
+        VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner);
+        pThis->ClipboardGet(clipboard, selection_data, info);
+    }
+
+    void ClipboardClearFunc(GtkClipboard *clipboard, gpointer user_data_or_owner)
+    {
+        VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner);
+        pThis->ClipboardClear(clipboard);
+    }
+
+    void handle_owner_change(GtkClipboard *clipboard, GdkEvent *event, gpointer user_data)
+    {
+        VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data);
+        pThis->OwnerPossiblyChanged(clipboard, event);
+    }
+}
+
+ void VclGtkClipboard::OwnerPossiblyChanged(GtkClipboard* clipboard, GdkEvent* /*event*/)
+ {
+     if (!m_aContents.is())
+@@ -376,6 +399,10 @@ void VclGtkClipboard::OwnerPossiblyChanged(GtkClipboard* clipboard, GdkEvent* /*
+     //our pid, in which case it's us.
+     bool bSelf = false;
+ 
+    //disconnect and reconnect after gtk_clipboard_wait_for_targets to
+    //avoid possible recursion
+    g_signal_handler_disconnect(clipboard, m_nOwnerChangedSignalId);
+
+     OString sTunnel = "application/x-libreoffice-internal-id-" + getPID();
+     GdkAtom *targets;
+     gint n_targets;
+@@ -394,6 +421,9 @@ void VclGtkClipboard::OwnerPossiblyChanged(GtkClipboard* clipboard, GdkEvent* /*
+         g_free(targets);
+     }
+ 
+    m_nOwnerChangedSignalId = g_signal_connect(clipboard, "owner-change",
+                                               G_CALLBACK(handle_owner_change), this);
+
+     if (!bSelf)
+     {
+         //null out m_aContents to return control to the system-one which
+@@ -486,29 +516,6 @@ void VclToGtkHelper::setSelectionData(const Reference<css::datatransfer::XTransf
+                            aData.getLength());
+ }
+ 
+-namespace
+-{
+-    void ClipboardGetFunc(GtkClipboard *clipboard, GtkSelectionData *selection_data,
+-                          guint info,
+-                          gpointer user_data_or_owner)
+-    {
+-        VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner);
+-        pThis->ClipboardGet(clipboard, selection_data, info);
+-    }
+-
+-    void ClipboardClearFunc(GtkClipboard *clipboard, gpointer user_data_or_owner)
+-    {
+-        VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner);
+-        pThis->ClipboardClear(clipboard);
+-    }
+-
+-    void handle_owner_change(GtkClipboard *clipboard, GdkEvent *event, gpointer user_data)
+-    {
+-        VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data);
+-        pThis->OwnerPossiblyChanged(clipboard, event);
+-    }
+-}
+-
+ VclGtkClipboard::VclGtkClipboard(GdkAtom nSelection)
+     : cppu::WeakComponentImplHelper<datatransfer::clipboard::XSystemClipboard,
+                                     datatransfer::clipboard::XFlushableClipboard, XServiceInfo>
+@@ -539,6 +546,7 @@ VclGtkClipboard::~VclGtkClipboard()
+     if (!m_aGtkTargets.empty())
+     {
+         gtk_clipboard_clear(clipboard);
+        ClipboardClear(clipboard);
+     }
+     assert(m_aGtkTargets.empty());
+ }
+@@ -602,6 +610,7 @@ void VclGtkClipboard::setContents(
+     if (!m_aGtkTargets.empty())
+     {
+         gtk_clipboard_clear(clipboard);
+        ClipboardClear(clipboard);
+     }
+     assert(m_aGtkTargets.empty());
+     if (m_aContents.is())
+-- 
+2.7.4
+
--- a/libreoffice.spec
+++ b/libreoffice.spec
@ -55,7 +55,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        3%{?libo_prerelease}%{?dist}
+Release:        4%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/

@ -2300,6 +2300,9 @@ done
 %endif

 %changelog
+* Tue Sep 20 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.2.2.1-4
+- Related: rhbz#1362451 avoid recursive ownerchanged signal during ownerchange
+
 * Mon Sep 19 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.2.2.1-3
 - Related: rhbz#1373933 do less on style-updated
 - Related: rhbz#1353069 don't clear XATTR_FILL from in use styles