Commit d92ee6dc authored by Tristan Van Berkom's avatar Tristan Van Berkom
Browse files

Fixed gtk_builder_value_from_string_type() to always assign the GError

when returning FALSE, fixes bgo #615000.
parent b9002feb
......@@ -1390,14 +1390,19 @@ gtk_builder_value_from_string_type (GtkBuilder *builder,
ret = FALSE;
break;
default:
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
"Unsupported GType `%s'",
g_type_name (type));
ret = FALSE;
break;
}
/* Catch unassigned error for object types as well as any unsupported types.
* While parsing GtkBuilder; object types are deserialized
* without calling gtk_builder_value_from_string_type().
*/
if (!ret && error && *error == NULL)
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
"Unsupported GType `%s'", g_type_name (type));
return ret;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment