AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-30 02:57:38 +00:00
Code Issues Projects Releases Wiki Activity

cssimage: Improve new_parse() to select right image type

Browse Source
This commit is contained in:
Benjamin Otte 2011-12-20 08:52:54 +01:00
parent 38be9fe879
commit 950b95af40
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtkcssimage.c
View File

@ -162,21 +162,38 @@ GtkCssImage *
_gtk_css_image_new_parse (GtkCssParser *parser,
GFile *base)
{
GtkCssImage *image;
GtkCssImageClass *klass;
static const struct {
const char *prefix;
GType (* type_func) (void);
} image_types[] = {
{ "url", _gtk_css_image_url_get_type }
};
guint i;
g_return_val_if_fail (parser != NULL, NULL);
g_return_val_if_fail (G_IS_FILE (base), NULL);
image = g_object_new (GTK_TYPE_CSS_IMAGE_URL, NULL);
klass = GTK_CSS_IMAGE_GET_CLASS (image);
if (!klass->parse (image, parser, base))
for (i = 0; i < G_N_ELEMENTS (image_types); i++)
{
g_object_unref (image);
return NULL;
if (_gtk_css_parser_has_prefix (parser, image_types[i].prefix))
{
GtkCssImage *image;
GtkCssImageClass *klass;
image = g_object_new (image_types[i].type_func (), NULL);
klass = GTK_CSS_IMAGE_GET_CLASS (image);
if (!klass->parse (image, parser, base))
{
g_object_unref (image);
return NULL;
}
return image;
}
}
return image;
_gtk_css_parser_error (parser, "Not a valid image");
return NULL;
}