AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Make url parsing work for slices

Browse Source 
The border-image parsing code relies on parse_path_str to return
a meaningful end_ptr in case of success, too.
This commit is contained in:
Matthias Clasen 2010-11-22 09:03:07 -05:00 committed by Carlos Garnacho
parent 28e549082c
commit 953ac51fb8
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkcssprovider.c
View File

@ -2318,7 +2318,9 @@ path_parse_str (GtkCssProvider *css_provider,
const gchar *str, const gchar *str,
gchar **end_ptr) gchar **end_ptr)
{ {
gchar *path, *chr; gchar *path, *chr, *start, *end;
start = str;
if (g_str_has_prefix (str, "url")) if (g_str_has_prefix (str, "url"))
{ {
@ -2331,14 +2333,15 @@ path_parse_str (GtkCssProvider *css_provider,
return NULL; return NULL;
} }
chr = strrchr (str, ')'); chr = strchr (str, ')');
if (!chr) if (!chr)
{ {
*end_ptr = (gchar *) str; *end_ptr = (gchar *) str;
return NULL; return NULL;
} }
end = chr + 1;
str++; str++;
SKIP_SPACES (str); SKIP_SPACES (str);
@ -2366,7 +2369,7 @@ path_parse_str (GtkCssProvider *css_provider,
path = g_strndup (str, chr - str); path = g_strndup (str, chr - str);
g_strstrip (path); g_strstrip (path);
*end_ptr = str + strlen (str); *end_ptr = end;
} }
else else
{ {
@ -2400,6 +2403,7 @@ path_parse_str (GtkCssProvider *css_provider,
g_warning ("File doesn't exist: %s\n", path); g_warning ("File doesn't exist: %s\n", path);
g_free (path); g_free (path);
path = NULL; path = NULL;
*end_ptr = start;
} }
return path; return path;
@ -2454,22 +2458,22 @@ slice_parse_str (GtkCssProvider *css_provider,
SKIP_SPACES (str); SKIP_SPACES (str);
/* Parse top/left/bottom/right distances */ /* Parse top/left/bottom/right distances */
distance_top = g_strtod (str, end_ptr); distance_top = g_ascii_strtod (str, end_ptr);
str = *end_ptr; str = *end_ptr;
SKIP_SPACES (str); SKIP_SPACES (str);
distance_right = g_strtod (str, end_ptr); distance_right = g_ascii_strtod (str, end_ptr);
str = *end_ptr; str = *end_ptr;
SKIP_SPACES (str); SKIP_SPACES (str);
distance_bottom = g_strtod (str, end_ptr); distance_bottom = g_ascii_strtod (str, end_ptr);
str = *end_ptr; str = *end_ptr;
SKIP_SPACES (str); SKIP_SPACES (str);
distance_left = g_strtod (str, end_ptr); distance_left = g_ascii_strtod (str, end_ptr);
str = *end_ptr; str = *end_ptr;
SKIP_SPACES (str); SKIP_SPACES (str);
@ -2562,7 +2566,7 @@ unit_parse_str (const gchar *str,
gdouble unit; gdouble unit;
SKIP_SPACES (str); SKIP_SPACES (str);
unit = g_strtod (str, end_str); unit = g_ascii_strtod (str, end_str);
str = *end_str; str = *end_str;
/* Now parse the unit type, if any. We /* Now parse the unit type, if any. We