summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Ushakov <uwe@stderr.spb.ru>2020-11-09 18:14:51 +0000
committerCharles Forsyth <charles.forsyth@gmail.com>2020-11-09 18:14:51 +0000
commit5c3711865e0fab9e9fb4825fbee44cfe595b32fc (patch)
tree9494d3ab05c28ab394b951a804791e2615d8db62
parent715e493b33d319e00902b3678989cf72ec9db0f1 (diff)
parentc82cb0a62100fbcab34a1466b49fc687fc570af6 (diff)
Merged in nbuwe/inferno-os/bugfix/gnome-copied-files (pull request #5)
Silently ignore x-special/gnome-copied-files requests. Approved-by: Charles Forsyth <charles.forsyth@gmail.com>
-rw-r--r--emu/port/win-x11a.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/emu/port/win-x11a.c b/emu/port/win-x11a.c
index 569287b6..bbc65761 100644
--- a/emu/port/win-x11a.c
+++ b/emu/port/win-x11a.c
@@ -1613,11 +1613,11 @@ if(0) iprint("xselect target=%d requestor=%d property=%d selection=%d\n",
8, PropModeReplace, (uchar*)clip.buf, strlen(clip.buf));
qunlock(&clip.lk);
}else{
- iprint("get %d\n", xe->target);
name = XGetAtomName(xd, xe->target);
if(name == nil)
- iprint("XGetAtomName failed\n");
- else if(strcmp(name, "TIMESTAMP") != 0)
+ name = "<XGetAtomName failed>";
+ if(strcmp(name, "TIMESTAMP") != 0
+ && strcmp(name, "x-special/gnome-copied-files") != 0)
iprint("%s: cannot handle selection request for '%s' (%d)\n", argv0, name, (int)xe->target);
r.xselection.property = None;
}