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

Only split URI if no domain pattern is found in the string

Browse source
This commit is contained in:
Christian Dywan 2010-02-08 23:02:54 +01:00
parent 060c0b6940
commit 0243e26bed
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
midori/sokoke.c
View file

@ -622,18 +622,21 @@ sokoke_magic_uri (const gchar* uri,
return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL)); return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL));
if (!strncmp (uri, "localhost", 9) && (uri[9] == '\0' || uri[9] == '/')) if (!strncmp (uri, "localhost", 9) && (uri[9] == '\0' || uri[9] == '/'))
return g_strconcat ("http://", uri, NULL); return g_strconcat ("http://", uri, NULL);
parts = g_strsplit (uri, ".", 0); if (!search)
if (!search && parts[0] && parts[1])
{ {
if (!(parts[1][1] == '\0' && !g_ascii_isalpha (parts[1][0]))) parts = g_strsplit (uri, ".", 0);
if (!strchr (parts[0], ' ') && !strchr (parts[1], ' ')) if (parts[0] && parts[1])
{ {
search = g_strconcat ("http://", uri, NULL); if (!(parts[1][1] == '\0' && !g_ascii_isalpha (parts[1][0])))
g_strfreev (parts); if (!strchr (parts[0], ' ') && !strchr (parts[1], ' '))
return sokoke_idn_to_punycode (search); {
} search = g_strconcat ("http://", uri, NULL);
g_strfreev (parts);
return sokoke_idn_to_punycode (search);
}
}
g_strfreev (parts);
} }
g_strfreev (parts);
/* We don't want to search? So return early. */ /* We don't want to search? So return early. */
if (!search_engines) if (!search_engines)
return g_strdup (uri); return g_strdup (uri);