From: Bruno Haible <bruno@clisp.org>
Date: Tue, 7 Oct 2003 10:04:07 +0000 (+0000)
Subject: Implement --extract-all for Glade.
X-Git-Tag: v0.13~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fb806a059189a473f440a4aae562f3ea7261783;p=thirdparty%2Fgettext.git

Implement --extract-all for Glade.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 8812f65cb..eb692dba6 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-22  Bruno Haible  <bruno@clisp.org>
+
+	* x-glade.c (start_element_handler): Implement extract_all behaviour.
+
 2003-10-04  Bruno Haible  <bruno@clisp.org>
 
 	* x-glade.c (do_extract_glade): Initialize stack_depth.
diff --git a/gettext-tools/src/x-glade.c b/gettext-tools/src/x-glade.c
index f1925587d..72e4e5d72 100644
--- a/gettext-tools/src/x-glade.c
+++ b/gettext-tools/src/x-glade.c
@@ -230,9 +230,11 @@ start_element_handler (void *userData, const char *name,
   stack[stack_depth - 1].extract_string = false;
 
   p = &stack[stack_depth];
+  p->extract_string = extract_all;
   /* In Glade 1, a few specific elements are translatable.  */
-  p->extract_string =
-    (find_entry (&keywords, name, strlen (name), &hash_result) == 0);
+  if (!p->extract_string)
+    p->extract_string =
+      (find_entry (&keywords, name, strlen (name), &hash_result) == 0);
   /* In Glade 2, all <property> and <atkproperty> elements are translatable
      that have the attribute translatable="yes".  */
   if (!p->extract_string