Ticket #33885: synergy-bug2962-clipboard.diff

files/patch-bug2962-clipboard.diff

@@ +1 @@
+Index: src/lib/platform/COSXClipboard.cpp
+===================================================================
+--- src/lib/platform/COSXClipboard.cpp  (revision 1169)
++++ src/lib/platform/COSXClipboard.cpp  (revision 1170)
+@@ -87,6 +87,7 @@
+        void
+ COSXClipboard::add(EFormat format, const CString & data)
+ {
++       bool emptied = false;
+        if (m_pboard == NULL)
+                return;
+ 
+@@ -105,9 +106,14 @@
+ 
+                        // integ tests showed that if you call add(...) twice, then the
+                        // second call will actually fail to set clipboard data. calling
+-                       // empty() seems to solve this problem.
+-                       empty();
+-
++                       // empty() seems to solve this problem. but, only clear the clipboard
++                       // for the first converter, otherwise further converters will wipe out
++                       // what we just added.
++                       if (!emptied) {
++                               empty();
++                               emptied = true;
++                       }
++                       
+                        PasteboardPutItemFlavor(
+                                        m_pboard,
+                                        (PasteboardItemID) 0,

Portfile

@@ -30 +30 @@
 
 # See http://synergy-foss.org/pm/issues/57
 patchfiles-append patch-bug57-keypress.diff \
-                  patch-bug57-modifiers.diff
+                  patch-bug57-modifiers.diff \
+                  patch-bug2962-clipboard.diff
 
 post-patch {
     # Set default config path