diff options
| author | Johan Dahlin <johan@gnome.org> | 2008-01-06 15:17:26 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-01-06 15:17:26 +0000 |
| commit | 0e09e8b3fff91ba7dfc307777666a2d9f7545fb0 (patch) | |
| tree | 410bb39a1fe8fbf9341296a4811673abb8dd27af /gtk | |
| parent | bf4f21118acd6cbd2e51b60424f83ee248011bee (diff) | |
| download | gtk+-0e09e8b3fff91ba7dfc307777666a2d9f7545fb0.tar.gz | |
Allow domains to be overridden in <interface>'s if a translation-domain is
2008-01-06 Johan Dahlin <johan@gnome.org>
* gtk/gtkbuilderparser.c (parse_interface):
Allow domains to be overridden in <interface>'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 <interface> apply only to strings
in that interface.
(#496831, Ryan Lortie)
svn path=/trunk/; revision=19316
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkbuilderparser.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |