[gtk+] cssimage: No need to pass base file anymore
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] cssimage: No need to pass base file anymore
- Date: Fri, 11 May 2012 14:44:52 +0000 (UTC)
commit c9f01ffb43378b6e44e420f79bc49cb5c8fe0706
Author: Benjamin Otte <otte redhat com>
Date: Wed Apr 18 21:44:08 2012 +0200
cssimage: No need to pass base file anymore
The file is now part of the GtkCssParser
gtk/gtkcssimage.c | 6 ++----
gtk/gtkcssimagecrossfade.c | 7 +++----
gtk/gtkcssimagegradient.c | 3 +--
gtk/gtkcssimagelinear.c | 3 +--
gtk/gtkcssimageprivate.h | 6 ++----
gtk/gtkcssimageurl.c | 3 +--
gtk/gtkcssimagewin32.c | 3 +--
gtk/gtkcssshorthandpropertyimpl.c | 4 ++--
gtk/gtkcssstylepropertyimpl.c | 2 +-
9 files changed, 14 insertions(+), 23 deletions(-)
---
diff --git a/gtk/gtkcssimage.c b/gtk/gtkcssimage.c
index 66ceffe..f92d4e9 100644
--- a/gtk/gtkcssimage.c
+++ b/gtk/gtkcssimage.c
@@ -357,15 +357,13 @@ _gtk_css_image_can_parse (GtkCssParser *parser)
}
GtkCssImage *
-_gtk_css_image_new_parse (GtkCssParser *parser,
- GFile *base)
+_gtk_css_image_new_parse (GtkCssParser *parser)
{
GtkCssImageClass *klass;
GtkCssImage *image;
GType image_type;
g_return_val_if_fail (parser != NULL, NULL);
- g_return_val_if_fail (G_IS_FILE (base), NULL);
image_type = gtk_css_image_get_parser_type (parser);
if (image_type == G_TYPE_INVALID)
@@ -377,7 +375,7 @@ _gtk_css_image_new_parse (GtkCssParser *parser,
image = g_object_new (image_type, NULL);
klass = GTK_CSS_IMAGE_GET_CLASS (image);
- if (!klass->parse (image, parser, base))
+ if (!klass->parse (image, parser))
{
g_object_unref (image);
return NULL;
diff --git a/gtk/gtkcssimagecrossfade.c b/gtk/gtkcssimagecrossfade.c
index 43d0b6d..f7f8a63 100644
--- a/gtk/gtkcssimagecrossfade.c
+++ b/gtk/gtkcssimagecrossfade.c
@@ -141,8 +141,7 @@ gtk_css_image_cross_fade_draw (GtkCssImage *image,
static gboolean
gtk_css_image_cross_fade_parse (GtkCssImage *image,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssImageCrossFade *cross_fade = GTK_CSS_IMAGE_CROSS_FADE (image);
GtkCssValue *number;
@@ -153,7 +152,7 @@ gtk_css_image_cross_fade_parse (GtkCssImage *image,
return FALSE;
}
- cross_fade->start = _gtk_css_image_new_parse (parser, base);
+ cross_fade->start = _gtk_css_image_new_parse (parser);
if (cross_fade->start == NULL)
return FALSE;
@@ -163,7 +162,7 @@ gtk_css_image_cross_fade_parse (GtkCssImage *image,
return FALSE;
}
- cross_fade->end = _gtk_css_image_new_parse (parser, base);
+ cross_fade->end = _gtk_css_image_new_parse (parser);
if (cross_fade->end == NULL)
return FALSE;
diff --git a/gtk/gtkcssimagegradient.c b/gtk/gtkcssimagegradient.c
index df350b3..1398d65 100644
--- a/gtk/gtkcssimagegradient.c
+++ b/gtk/gtkcssimagegradient.c
@@ -66,8 +66,7 @@ gtk_css_image_gradient_draw (GtkCssImage *image,
static gboolean
gtk_css_image_gradient_parse (GtkCssImage *image,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssImageGradient *gradient = GTK_CSS_IMAGE_GRADIENT (image);
diff --git a/gtk/gtkcssimagelinear.c b/gtk/gtkcssimagelinear.c
index 71554d9..5c720d9 100644
--- a/gtk/gtkcssimagelinear.c
+++ b/gtk/gtkcssimagelinear.c
@@ -222,8 +222,7 @@ gtk_css_image_linear_draw (GtkCssImage *image,
static gboolean
gtk_css_image_linear_parse (GtkCssImage *image,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssImageLinear *linear = GTK_CSS_IMAGE_LINEAR (image);
guint i;
diff --git a/gtk/gtkcssimageprivate.h b/gtk/gtkcssimageprivate.h
index 64b8113..85014a9 100644
--- a/gtk/gtkcssimageprivate.h
+++ b/gtk/gtkcssimageprivate.h
@@ -65,8 +65,7 @@ struct _GtkCssImageClass
double height);
/* parse CSS, return TRUE on success */
gboolean (* parse) (GtkCssImage *image,
- GtkCssParser *parser,
- GFile *base);
+ GtkCssParser *parser);
/* print to CSS */
void (* print) (GtkCssImage *image,
GString *string);
@@ -75,8 +74,7 @@ struct _GtkCssImageClass
GType _gtk_css_image_get_type (void) G_GNUC_CONST;
gboolean _gtk_css_image_can_parse (GtkCssParser *parser);
-GtkCssImage * _gtk_css_image_new_parse (GtkCssParser *parser,
- GFile *base);
+GtkCssImage * _gtk_css_image_new_parse (GtkCssParser *parser);
int _gtk_css_image_get_width (GtkCssImage *image);
int _gtk_css_image_get_height (GtkCssImage *image);
diff --git a/gtk/gtkcssimageurl.c b/gtk/gtkcssimageurl.c
index b12d8c5..92126d3 100644
--- a/gtk/gtkcssimageurl.c
+++ b/gtk/gtkcssimageurl.c
@@ -62,8 +62,7 @@ gtk_css_image_url_draw (GtkCssImage *image,
static gboolean
gtk_css_image_url_parse (GtkCssImage *image,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssImageUrl *url = GTK_CSS_IMAGE_URL (image);
GdkPixbuf *pixbuf;
diff --git a/gtk/gtkcssimagewin32.c b/gtk/gtkcssimagewin32.c
index ca82a08..aa1f4af 100644
--- a/gtk/gtkcssimagewin32.c
+++ b/gtk/gtkcssimagewin32.c
@@ -67,8 +67,7 @@ gtk_css_image_win32_draw (GtkCssImage *image,
static gboolean
gtk_css_image_win32_parse (GtkCssImage *image,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssImageWin32 *wimage = GTK_CSS_IMAGE_WIN32 (image);
char *class;
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index 9f72a2b..1c3ad62 100644
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -281,7 +281,7 @@ parse_border_image (GtkCssShorthandProperty *shorthand,
image = NULL;
else
{
- image = _gtk_css_image_new_parse (parser, base);
+ image = _gtk_css_image_new_parse (parser);
if (image == NULL)
return FALSE;
}
@@ -483,7 +483,7 @@ parse_background (GtkCssShorthandProperty *shorthand,
image = NULL;
else
{
- image = _gtk_css_image_new_parse (parser, base);
+ image = _gtk_css_image_new_parse (parser);
if (image == NULL)
return FALSE;
}
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 1e10bee..0eaa62f 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -553,7 +553,7 @@ css_image_value_parse (GtkCssStyleProperty *property,
image = NULL;
else
{
- image = _gtk_css_image_new_parse (parser, base);
+ image = _gtk_css_image_new_parse (parser);
if (image == NULL)
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]