From 638aa05251938fa987674fb5d0ae28468e039767 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Fri, 25 Aug 2006 14:58:37 +0000 Subject: [PATCH] 2006-08-25 [wwp] 2.4.0cvs91 * src/summaryview.c switch spam<->ham button when a message has been marked as spam or ham and is still selected. Thanks to Colin. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/summaryview.c | 10 ++++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08525fe05..1b047502f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-25 [wwp] 2.4.0cvs91 + + * src/summaryview.c + switch spam<->ham button when a message has been marked as spam or ham + and is still selected. Thanks to Colin. + 2006-08-25 [paul] 2.4.0cvs90 * src/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 8256ad3ef..aeb43aa37 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1782,3 +1782,4 @@ ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/ack.xml; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/glossary.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/advanced.xml; ) > 2.4.0cvs88.patchset ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/glossary.xml; cvs diff -u -r 1.60.2.32 -r 1.60.2.33 po/es.po; ) > 2.4.0cvs89.patchset ( cvs diff -u -r 1.155.2.40 -r 1.155.2.41 src/Makefile.am; cvs diff -u -r 1.25.2.26 -r 1.25.2.27 src/stock_pixmap.c; cvs diff -u -r 1.18.2.17 -r 1.18.2.18 src/stock_pixmap.h; cvs diff -u -r 1.395.2.232 -r 1.395.2.233 src/summaryview.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/icon_legend.c; diff -u /dev/null src/pixmaps/copied.xpm; diff -u /dev/null src/pixmaps/moved.xpm; ) > 2.4.0cvs90.patchset +( cvs diff -u -r 1.395.2.233 -r 1.395.2.234 src/summaryview.c; ) > 2.4.0cvs91.patchset diff --git a/configure.ac b/configure.ac index f2881a1fe..546cf4db0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=90 +EXTRA_VERSION=91 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/summaryview.c b/src/summaryview.c index 595def29d..5d5e2e3f2 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -3360,8 +3360,6 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid log_error(_("An error happened while learning.\n")); } - g_slist_free(msgs); - prefs_common.immediate_exec = immediate_exec; END_LONG_OPERATION(summaryview); @@ -3370,6 +3368,14 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid summary_execute(summaryview); } + if (!moved && msgs) { + MsgInfo *msginfo = (MsgInfo *)msgs->data; + toolbar_set_learn_button + (summaryview->mainwin->toolbar, + MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM); + } + g_slist_free(msgs); + summary_status_show(summaryview); } -- 2.25.1