summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Jennings <mej@kainx.org>2008-05-14 22:26:36 +0000
committerMichael Jennings <mej@kainx.org>2008-05-14 22:26:36 +0000
commit1b91d073181cc17cd057d4449e5ae407976f87a9 (patch)
tree5de4ff3c585d1071fc1c7f97eab907ddaca72bc0
parentc7a352b0c0e3ff79b7d552fbdea6ddaf9c88dbec (diff)
downloadeterm-1b91d073181cc17cd057d4449e5ae407976f87a9.tar.gz
Wed May 14 15:26:13 2008 Michael Jennings (mej)
Patch from Emmanuel Anne <emmanuel.anne@gmail.com> to fix cut/paste with KDE applications. ---------------------------------------------------------------------- SVN revision: 34573
-rw-r--r--ChangeLog5
-rw-r--r--src/screen.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ce7d576..cf8cb51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5560,3 +5560,8 @@ Wed May 14 14:54:16 2008 Michael Jennings (mej)
Modified patch from hsim@gmx.li to allow setting of the "Urgent" hint
on beep.
----------------------------------------------------------------------
+Wed May 14 15:26:13 2008 Michael Jennings (mej)
+
+Patch from Emmanuel Anne <emmanuel.anne@gmail.com> to fix cut/paste
+with KDE applications.
+----------------------------------------------------------------------
diff --git a/src/screen.c b/src/screen.c
index b9caf7d..e554b1a 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3320,7 +3320,7 @@ selection_send(XSelectionRequestEvent * rq)
target_list[0] = (Atom32) props[PROP_SELECTION_TARGETS];
target_list[1] = (Atom32) XA_STRING;
XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
- (8 * sizeof(target_list[0])), PropModeReplace, (unsigned char *) target_list,
+ 8, PropModeReplace, (unsigned char *) target_list,
(sizeof(target_list) / sizeof(target_list[0])));
ev.xselection.property = rq->property;
#if defined(MULTI_CHARSET) && defined(HAVE_X11_XMU_ATOMS_H)
@@ -3333,8 +3333,8 @@ selection_send(XSelectionRequestEvent * rq)
xtextp.nitems = 0;
if (XmbTextListToTextProperty(Xdisplay, l, 1, XCompoundTextStyle, &xtextp) == Success) {
if (xtextp.nitems > 0 && xtextp.value != NULL) {
- XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_COMPOUND_TEXT(Xdisplay), 8, PropModeReplace, xtextp.value,
- xtextp.nitems);
+ XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_COMPOUND_TEXT(Xdisplay),
+ 8, PropModeReplace, xtextp.value, xtextp.nitems);
ev.xselection.property = rq->property;
}
}