2006-08-05 [colin] 2.4.0cvs29

	* src/news.c
		Just make sure we have a msgid.

diff --git a/ChangeLog b/ChangeLog
index 51b953601f6d91d7f3cc7c840bd10bf2ae95b183..dc53a5e54573a4caec528e4dd2fbcbf354dabb66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-05 [colin]     2.4.0cvs29
+
+       * src/news.c
+               Just make sure we have a msgid.
+
 2006-08-05 [colin]     2.4.0cvs28
 
        * src/news.c

diff --git a/PATCHSETS b/PATCHSETS
index 539983b60932def748cdaa66b283509c3fbd652f..3604536689e0c8b1938a3c5e554facf0436b5e20 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1720,3 +1720,4 @@
 ( cvs diff -u -r 1.43.2.47 -r 1.43.2.48 src/toolbar.c;  ) > 2.4.0cvs26.patchset
 ( cvs diff -u -r 1.382.2.296 -r 1.382.2.297 src/compose.c;  cvs diff -u -r 1.274.2.134 -r 1.274.2.135 src/mainwindow.c;  cvs diff -u -r 1.94.2.94 -r 1.94.2.95 src/messageview.c;  cvs diff -u -r 1.96.2.134 -r 1.96.2.135 src/textview.c;  cvs diff -u -r 1.13.2.9 -r 1.13.2.10 src/undo.c;  cvs diff -u -r 1.5.14.5 -r 1.5.14.6 src/undo.h;  cvs diff -u -r 1.36.2.72 -r 1.36.2.73 src/common/utils.c;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.18.2.34 -r 1.18.2.35 src/plugins/spamassassin/spamassassin.c;  ) > 2.4.0cvs27.patchset
 ( cvs diff -u -r 1.101.2.28 -r 1.101.2.29 src/news.c;  cvs diff -u -r 1.395.2.227 -r 1.395.2.228 src/summaryview.c;  cvs diff -u -r 1.96.2.135 -r 1.96.2.136 src/textview.c;  ) > 2.4.0cvs28.patchset
+( cvs diff -u -r 1.101.2.29 -r 1.101.2.30 src/news.c;  ) > 2.4.0cvs29.patchset

diff --git a/configure.ac b/configure.ac
index 18f28285ecdaeebb451805e13d7c4308b13e856c..6052bedf03b9b91a28e5ff118de6c175ca576feb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/news.c b/src/news.c
index 7b7a7e04f8da73dd0dd485df7727b8eab83cbc26..7ddfe103ff8d01918da5695aca477adcbd43498b 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -922,8 +922,8 @@ gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list, g
 static void news_set_msg_flags(FolderItem *item, MsgInfo *msginfo)
 {
        msginfo->flags.tmp_flags = 0;
-       if (item->folder->account->mark_crosspost_read) {
-               if (item->folder->newsart && msginfo->msgid &&
+       if (item->folder->account->mark_crosspost_read && msginfo->msgid) {
+               if (item->folder->newsart &&
                    g_hash_table_lookup(item->folder->newsart, msginfo->msgid) != NULL) {
                        msginfo->flags.perm_flags = MSG_COLORLABEL_TO_FLAGS(item->folder->account->crosspost_col);