From 932e2546888e53726f5553106512c77cc13424e9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 2 May 2015 13:15:18 -0400 Subject: [PATCH] gtk-builder-tool: Always emit translatable properties Seems unlikely that these would ever have a default value, but better safe than sorry. --- gtk/gtk-builder-tool.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/gtk/gtk-builder-tool.c b/gtk/gtk-builder-tool.c index 5c1a3ec60a..9825190613 100644 --- a/gtk/gtk-builder-tool.c +++ b/gtk/gtk-builder-tool.c @@ -166,19 +166,31 @@ maybe_emit_property (MyParserData *data) gchar *escaped; gint i; gboolean bound; + gboolean translatable; + bound = FALSE; + translatable = FALSE; for (i = 0; data->attribute_names[i]; i++) { - if (strcmp (data->attribute_names[i], "name") == 0) + if (strcmp (data->attribute_names[i], "translatable") == 0) + translatable = TRUE; + } + + if (!translatable) + { + for (i = 0; data->attribute_names[i]; i++) { - if (data->classes == NULL) - break; + if (strcmp (data->attribute_names[i], "name") == 0) + { + if (data->classes == NULL) + break; - if (needs_explicit_setting (data, i)) - break; + if (needs_explicit_setting (data, i)) + break; - if (value_is_default (data, i)) - return; + if (value_is_default (data, i)) + return; + } } } @@ -196,14 +208,12 @@ maybe_emit_property (MyParserData *data) { if (!data->cell_packing_started) { - g_print ("%*s\n", data->indent, ""); + g_print ("%*s\n", data->indent, ""); data->indent += 2; data->cell_packing_started = TRUE; } } - bound = FALSE; - g_print ("%*sindent, ""); for (i = 0; data->attribute_names[i]; i++) {