From cc9afdbe8469d0b33d214c22144af5b80bc9b260 Mon Sep 17 00:00:00 2001
From: Kirill Kalishev <kirill.kalishev@jetbrains.com>
Date: Mon, 23 May 2011 18:43:45 +0400
Subject: [PATCH] mac, native clipboard - registry key, default=false

---
 .../src/com/intellij/ide/ClipboardSynchronizer.java            | 3 ++-
 platform/platform-resources-en/src/misc/registry.properties    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java b/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
index b8be6689c80a..3bb4a245e399 100644
--- a/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
+++ b/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.ui.mac.foundation.Foundation;
 import com.intellij.ui.mac.foundation.ID;
 import com.sun.jna.IntegerType;
@@ -202,7 +203,7 @@ public class ClipboardSynchronizer implements ApplicationComponent {
   }
 
   private Transferable doGetContents() throws IllegalStateException {
-    if (SystemInfo.isMac) {
+    if (SystemInfo.isMac && Registry.is("ide.mac.useNativeClipboard")) {
       Transferable safe = getContentsSafe();
       if (safe != null) {
         return safe;
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 06d5bbe79dcf..23ec4bb6653f 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -134,3 +134,4 @@ dir.diff.default.src.folder=
 dir.diff.default.trg.folder=
 show.live.templates.in.completion=false
 documentation.component.editor.font=false
+ide.mac.useNativeClipboard=false