[Xfce4-commits] <midori:master> Only middle click search if the selection contains :// or Alt

[Christian Dywan]

Updating branch refs/heads/master
         to 044f1f96fbf2dad626e5e03d23e377b0036b1a33 (commit)
       from 3583a070565f6f17278ac2c1b8dc77c5b1fa3579 (commit)

commit 044f1f96fbf2dad626e5e03d23e377b0036b1a33
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Mar 3 00:31:35 2010 +0100

    Only middle click search if the selection contains :// or Alt
    
    Accidentally searching is annoying. Presumably when a proper
    address is selected it was intentional.

 midori/midori-view.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 3bd811e..917ccb3 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1324,6 +1324,11 @@ gtk_widget_button_press_event_cb (WebKitWebView*  web_view,
                     }
                     katze_assign (uri, new_uri);
                 }
+                else if (!strstr (uri, "://"))
+                {
+                    g_free (uri);
+                    return FALSE;
+                }
 
                 if (MIDORI_MOD_NEW_TAB (event->state))
                 {
@@ -1337,8 +1342,8 @@ gtk_widget_button_press_event_cb (WebKitWebView*  web_view,
                     midori_view_set_uri (MIDORI_VIEW (view), uri);
                     gtk_widget_grab_focus (GTK_WIDGET (view));
                 }
+                g_free (uri);
                 return TRUE;
-            g_free (uri);
             }
         }
         break;