From: Christian Dywan <christian@twotoasts.de>
Date: Fri, 10 Feb 2012 20:29:49 +0000 (+0100)
Subject: Only use _action_copy_activate work-around < 1.4.3
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c323ff1498371e17f360815bcc42eaa3424dea1;p=midori

Only use _action_copy_activate work-around < 1.4.3
---

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index e9a62233..7d0493b0 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2656,6 +2656,7 @@ _action_copy_activate (GtkAction*     action,
                        MidoriBrowser* browser)
 {
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
+#if !WEBKIT_CHECK_VERSION (1, 4, 3)
     /* Work around broken clipboard handling for the sake of the user */
     if (WEBKIT_IS_WEB_VIEW (widget))
     {
@@ -2665,6 +2666,7 @@ _action_copy_activate (GtkAction*     action,
         sokoke_widget_copy_clipboard (widget, selected);
         return;
     }
+#endif
     if (G_LIKELY (widget) && g_signal_lookup ("copy-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "copy-clipboard");
 }