summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-10-05 15:39:57 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-10-06 10:12:44 (GMT)
commit62ee836fafe515c03b0be716585f8c2354e188f7 (patch)
treee3f277ade0da756e55885ecd1dafed78c5bb00c8
parent6b118e981b0da4e7bcfd99be6ba1d0123885e7b3 (diff)
downloadQt-62ee836fafe515c03b0be716585f8c2354e188f7.zip
Qt-62ee836fafe515c03b0be716585f8c2354e188f7.tar.gz
Qt-62ee836fafe515c03b0be716585f8c2354e188f7.tar.bz2
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
-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 4b75f0a..b7ca2d4 100644
--- a/src/gui/kernel/qclipboard_x11.cpp
+++ b/src/gui/kernel/qclipboard_x11.cpp
@@ -836,7 +836,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