summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-10-04 21:06:58 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-10-04 21:17:09 -0700
commited3134918dcbbd58a5ef8359a77e8024c98396e6 (patch)
tree6b72fb0e0293988aa0ddaaeef175c557499732ee
parentb3a971d8b5df5ab4af0be49105ef32f67d010901 (diff)
XQuartz: pbcopy: Re-enabled some code I commented out for testing
(cherry picked from commit 9b5d11409264080e394c8f18e06237122de80014)
-rw-r--r--hw/xquartz/pbproxy/x-selection.m8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m
index 67de866fe..6a1a9fdf2 100644
--- a/hw/xquartz/pbproxy/x-selection.m
+++ b/hw/xquartz/pbproxy/x-selection.m
@@ -421,10 +421,10 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
if(owner == _selection_window)
return TRUE;
-// if(None != _selection_window) {
-// fprintf (stderr, "A clipboard manager is already running. pbproxy will not sync clipboard to pasteboard.\n");
-// return FALSE;
-// }
+ if(None != _selection_window) {
+ fprintf (stderr, "A clipboard manager is already running. pbproxy will not sync clipboard to pasteboard.\n");
+ return FALSE;
+ }
XSetSelectionOwner(x_dpy, atoms->clipboard_manager, _selection_window, CurrentTime);
return (_selection_window == XGetSelectionOwner(x_dpy, atoms->clipboard_manager));