Add GtkBuilder and GError arguments to gtk_builder_value_from_string and

    * gtk/gtkbuilder.c: (gtk_builder_get_parameters),
    (gtk_builder_value_from_string),
    (gtk_builder_value_from_string_type):
    * gtk/gtkbuilder.h:
    * gtk/gtkcontainer.c: (gtk_container_buildable_set_child_property),
    (attributes_text_element):
    * gtk/gtkliststore.c: (list_store_text):
    * tests/buildertest.c: (test_value_from_string):

    Add GtkBuilder and GError arguments to gtk_builder_value_from_string
    and gtk_builder_value_from_string_type. (#451428)


svn path=/trunk/; revision=18262

1 files changed, 15 insertions, 5 deletions

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index c012afbda3..5694f76400 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -2187,17 +2187,27 @@ list_store_text (GMarkupParseContext *context,
 {
   SubParserData *data = (SubParserData*)user_data;
   gint i;
-
+  GError *tmp_error = NULL;
+  
   if (!data->is_data)
     return;
 
   i = data->row_column - 1;
 
-  if (!gtk_builder_value_from_string_type (data->column_types[i],
+  if (!gtk_builder_value_from_string_type (data->builder,
+					   data->column_types[i],
 					   text,
-					   &data->values[i]))
-    g_error ("Could not convert '%s' to type %s\n",
-	     text, g_type_name (data->column_types[i]));
+					   &data->values[i],
+					   &tmp_error))
+    {
+      g_set_error (error,
+		   tmp_error->domain,
+		   tmp_error->code,
+		   "Could not convert '%s' to type %s: %s\n",
+		   text, g_type_name (data->column_types[i]),
+		   tmp_error->message);
+      g_error_free (tmp_error);
+    }
 }
 
 static const GMarkupParser list_store_parser =