X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstyleproperty.c;h=74245d6ce2b59bbcdeee637bed9822123643a8b6;hb=90a034d80066135504de4e97b1a06c28fe20178a;hp=928bf58ed0fa576525047b070ebe5d43b6baaf88;hpb=5939baa55657d15c214695bbdad33f9827071c2d;p=~andy%2Fgtk

diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 928bf58ed..74245d6ce 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -133,9 +131,7 @@ _gtk_style_property_init (GtkStyleProperty *property)
 /**
  * _gtk_style_property_parse_value:
  * @property: the property
- * @value: an uninitialized value
  * @parser: the parser to parse from
- * @base: the base file for @aprser
  *
  * Tries to parse the given @property from the given @parser into
  * @value. The type that @value will be assigned is dependant on
@@ -144,26 +140,23 @@ _gtk_style_property_init (GtkStyleProperty *property)
  * left uninitialized.
  *
  * Only if @property is a #GtkCssShorthandProperty, the @value will
- * always contain a #GValueArray with the values to be used for
- * the subproperties.
+ * always be a #GtkCssValue whose values can be queried with
+ * _gtk_css_array_value_get_nth().
  *
- * Returns: %TRUE on success
+ * Returns: %NULL on failure or the parsed #GtkCssValue
  **/
-gboolean
+GtkCssValue *
 _gtk_style_property_parse_value (GtkStyleProperty *property,
-                                 GValue           *value,
-                                 GtkCssParser     *parser,
-                                 GFile            *base)
+                                 GtkCssParser     *parser)
 {
   GtkStylePropertyClass *klass;
 
-  g_return_val_if_fail (GTK_IS_STYLE_PROPERTY (property), FALSE);
-  g_return_val_if_fail (value != NULL, FALSE);
-  g_return_val_if_fail (parser != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_STYLE_PROPERTY (property), NULL);
+  g_return_val_if_fail (parser != NULL, NULL);
 
   klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
 
-  return klass->parse_value (property, value, parser, base);
+  return klass->parse_value (property, parser);
 }
 
 /**
@@ -215,15 +208,13 @@ _gtk_style_property_query (GtkStyleProperty  *property,
 {
   GtkStylePropertyClass *klass;
 
-  g_return_if_fail (GTK_IS_STYLE_PROPERTY (property));
   g_return_if_fail (value != NULL);
+  g_return_if_fail (GTK_IS_STYLE_PROPERTY (property));
   g_return_if_fail (query_func != NULL);
 
   klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
 
-  g_value_init (value, property->value_type);
-
-  klass->query (property, value, query_func, query_data);
+  return klass->query (property, value, query_func, query_data);
 }
 
 void