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

Remove is_email API and needless hard-coding of mailto:

Browse source
This commit is contained in:
Christian Dywan 2012-09-18 21:25:59 +02:00
parent b4b795e156
commit 7e39d05a17
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
katze/midori-uri.vala
View file

@ -114,12 +114,7 @@ namespace Midori {
|| (uri.has_prefix ("geo:") && uri.chr (-1, ',') != null) || (uri.has_prefix ("geo:") && uri.chr (-1, ',') != null)
|| uri.has_prefix ("javascript:")); || uri.has_prefix ("javascript:"));
} }
public static bool is_email (string? uri) {
return uri != null
&& (uri.chr (-1, '@') != null || uri.has_prefix ("mailto:"))
/* :// and @ together would mean login credentials */
&& uri.str ("://") == null;
}
public static bool is_ip_address (string? uri) { public static bool is_ip_address (string? uri) {
/* Quick check for IPv4 or IPv6, no validation. /* Quick check for IPv4 or IPv6, no validation.
FIXME: Schemes are not handled FIXME: Schemes are not handled

11
midori/midori-view.c
View file

@ -959,7 +959,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view
g_free (new_uri); g_free (new_uri);
return TRUE; return TRUE;
} }
else if (g_str_has_prefix (uri, "mailto:") || sokoke_external_uri (uri)) else if (sokoke_external_uri (uri))
{ {
if (sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (web_view)), if (sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (web_view)),
uri, GDK_CURRENT_TIME, NULL)) uri, GDK_CURRENT_TIME, NULL))
@ -1784,7 +1784,7 @@ static gboolean
midori_view_always_same_tab (const gchar* uri) midori_view_always_same_tab (const gchar* uri)
{ {
/* No opening in tab, window or app for Javascript or mailto links */ /* No opening in tab, window or app for Javascript or mailto links */
return g_str_has_prefix (uri, "javascript:") || midori_uri_is_email (uri); return g_str_has_prefix (uri, "javascript:") || g_str_has_prefix (uri, "mailto:");
} }
static void static void
@ -2831,7 +2831,10 @@ midori_view_populate_popup (MidoriView* view,
g_strstrip (view->selected_text); g_strstrip (view->selected_text);
if (midori_uri_is_valid (view->selected_text)) if (midori_uri_is_valid (view->selected_text))
{ {
if (midori_uri_is_email (view->selected_text)) /* :// and @ together would mean login credentials */
if (g_str_has_prefix (view->selected_text, "mailto:")
|| (strchr (view->selected_text, '@') != NULL
&& strstr (view->selected_text, "://") == NULL))
{ {
gchar* text = g_strdup_printf (_("Send a message to %s"), view->selected_text); gchar* text = g_strdup_printf (_("Send a message to %s"), view->selected_text);
menuitem = midori_view_insert_menu_item (menu_shell, -1, menuitem = midori_view_insert_menu_item (menu_shell, -1,
@ -4466,7 +4469,7 @@ midori_view_set_uri (MidoriView* view,
g_free (exception); g_free (exception);
} }
} }
else if (g_str_has_prefix (uri, "mailto:") || sokoke_external_uri (uri)) else if (sokoke_external_uri (uri))
{ {
sokoke_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL); sokoke_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
} }

1
tests/magic-uri.c
View file

@ -212,7 +212,6 @@ static void
magic_uri_pseudo (void) magic_uri_pseudo (void)
{ {
test_input ("javascript:alert(1)", "javascript:alert(1)"); test_input ("javascript:alert(1)", "javascript:alert(1)");
test_input ("mailto:christian@twotoasts.de", "mailto:christian@twotoasts.de");
test_input ("data:text/html;charset=utf-8,<title>Test</title>Test", test_input ("data:text/html;charset=utf-8,<title>Test</title>Test",
"data:text/html;charset=utf-8,<title>Test</title>Test"); "data:text/html;charset=utf-8,<title>Test</title>Test");
} }