Implement --extract-all for Glade.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 8812f65cbf0a58b9a7e65ae17ec47cdf68674efa..eb692dba6b7913052d302e3c573ecfbe65e506ce 100644 (file)
--- 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 f1925587d1e67d47ba46a8a2ede16e75379016a9..72e4e5d72044e19e3d409bafa871fda166587466 100644 (file)
--- 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