[Xfce4-commits] <midori:master> Introduce midori_view_always_same_tab to include mailto

[Christian Dywan]

Updating branch refs/heads/master
         to 1bff3b12a306c3e08c49e6fa837f2aa1c01f6e23 (commit)
       from 20228cfdd65f11db30fd146cbde00b797afaefef (commit)

commit 1bff3b12a306c3e08c49e6fa837f2aa1c01f6e23
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Jan 6 01:41:05 2012 +0100

    Introduce midori_view_always_same_tab to include mailto

 midori/midori-view.c |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index c1ee460..f65a9bd 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1622,6 +1622,13 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view,
         g_object_set (view, "statusbar-text", link_uri, NULL);
 }
 
+static gboolean
+midori_view_always_same_tab (const gchar* uri)
+{
+    /* No opening in tab, window or app for Javascript or mailto links */
+    return g_str_has_prefix (uri, "javascript:") || midori_uri_is_email (uri);
+}
+
 static void
 midori_view_ensure_link_uri (MidoriView* view,
                              gint        *x,
@@ -1680,8 +1687,7 @@ gtk_widget_button_press_event_cb (WebKitWebView*  web_view,
         if (!link_uri)
             return FALSE;
 
-        /* Always open Javascript links in current tab */
-        if (g_str_has_prefix (link_uri, "javascript:"))
+        if (midori_view_always_same_tab (link_uri))
             return FALSE;
 
         if (MIDORI_MOD_NEW_TAB (event->state))
@@ -1703,8 +1709,7 @@ gtk_widget_button_press_event_cb (WebKitWebView*  web_view,
     case 2:
         if (link_uri)
         {
-            /* Always open Javascript links in current tab */
-            if (g_str_has_prefix (link_uri, "javascript:"))
+            if (midori_view_always_same_tab (link_uri))
                 return FALSE;
 
             /* Open link in new tab */
@@ -2359,8 +2364,7 @@ midori_view_populate_popup (MidoriView* view,
     }
     if (view->link_uri)
     {
-        /* No opening in tab, window or app for Javascript links */
-        if (!g_str_has_prefix (view->link_uri, "javascript:"))
+        if (!midori_view_always_same_tab (view->link_uri))
         {
         midori_view_insert_menu_item (menu_shell, -1,
             _("Open Link in New _Tab"), STOCK_TAB_NEW,
@@ -2382,8 +2386,7 @@ midori_view_populate_popup (MidoriView* view,
             _("Copy Link de_stination"), NULL,
             G_CALLBACK (midori_web_view_menu_link_copy_activate_cb), widget);
 
-        /* No saving for Javascript links */
-        if (!g_str_has_prefix (view->link_uri, "javascript:"))
+        if (!midori_view_always_same_tab (view->link_uri))
         {
         midori_view_insert_menu_item (menu_shell, -1,
             NULL, GTK_STOCK_SAVE_AS,