summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-10-05 17:39:57 +0200
committerSamuli Piippo <samuli.piippo@digia.com>2011-06-09 13:07:02 +0300
commitb8113220499fa8384bc2fbcc17aba59b636f2d48 (patch)
treeb9b40e0cc0f3e18a3439db7fa906ba38a33aa939
parentf955d645ff3804aa8544f94d02175deec7a0d873 (diff)
Fix copying large data to non-Qt applications
In send_selection when we decide to use INCR properties we set the given property value to be INCR atom, however we were also sending SelectionNotify event containing the name of the property that the client should watch as INCR, which is wrong, we should send the original property that we were asked to use instead. This fixes copying large junks of data from Qt application, for example copying text (>200k) to gedit or images to gimp. Task-number: QTBUG-8644 Reviewed-by: Bradley T. Hughes (cherry picked from commit 62ee836fafe515c03b0be716585f8c2354e188f7)
-rw-r--r--src/gui/kernel/qclipboard_x11.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp
index 999a7c1994..682b249f00 100644
--- a/src/gui/kernel/qclipboard_x11.cpp
+++ b/src/gui/kernel/qclipboard_x11.cpp
@@ -838,7 +838,7 @@ static Atom send_selection(QClipboardData *d, Atom target, Window window, Atom p
ATOM(INCR), 32, PropModeReplace, (uchar *) &bytes, 1);
(void)new QClipboardINCRTransaction(window, property, atomFormat, dataFormat, data, increment);
- return ATOM(INCR);
+ return property;
}
// make sure we can perform the XChangeProperty in a single request