Fix bug introduced on 2005-10-01.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 7fdf80820e3b0723fd5f78632376bd2a23533e12..63ee1750cc8b18f6173bf62025c0d626b463a084 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-25  Bruno Haible  <bruno@clisp.org>
+
+       Fix bug introduced on 2005-10-01.
+       * msgl-charset.c (compare_po_locale_charsets): Fix recognition of
+       header entry.
+
 2009-01-25  Bruno Haible  <bruno@clisp.org>
 
        Fix bug introduced on 2008-10-04.

diff --git a/gettext-tools/src/msgl-charset.c b/gettext-tools/src/msgl-charset.c
index be255a48a57fc1692daebab89fbc3aa5c826c1b0..dbf0a346736b65e85d5992cf4d1597bc3741d826 100644 (file)
--- a/gettext-tools/src/msgl-charset.c
+++ b/gettext-tools/src/msgl-charset.c
@@ -1,5 +1,5 @@
 /* Message list charset and locale charset handling.
-   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -60,8 +60,7 @@ compare_po_locale_charsets (const msgdomain_list_ty *mdlp)
       const message_list_ty *mlp = mdlp->item[k]->messages;
 
       for (j = 0; j < mlp->nitems; j++)
-       if (mlp->item[j]->msgstr == NULL
-           && mlp->item[j]->msgid[0] == '\0' && !mlp->item[j]->obsolete)
+       if (is_header (mlp->item[j]) && !mlp->item[j]->obsolete)
          {
            const char *header = mlp->item[j]->msgstr;