From 10b7903249497584dd01fa9447d09eba95fa3148 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Mon, 22 Aug 2005 15:44:26 +0000 Subject: [PATCH] 2005-08-22 [paul] 1.9.13cvs49 * src/procmsg.c fix colour labelling Patch by Colin --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/procmsg.c | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 933615cea..95fce7b6b 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-08-22 [paul] 1.9.13cvs49 + + * src/procmsg.c + fix colour labelling + Patch by Colin + 2005-08-22 [paul] 1.9.13cvs48 * src/textview.c diff --git a/PATCHSETS b/PATCHSETS index 7582201de..8fc4ec866 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -734,3 +734,4 @@ ( cvs diff -u -r 1.83.2.36 -r 1.83.2.37 src/mimeview.c; cvs diff -u -r 1.204.2.54 -r 1.204.2.55 src/prefs_common.c; cvs diff -u -r 1.96.2.70 -r 1.96.2.71 src/textview.c; cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/common/defs.h; ) > 1.9.13cvs46.patchset ( cvs diff -u -r 1.179.2.58 -r 1.179.2.59 src/imap.c; ) > 1.9.13cvs47.patchset ( cvs diff -u -r 1.96.2.71 -r 1.96.2.72 src/textview.c; ) > 1.9.13cvs48.patchset +( cvs diff -u -r 1.150.2.39 -r 1.150.2.40 src/procmsg.c; ) > 1.9.13cvs49.patchset diff --git a/configure.ac b/configure.ac index f861b11c8..299fd7dfd 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=13 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=48 +EXTRA_VERSION=49 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/procmsg.c b/src/procmsg.c index db63e6ad5..788bda559 100644 --- a/src/procmsg.c +++ b/src/procmsg.c @@ -1697,7 +1697,7 @@ void procmsg_msginfo_change_flags(MsgInfo *msginfo, /* Perm Flags handling */ perm_flags_old = msginfo->flags.perm_flags; - perm_flags_new = (msginfo->flags.perm_flags | add_perm_flags) & ~rem_perm_flags; + perm_flags_new = (msginfo->flags.perm_flags & ~rem_perm_flags) | add_perm_flags; if ((add_perm_flags & MSG_IGNORE_THREAD) || (perm_flags_old & MSG_IGNORE_THREAD)) { perm_flags_new &= ~(MSG_NEW | MSG_UNREAD); } @@ -1711,8 +1711,8 @@ void procmsg_msginfo_change_flags(MsgInfo *msginfo, /* Tmp flags handling */ tmp_flags_old = msginfo->flags.tmp_flags; - msginfo->flags.tmp_flags |= add_tmp_flags; msginfo->flags.tmp_flags &= ~rem_tmp_flags; + msginfo->flags.tmp_flags |= add_tmp_flags; /* update notification */ if ((perm_flags_old != perm_flags_new) || (tmp_flags_old != msginfo->flags.tmp_flags)) { -- 2.25.1