[Xfce4-commits] <midori:master> Only use _action_copy_activate work-around < 1.4.3

[Christian Dywan]

Updating branch refs/heads/master
         to 9c323ff1498371e17f360815bcc42eaa3424dea1 (commit)
       from f045fb2a5b2be560e8f726a8d4fd7513c65f8352 (commit)

commit 9c323ff1498371e17f360815bcc42eaa3424dea1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Feb 10 21:29:49 2012 +0100

    Only use _action_copy_activate work-around < 1.4.3

 midori/midori-browser.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index e9a6223..7d0493b 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");
 }