Merge lp:~gero-bare/midori/midori-bug-1281211 into lp:midori

[Gero.Bare]

Please check if this is a sane implementation.

It seems correct to me, but I could be wrong.

Not much to add. I simply added a check to verify if the user make a click with the middle button over a part of a document (document < image), if it is then ignore that.

[gue5t gue5t (gue5t)]

I don't think this is the right way to fix this problem. It doesn't address other parts of the same bug, such as double-clicking the scrollbar also opening a new tab. I'll dig up the precise commit that caused these problems when I get a chance.

review: Disapprove

[Gero.Bare (gero-bare)]

@gue5t
Please could you update the bug description with all the relevant info.
That would be awesome, in case that anyone want to tackle this.

Unmerged revisions

6837. By Gero.Bare on 2014-12-02

Prevent to open new tab when a click over an image is issued.

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2014-11-22 18:28:09 +0000
+++ midori/midori-view.c	2014-12-02 01:58:51 +0000
@@ -1624,6 +1624,11 @@
             view->button_press_handled = TRUE;
             return TRUE;
         }
+
+        #ifndef HAVE_WEBKIT2
+        WebKitHitTestResult* result = webkit_web_view_get_hit_test_result (web_view, event);
+        WebKitHitTestResultContext context = katze_object_get_int (result, "context");
+        #endif
         #if GTK_CHECK_VERSION (3, 4, 0)
         if (katze_object_get_boolean (gtk_widget_get_settings (view->web_view), "gtk-enable-primary-paste"))
         #else
@@ -1631,8 +1636,6 @@
         #endif
         {
             #ifndef HAVE_WEBKIT2
-            WebKitHitTestResult* result = webkit_web_view_get_hit_test_result (web_view, event);
-            WebKitHitTestResultContext context = katze_object_get_int (result, "context");
             gboolean is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
             g_object_unref (result);
             if (!is_editable)
@@ -1693,6 +1696,13 @@
             midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0);
             return FALSE; /* Allow Ctrl + Middle click */
         }
+#ifndef HAVE_WEBKIT2
+        if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT )
+        {
+            return TRUE; /*To prevent open new tab if clicked with middle button over an image*/
+        }
+#endif
+
         return FALSE;
         break;
     case 3: