|
 |
8725265 |
From 7b422cce4ebc291d5eff723dc0fd4497ab412ed5 Mon Sep 17 00:00:00 2001
|
|
|
8725265 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
8725265 |
Date: Fri, 4 Dec 2015 14:11:24 +0000
|
|
|
8725265 |
Subject: [PATCH 1/3] gtk3: avoid empty target clipboard warning
|
|
|
8725265 |
|
|
|
8725265 |
Change-Id: Ic6b46eb2c81398f0ab2e7539e5cdb27a508c8893
|
|
|
8725265 |
(cherry picked from commit 66fedc0966ad0c732cada974ea910d7a98beca15)
|
|
|
8725265 |
---
|
|
|
8725265 |
vcl/unx/gtk3/gtk3gtkinst.cxx | 17 ++++++++++-------
|
|
|
8725265 |
1 file changed, 10 insertions(+), 7 deletions(-)
|
|
|
8725265 |
|
|
|
8725265 |
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
|
|
|
8725265 |
index 9f15db0..e9210d0 100644
|
|
|
8725265 |
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
|
|
|
8725265 |
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
|
|
|
8725265 |
@@ -572,13 +572,16 @@ void VclGtkClipboard::setContents(
|
|
|
8725265 |
aGtkTargets.push_back(makeGtkTargetEntry(aFlavor));
|
|
|
8725265 |
}
|
|
|
8725265 |
|
|
|
8725265 |
- //if there was a previous gtk_clipboard_set_with_data call then
|
|
|
8725265 |
- //ClipboardClearFunc will be called now
|
|
|
8725265 |
- GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
|
|
|
8725265 |
- //use with_owner with m_pOwner so we can distinguish in handle_owner_change
|
|
|
8725265 |
- //if we have gained or lost ownership of the clipboard
|
|
|
8725265 |
- gtk_clipboard_set_with_owner(clipboard, aGtkTargets.data(), aGtkTargets.size(),
|
|
|
8725265 |
- ClipboardGetFunc, ClipboardClearFunc, G_OBJECT(m_pOwner));
|
|
|
8725265 |
+ if (!aGtkTargets.empty())
|
|
|
8725265 |
+ {
|
|
|
8725265 |
+ //if there was a previous gtk_clipboard_set_with_data call then
|
|
|
8725265 |
+ //ClipboardClearFunc will be called now
|
|
|
8725265 |
+ GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
|
|
|
8725265 |
+ //use with_owner with m_pOwner so we can distinguish in handle_owner_change
|
|
|
8725265 |
+ //if we have gained or lost ownership of the clipboard
|
|
|
8725265 |
+ gtk_clipboard_set_with_owner(clipboard, aGtkTargets.data(), aGtkTargets.size(),
|
|
|
8725265 |
+ ClipboardGetFunc, ClipboardClearFunc, G_OBJECT(m_pOwner));
|
|
|
8725265 |
+ }
|
|
|
8725265 |
m_aGtkTargets = aGtkTargets;
|
|
|
8725265 |
}
|
|
|
8725265 |
|
|
|
8725265 |
--
|
|
|
8725265 |
2.5.0
|
|
|
8725265 |
|