From: Bruno Haible <bruno@clisp.org>
Date: Sun, 25 Jan 2009 12:55:37 +0000 (+0000)
Subject: Fix bug introduced on 2005-10-01.
X-Git-Tag: v0.18~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d3d7bcf8312557c24f23d81b0ca5297d8d8d1c3;p=thirdparty%2Fgettext.git

Fix bug introduced on 2005-10-01.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 7fdf80820..63ee1750c 100644
--- 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 be255a48a..dbf0a3467 100644
--- 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;