]> spindle.queued.net Git - midori/commitdiff
Only use _action_copy_activate work-around < 1.4.3
authorChristian Dywan <christian@twotoasts.de>
Fri, 10 Feb 2012 20:29:49 +0000 (21:29 +0100)
committerChristian Dywan <christian@twotoasts.de>
Fri, 10 Feb 2012 22:31:42 +0000 (23:31 +0100)
midori/midori-browser.c

index e9a6223377b5f0f0b1c89da4a7a6adf08cd41949..7d0493b0b3175cd63f6920b81d052179c3572dd3 100644 (file)
@@ -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");
 }