From 0e09e8b3fff91ba7dfc307777666a2d9f7545fb0 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Sun, 6 Jan 2008 15:17:26 +0000 Subject: [PATCH] Allow domains to be overridden in 's if a translation-domain is 2008-01-06 Johan Dahlin * gtk/gtkbuilderparser.c (parse_interface): Allow domains to be overridden in 's if a translation-domain is set in the builder. (_gtk_builder_parser_parse_buffer): Do not modify the translation-domain of the builder, make the domain set in the apply only to strings in that interface. (#496831, Ryan Lortie) svn path=/trunk/; revision=19316 --- ChangeLog | 8 ++++++++ gtk/gtkbuilderparser.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8aa862806c..7244227d63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-01-06 Johan Dahlin + * gtk/gtkbuilderparser.c (parse_interface): + Allow domains to be overridden in 's if a translation-domain + is set in the builder. + (_gtk_builder_parser_parse_buffer): Do not modify the translation-domain + of the builder, make the domain set in the apply only to strings + in that interface. + (#496831, Ryan Lortie) + * gtk/gtkbuilder.c: Avoid adding unnecessary trailing newlines to g_warning calls. diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c index 7f43af64e2..ce4b7dbc91 100644 --- a/gtk/gtkbuilderparser.c +++ b/gtk/gtkbuilderparser.c @@ -534,8 +534,9 @@ parse_interface (ParserData *data, for (i = 0; names[i] != NULL; i++) { - if (strcmp (names[i], "domain") == 0 && !data->domain) + if (strcmp (names[i], "domain") == 0) { + g_free (data->domain); data->domain = g_strdup (values[i]); break; } @@ -962,7 +963,6 @@ _gtk_builder_parser_parse_buffer (GtkBuilder *builder, if (!g_markup_parse_context_parse (data->ctx, buffer, length, error)) goto out; - gtk_builder_set_translation_domain (data->builder, data->domain); _gtk_builder_finish (builder); /* Custom parser_finished */