[gtk+/nth-child: 7/33] css: Rename struct variable

[Benjamin Otte <otte src gnome org>]

commit f0bdbeabf845d5adcd6433877331e006d2ae7ceb
Author: Benjamin Otte <otte redhat com>
Date:   Thu May 26 00:09:26 2011 +0200

    css: Rename struct variable
    
    I want to add parse_func as something different soon.

 gtk/gtkcssprovider.c          |    4 ++--
 gtk/gtkstyleproperties.c      |    2 +-
 gtk/gtkstyleproperty.c        |    4 ++--
 gtk/gtkstylepropertyprivate.h |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 0abd075..34d68af 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2089,7 +2089,7 @@ parse_declaration (GtkCssScanner *scanner,
           g_param_value_set_default (property->pspec, val);
           gtk_css_ruleset_add (ruleset, property, val);
         }
-      else if (property->parse_func)
+      else if (property->property_parse_func)
         {
           GError *error = NULL;
           char *value_str;
@@ -2101,7 +2101,7 @@ parse_declaration (GtkCssScanner *scanner,
               return;
             }
           
-          if ((*property->parse_func) (value_str, val, &error))
+          if ((*property->property_parse_func) (value_str, val, &error))
             gtk_css_ruleset_add (ruleset, property, val);
           else
             gtk_css_provider_take_error (scanner->provider, scanner, error);
diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c
index 6707372..18e4c03 100644
--- a/gtk/gtkstyleproperties.c
+++ b/gtk/gtkstyleproperties.c
@@ -348,7 +348,7 @@ gtk_style_properties_lookup_property (const gchar             *property_name,
         *pspec = node->pspec;
 
       if (parse_func)
-        *parse_func = node->parse_func;
+        *parse_func = node->property_parse_func;
 
       found = TRUE;
     }
diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 477b7c0..d3c35d9 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -1640,7 +1640,7 @@ _gtk_style_property_lookup (const char *name)
 
 void
 _gtk_style_property_register (GParamSpec             *pspec,
-                              GtkStylePropertyParser  parse_func,
+                              GtkStylePropertyParser  property_parse_func,
                               GtkStyleUnpackFunc      unpack_func,
                               GtkStylePackFunc        pack_func)
 {
@@ -1661,7 +1661,7 @@ _gtk_style_property_register (GParamSpec             *pspec,
 
   node = g_slice_new0 (GtkStyleProperty);
   node->pspec = pspec;
-  node->parse_func = parse_func;
+  node->property_parse_func = property_parse_func;
   node->pack_func = pack_func;
   node->unpack_func = unpack_func;
 
diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 8ffe0ad..ba9fd3f 100644
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -35,7 +35,7 @@ typedef void             (* GtkStylePackFunc)              (GValue
 struct _GtkStyleProperty
 {
   GParamSpec             *pspec;
-  GtkStylePropertyParser  parse_func;
+  GtkStylePropertyParser  property_parse_func;
   GtkStyleUnpackFunc      unpack_func;
   GtkStylePackFunc        pack_func;
 };
@@ -43,7 +43,7 @@ struct _GtkStyleProperty
 const GtkStyleProperty * _gtk_style_property_lookup        (const char             *name);
 
 void                     _gtk_style_property_register      (GParamSpec             *pspec,
-                                                            GtkStylePropertyParser  parse_func,
+                                                            GtkStylePropertyParser  property_parse_func,
                                                             GtkStyleUnpackFunc      unpack_func,
                                                             GtkStylePackFunc        pack_func);