2011-10-23 [holger] 3.7.10cvs43

	* src/filtering.c
		Don't issue a warning for designed behaviour of the stop rule.
		Fixes bug #2520, 'Please remove verbose "No further processing after rule %s" message.'

diff --git a/ChangeLog b/ChangeLog
index dac156ed3a9e90840911bb74b6e857d1cda8c8c8..62d2630429abe7941c57e68dac4558a7872b08a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-23 [holger]    3.7.10cvs43
+
+       * src/filtering.c
+               Don't issue a warning for designed behaviour of the stop rule.
+               Fixes bug #2520, 'Please remove verbose "No further processing after rule %s" message.'
+

 2011-10-22 [colin]     3.7.10cvs42
 
        * src/printing.c
 2011-10-22 [colin]     3.7.10cvs42
 
        * src/printing.c

diff --git a/PATCHSETS b/PATCHSETS
index 75fc2319474e64cbee875e83667322a0e033d606..28b552273d7f935e9b15841bb5e32adaaedbe8bd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4246,3 +4246,4 @@
 ( cvs diff -u -r 1.4.2.61 -r 1.4.2.62 src/gtk/gtkutils.h;  cvs diff -u -r 1.654.2.4320 -r 1.654.2.4321 configure.ac;  ) > 3.7.10cvs40.patchset
 ( cvs diff -u -r 1.61.2.100 -r 1.61.2.101 src/account.c;  cvs diff -u -r 1.27.2.57 -r 1.27.2.58 src/addr_compl.c;  cvs diff -u -r 1.5.10.35 -r 1.5.10.36 src/addrgather.c;  cvs diff -u -r 1.382.2.586 -r 1.382.2.587 src/compose.c;  cvs diff -u -r 1.8.2.42 -r 1.8.2.43 src/editldap.c;  cvs diff -u -r 1.1.4.34 -r 1.1.4.35 src/expldifdlg.c;  cvs diff -u -r 1.207.2.222 -r 1.207.2.223 src/folderview.c;  cvs diff -u -r 1.14.2.30 -r 1.14.2.31 src/grouplistdialog.c;  cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/headerview.c;  cvs diff -u -r 1.14.2.27 -r 1.14.2.28 src/importldif.c;  cvs diff -u -r 1.115.2.242 -r 1.115.2.243 src/main.c;  cvs diff -u -r 1.274.2.331 -r 1.274.2.332 src/mainwindow.c;  cvs diff -u -r 1.83.2.173 -r 1.83.2.174 src/mimeview.c;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/noticeview.c;  cvs diff -u -r 1.105.2.169 -r 1.105.2.170 src/prefs_account.c;  cvs diff -u -r 1.60.2.74 -r 1.60.2.75 src/prefs_actions.c;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_ext_prog.c;  cvs diff -u -r 1.59.2.83 -r 1.59.2.84 src/prefs_filtering.c;  cvs diff -u -r 1.52.2.84 -r 1.52.2.85 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_image_viewer.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_logging.c;  cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/prefs_msg_colors.c;  cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_other.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_send.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/prefs_spelling.c;  cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/prefs_summaries.c;  cvs diff -u -r 1.12.2.76 -r 1.12.2.77 src/prefs_template.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/printing.c;  cvs diff -u -r 1.8.2.44 -r 1.8.2.45 src/quote_fmt.c;  cvs diff -u -r 1.17.2.60 -r 1.17.2.61 src/send_message.c;  cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/statusbar.c;  cvs diff -u -r 1.15.2.67 -r 1.15.2.68 src/summary_search.c;  cvs diff -u -r 1.395.2.432 -r 1.395.2.433 src/summaryview.c;  cvs diff -u -r 1.1.2.85 -r 1.1.2.86 src/wizard.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.1.4.61 -r 1.1.4.62 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.99 -r 1.5.2.100 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.62 -r 1.4.2.63 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.2.2.44 -r 1.2.2.45 src/gtk/inputdialog.c;  cvs diff -u -r 1.5.2.60 -r 1.5.2.61 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.105 -r 1.1.2.106 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/spell_entry.c;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.23.2.56 -r 1.23.2.57 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.14.2.78 -r 1.14.2.79 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/trayicon/trayicon_prefs.c;  ) > 3.7.10cvs41.patchset
 ( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/printing.c;  cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/gtk/gtkshruler.c;  cvs diff -u -r 1.4.2.63 -r 1.4.2.64 src/gtk/gtkutils.h;  ) > 3.7.10cvs42.patchset
 ( cvs diff -u -r 1.4.2.61 -r 1.4.2.62 src/gtk/gtkutils.h;  cvs diff -u -r 1.654.2.4320 -r 1.654.2.4321 configure.ac;  ) > 3.7.10cvs40.patchset
 ( cvs diff -u -r 1.61.2.100 -r 1.61.2.101 src/account.c;  cvs diff -u -r 1.27.2.57 -r 1.27.2.58 src/addr_compl.c;  cvs diff -u -r 1.5.10.35 -r 1.5.10.36 src/addrgather.c;  cvs diff -u -r 1.382.2.586 -r 1.382.2.587 src/compose.c;  cvs diff -u -r 1.8.2.42 -r 1.8.2.43 src/editldap.c;  cvs diff -u -r 1.1.4.34 -r 1.1.4.35 src/expldifdlg.c;  cvs diff -u -r 1.207.2.222 -r 1.207.2.223 src/folderview.c;  cvs diff -u -r 1.14.2.30 -r 1.14.2.31 src/grouplistdialog.c;  cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/headerview.c;  cvs diff -u -r 1.14.2.27 -r 1.14.2.28 src/importldif.c;  cvs diff -u -r 1.115.2.242 -r 1.115.2.243 src/main.c;  cvs diff -u -r 1.274.2.331 -r 1.274.2.332 src/mainwindow.c;  cvs diff -u -r 1.83.2.173 -r 1.83.2.174 src/mimeview.c;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/noticeview.c;  cvs diff -u -r 1.105.2.169 -r 1.105.2.170 src/prefs_account.c;  cvs diff -u -r 1.60.2.74 -r 1.60.2.75 src/prefs_actions.c;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_ext_prog.c;  cvs diff -u -r 1.59.2.83 -r 1.59.2.84 src/prefs_filtering.c;  cvs diff -u -r 1.52.2.84 -r 1.52.2.85 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_image_viewer.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_logging.c;  cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/prefs_msg_colors.c;  cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_other.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_send.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/prefs_spelling.c;  cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/prefs_summaries.c;  cvs diff -u -r 1.12.2.76 -r 1.12.2.77 src/prefs_template.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/printing.c;  cvs diff -u -r 1.8.2.44 -r 1.8.2.45 src/quote_fmt.c;  cvs diff -u -r 1.17.2.60 -r 1.17.2.61 src/send_message.c;  cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/statusbar.c;  cvs diff -u -r 1.15.2.67 -r 1.15.2.68 src/summary_search.c;  cvs diff -u -r 1.395.2.432 -r 1.395.2.433 src/summaryview.c;  cvs diff -u -r 1.1.2.85 -r 1.1.2.86 src/wizard.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.1.4.61 -r 1.1.4.62 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.99 -r 1.5.2.100 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.62 -r 1.4.2.63 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.2.2.44 -r 1.2.2.45 src/gtk/inputdialog.c;  cvs diff -u -r 1.5.2.60 -r 1.5.2.61 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.105 -r 1.1.2.106 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/spell_entry.c;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.23.2.56 -r 1.23.2.57 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.14.2.78 -r 1.14.2.79 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/trayicon/trayicon_prefs.c;  ) > 3.7.10cvs41.patchset
 ( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/printing.c;  cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/gtk/gtkshruler.c;  cvs diff -u -r 1.4.2.63 -r 1.4.2.64 src/gtk/gtkutils.h;  ) > 3.7.10cvs42.patchset

+( cvs diff -u -r 1.60.2.57 -r 1.60.2.58 src/filtering.c;  ) > 3.7.10cvs43.patchset

diff --git a/configure.ac b/configure.ac
index 50f4d452ad87bcf65f3da741f75204f9ecdb92c3..79f923715be7d406520ddc73dabe8730471e8334 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=42
+EXTRA_VERSION=43

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/filtering.c b/src/filtering.c
index c3ca458bdfa7f9edb8a3c50af8286b55ac50a91d..22fc9b62fea4f25da6d459ecc16bc0766c8ebf14 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -738,8 +738,8 @@ static gboolean filtering_apply_rule(FilteringProp *filtering, MsgInfo *info,
                                                        log_warning(LOG_DEBUG_FILTERING, _("action could not apply\n"));
                                                log_print(LOG_DEBUG_FILTERING,
                                                                _("no further processing after action [ %s ]\n"), buf);
                                                        log_warning(LOG_DEBUG_FILTERING, _("action could not apply\n"));
                                                log_print(LOG_DEBUG_FILTERING,
                                                                _("no further processing after action [ %s ]\n"), buf);

-                                       } else
-                                               g_warning("No further processing after rule %s\n", buf);
+                                       }
+                                       debug_print("No further processing after rule %s\n", buf);

                 }
                 g_free(buf);
                 if (filtering_is_final_action(action)) {
                 }
                 g_free(buf);
                 if (filtering_is_final_action(action)) {