callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed GtkContainer buildable implementation to set packing properties explicitly set to "" (i.e. explicitly set to nothing).

Browse Source
This commit is contained in:
Tristan Van Berkom
2011-02-02 15:19:39 +09:00
parent 8a2a148649
commit fb3e221559
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkcontainer.c
View File

@ -643,30 +643,28 @@ attributes_end_element (GMarkupParseContext *context,
{
PackingPropertiesData *parser_data = (PackingPropertiesData*)user_data;
/* Append the translated strings */
if (parser_data->string->len)
/* translate the string */
if (parser_data->string->len && parser_data->translatable)
{
if (parser_data->translatable)
{
gchar *translated;
const gchar* domain;
gchar *translated;
const gchar* domain;
domain = gtk_builder_get_translation_domain (parser_data->builder);
domain = gtk_builder_get_translation_domain (parser_data->builder);
translated = _gtk_builder_parser_translate (domain,
parser_data->context,
parser_data->string->str);
g_string_set_size (parser_data->string, 0);
g_string_append (parser_data->string, translated);
}
gtk_container_buildable_set_child_property (parser_data->container,
parser_data->builder,
parser_data->child,
parser_data->child_prop_name,
translated = _gtk_builder_parser_translate (domain,
parser_data->context,
parser_data->string->str);
g_string_set_size (parser_data->string, 0);
g_string_append (parser_data->string, translated);
}
if (parser_data->child_prop_name)
gtk_container_buildable_set_child_property (parser_data->container,
parser_data->builder,
parser_data->child,
parser_data->child_prop_name,
parser_data->string->str);
g_string_set_size (parser_data->string, 0);
g_free (parser_data->child_prop_name);
g_free (parser_data->context);