From ed3134918dcbbd58a5ef8359a77e8024c98396e6 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 4 Oct 2008 21:06:58 -0700 Subject: [PATCH] XQuartz: pbcopy: Re-enabled some code I commented out for testing (cherry picked from commit 9b5d11409264080e394c8f18e06237122de80014) --- hw/xquartz/pbproxy/x-selection.m | 8 ++++---- 1 file 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));