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

Split -moz-document by both space and comma

Browse source 
Otherwise when only a comma was used only the first domain
value would be picked up.
This commit is contained in:
Christian Dywan 2011-11-09 21:03:09 +01:00
parent 26658711be
commit 5a786354b5
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
extensions/addons.c
View file

@ -1020,19 +1020,19 @@ css_metadata_from_file (const gchar* filename,
rest_of_line = g_strdup (line); rest_of_line = g_strdup (line);
rest_of_line = g_strstrip (rest_of_line); rest_of_line = g_strstrip (rest_of_line);
line_has_meta = g_str_has_suffix (rest_of_line, "{") ? FALSE : TRUE; line_has_meta = !g_str_has_suffix (rest_of_line, "{");
parts = g_strsplit (rest_of_line, " ", 0); parts = g_strsplit_set (rest_of_line, " ,", 0);
i = 0; i = 0;
while (parts[i] && (*parts[i] != '\0' && *parts[i] != '{')) while (parts[i] && *parts[i] != '{')
{ {
gchar* value = NULL; gchar* value = NULL;
if (g_str_has_prefix (parts[i], "url-prefix(")) if (g_str_has_prefix (parts[i], "url-prefix("))
value = g_strdup (parts[i] + strlen ("url-prefix(")); value = &parts[i][strlen ("url-prefix(")];
else if (g_str_has_prefix (parts[i], "domain(")) else if (g_str_has_prefix (parts[i], "domain("))
value = g_strdup (parts[i] + strlen ("domain(")); value = &parts[i][strlen ("domain(")];
else if (g_str_has_prefix (parts[i], "url(")) else if (g_str_has_prefix (parts[i], "url("))
value = g_strdup (parts[i] + strlen ("url(")); value = &parts[i][strlen ("url(")];
if (value) if (value)
{ {
guint begin, end; guint begin, end;
@ -1054,7 +1054,6 @@ css_metadata_from_file (const gchar* filename,
re = addons_convert_to_simple_regexp (tmp_domain); re = addons_convert_to_simple_regexp (tmp_domain);
*includes = g_slist_prepend (*includes, re); *includes = g_slist_prepend (*includes, re);
g_free (value);
g_free (domain); g_free (domain);
} }
i++; i++;