tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles empty.glade"
-cat <<EOF > empty.glade
+tmpfiles="$tmpfiles xg-gl-4-empty.glade"
+cat <<EOF > xg-gl-4-empty.glade
<?xml version="1.0"?>
<GTK-Interface/>
EOF
tmpfiles="$tmpfiles xg-gl-4.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-4.pot empty.glade 2>/dev/null
+${XGETTEXT} -o xg-gl-4.pot xg-gl-4-empty.glade 2>/dev/null
test $? = 0 || {
echo "Skipping test: xgettext was built without Glade support"
rm -fr $tmpfiles; exit 77
${DIFF} xg-gl-4.ok xg-gl-4.pot
result=$?
+test $result = 0 || {
+ rm -fr $tempfiles; exit $result
+}
+
+tmpfiles="$tmpfiles xg-gl-4a.glade"
+cat <<EOF > xg-gl-4a.glade
+<?xml version="1.0"?>
+<glade-interface>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <widget class="GtkWindow" id="mainWindow">
+ <accessibility>
+ <atkproperty name="AtkObject::accessible-name" translatable="yes" comments="Also has comments">This window</atkproperty>
+ </accessibility>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+</glade-interface>
+EOF
+
+tmpfiles="$tmpfiles xg-gl-4a.tmp xg-gl-4a.pot"
+: ${XGETTEXT=xgettext}
+${XGETTEXT} -o xg-gl-4a.tmp xg-gl-4a.glade
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+# Look upwards
+cat xg-gl-4a.tmp | grep -v 'POT-Creation-Date' > xg-gl-4a.pot
+
+tmpfiles="$tmpfiles xg-gl-4a.ok"
+cat <<\EOF > xg-gl-4a.ok
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Also has comments
+#: xg-gl-4a.glade:7
+msgid "This window"
+msgstr ""
+EOF
+
+: ${DIFF=diff}
+${DIFF} xg-gl-4a.ok xg-gl-4a.pot
+result=$?
+
rm -fr $tmpfiles
exit $result