debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Introduce midori_view_always_same_tab to include mailto

Browse source
This commit is contained in:
Christian Dywan 2012-01-06 01:41:05 +01:00
parent 20228cfdd6
commit 1bff3b12a3
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
midori/midori-view.c
View file

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