From f257e2be692c9cb5bfad6397f07c1389506d7556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 8 Jul 2016 15:54:13 +0100 Subject: [PATCH] fix patch to apply --- ...-1352965-gtk3-infinite-clipboard-recurs.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/0001-Resolves-rhbz-1352965-gtk3-infinite-clipboard-recurs.patch b/0001-Resolves-rhbz-1352965-gtk3-infinite-clipboard-recurs.patch index e6948be..c338044 100644 --- a/0001-Resolves-rhbz-1352965-gtk3-infinite-clipboard-recurs.patch +++ b/0001-Resolves-rhbz-1352965-gtk3-infinite-clipboard-recurs.patch @@ -1,4 +1,4 @@ -From 84059c853f15e0e3b1433193e8136350869c23d7 Mon Sep 17 00:00:00 2001 +From 785f89233eb588447af2e5f712c2b555b4fbc344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 8 Jul 2016 14:50:56 +0100 Subject: [PATCH] Resolves: rhbz#1352965 gtk3 infinite clipboard recursion with @@ -10,10 +10,10 @@ Change-Id: Ib67afaf532b8409e05fffbf1b8312d664460567d 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx -index 363de3d..b5db25d 100644 +index 25f4590..72599b2 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx -@@ -587,6 +587,7 @@ void VclGtkClipboard::setContents( +@@ -585,6 +585,7 @@ void VclGtkClipboard::setContents( { osl::ClearableMutexGuard aGuard( m_aMutex ); Reference< datatransfer::clipboard::XClipboardOwner > xOldOwner( m_aOwner ); @@ -21,8 +21,8 @@ index 363de3d..b5db25d 100644 Reference< datatransfer::XTransferable > xOldContents( m_aContents ); m_aContents = xTrans; m_aOwner = xClipboardOwner; -@@ -594,6 +595,10 @@ void VclGtkClipboard::setContents( - std::list< Reference< datatransfer::clipboard::XClipboardListener > > aListeners( m_aListeners ); +@@ -592,6 +593,10 @@ void VclGtkClipboard::setContents( + std::list< Reference< datatransfer::clipboard::XClipboardListener > > xListeners( m_aListeners ); datatransfer::clipboard::ClipboardEvent aEv; + GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection); @@ -32,7 +32,7 @@ index 363de3d..b5db25d 100644 if (m_aContents.is()) { css::uno::Sequence aFormats = xTrans->getTransferDataFlavors(); -@@ -607,15 +612,11 @@ void VclGtkClipboard::setContents( +@@ -605,15 +610,11 @@ void VclGtkClipboard::setContents( aEntry.info = 0; aGtkTargets.push_back(aEntry); @@ -48,7 +48,7 @@ index 363de3d..b5db25d 100644 m_aGtkTargets = aGtkTargets; } -@@ -623,7 +624,7 @@ void VclGtkClipboard::setContents( +@@ -621,7 +622,7 @@ void VclGtkClipboard::setContents( aGuard.clear(); @@ -56,7 +56,7 @@ index 363de3d..b5db25d 100644 + if (bOwnerChange) xOldOwner->lostOwnership( this, xOldContents ); for( std::list< Reference< datatransfer::clipboard::XClipboardListener > >::iterator it = - aListeners.begin(); it != aListeners.end() ; ++it ) + xListeners.begin(); it != xListeners.end() ; ++it ) -- 2.7.4