From 35488f58461d53a92992cfeff686e5a2c972500d Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 26 May 2011 00:09:26 +0200
Subject: [PATCH] css: Rename struct variable

I want to add parse_func as something different soon.
---
 gtk/gtkcssprovider.c          | 10 ++++++----
 gtk/gtkstyleproperties.c      |  2 +-
 gtk/gtkstyleproperty.c        |  4 ++--
 gtk/gtkstylepropertyprivate.h |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 5cb8d8b58f..1b3c12e062 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2094,7 +2094,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;
@@ -2106,9 +2106,11 @@ parse_declaration (GtkCssScanner *scanner,
               g_slice_free (GValue, val);
               return;
             }
-
-          if ((*property->parse_func) (value_str, val, &error))
-            gtk_css_ruleset_add (ruleset, property, val);
+          
+          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 f6671f7466..c0fb730c7a 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 3c4462367f..9771eb5eba 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -1641,7 +1641,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)
 {
@@ -1662,7 +1662,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 8ffe0adf8b..ba9fd3f4b3 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);