2006-09-25 [colin] 2.5.0cvs3

	* src/plugins/bogofilter/bogofilter.c
	* src/plugins/clamav/clamav_plugin.c
	* src/plugins/spamassassin/spamassassin.c
		BogoFilter, Spamassassin: Fix double hook registering after
		visiting preferences
		Spamassassin, Clamav: Just set the mails to move instead of
		doing the move - caller will move the things at once.

diff --git a/ChangeLog b/ChangeLog
index 4a3cc908e058ec8cc9a4ae6ff871ad641237fdd3..d078f2e72f6b8039b5363d11737007a8e45f5a40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-25 [colin]     2.5.0cvs3
+
+       * src/plugins/bogofilter/bogofilter.c
+       * src/plugins/clamav/clamav_plugin.c
+       * src/plugins/spamassassin/spamassassin.c
+               BogoFilter, Spamassassin: Fix double hook registering after
+               visiting preferences
+               Spamassassin, Clamav: Just set the mails to move instead of
+               doing the move - caller will move the things at once.
+

 2006-09-25 [colin]     2.5.0cvs2
 
        * src/imap.c
 2006-09-25 [colin]     2.5.0cvs2
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 99c1df9048088867f0c51afba6f580dba887b11b..3b8b48d6ccb817a242d9927a727a9d4fca499fee 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1908,3 +1908,4 @@
 ( cvs diff -u -r 1.9.2.7 -r 1.9.2.8 po/cs.po;  cvs diff -u -r 1.58.2.24 -r 1.58.2.25 po/de.po;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 po/fi.po;  cvs diff -u -r 1.42.2.26 -r 1.42.2.27 po/fr.po;  cvs diff -u -r 1.28.2.7 -r 1.28.2.8 po/nl.po;  cvs diff -u -r 1.50.2.20 -r 1.50.2.21 po/pt_BR.po;  cvs diff -u -r 1.2.2.20 -r 1.2.2.21 po/sk.po;  cvs diff -u -r 1.17.2.23 -r 1.17.2.24 po/sr.po;  cvs diff -u -r 1.5.2.18 -r 1.5.2.19 po/zh_CN.po;  ) > 2.4.0cvs214.patchset
 ( cvs diff -u -r 1.3.12.16 -r 1.3.12.17 src/message_search.c;  ) > 2.5.0cvs1.patchset
 ( cvs diff -u -r 1.179.2.131 -r 1.179.2.132 src/imap.c;  cvs diff -u -r 1.1.4.51 -r 1.1.4.52 src/etpan/imap-thread.c;  ) > 2.5.0cvs2.patchset
 ( cvs diff -u -r 1.9.2.7 -r 1.9.2.8 po/cs.po;  cvs diff -u -r 1.58.2.24 -r 1.58.2.25 po/de.po;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 po/fi.po;  cvs diff -u -r 1.42.2.26 -r 1.42.2.27 po/fr.po;  cvs diff -u -r 1.28.2.7 -r 1.28.2.8 po/nl.po;  cvs diff -u -r 1.50.2.20 -r 1.50.2.21 po/pt_BR.po;  cvs diff -u -r 1.2.2.20 -r 1.2.2.21 po/sk.po;  cvs diff -u -r 1.17.2.23 -r 1.17.2.24 po/sr.po;  cvs diff -u -r 1.5.2.18 -r 1.5.2.19 po/zh_CN.po;  ) > 2.4.0cvs214.patchset
 ( cvs diff -u -r 1.3.12.16 -r 1.3.12.17 src/message_search.c;  ) > 2.5.0cvs1.patchset
 ( cvs diff -u -r 1.179.2.131 -r 1.179.2.132 src/imap.c;  cvs diff -u -r 1.1.4.51 -r 1.1.4.52 src/etpan/imap-thread.c;  ) > 2.5.0cvs2.patchset

+( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.18.2.41 -r 1.18.2.42 src/plugins/spamassassin/spamassassin.c;  ) > 2.5.0cvs3.patchset

diff --git a/configure.ac b/configure.ac
index 804ca6cf916d4f17d6f59972af4d4e8526112883..06065ef16ca30d39aa329470d586750502c2b6e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=2
+EXTRA_VERSION=3

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index f1e99c129c6dfd3b35172939d56ba78acf4a4d1e..e87523da86ef82e0ec246dd3709bccd15d7c9283 100644 (file)
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -574,7 +574,8 @@ struct PluginFeature *plugin_provides(void)
 
 void bogofilter_register_hook(void)
 {
 
 void bogofilter_register_hook(void)
 {

-       hook_id = hooks_register_hook(MAIL_LISTFILTERING_HOOKLIST, mail_filtering_hook, NULL);
+       if (hook_id == -1)
+               hook_id = hooks_register_hook(MAIL_LISTFILTERING_HOOKLIST, mail_filtering_hook, NULL);

        if (hook_id == -1) {
                g_warning("Failed to register mail filtering hook");
                config.process_emails = FALSE;
        if (hook_id == -1) {
                g_warning("Failed to register mail filtering hook");
                config.process_emails = FALSE;


@@ -586,4 +587,5 @@ void bogofilter_unregister_hook(void)
        if (hook_id != -1) {
                hooks_unregister_hook(MAIL_LISTFILTERING_HOOKLIST, hook_id);
        }
        if (hook_id != -1) {
                hooks_unregister_hook(MAIL_LISTFILTERING_HOOKLIST, hook_id);
        }

+       hook_id = -1;

 }
 }

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index d45c7fc8cebf17cf9ef775a61cded85a2243ec1a..cc4233283a227294b71595a59be2eef74c902c5a 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -141,7 +141,8 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                                    clamav_save_folder = folder_get_default_trash();
 
                        procmsg_msginfo_unset_flags(msginfo, ~0, 0);
                                    clamav_save_folder = folder_get_default_trash();
 
                        procmsg_msginfo_unset_flags(msginfo, ~0, 0);

-                       folder_item_move_msg(clamav_save_folder, msginfo);
+                       msginfo->is_move = TRUE;
+                       msginfo->to_filter_folder = clamav_save_folder;

                } else {
                        folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
                }
                } else {
                        folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
                }

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 94da2be509115fbc6337f6b5eb77ce72fb052de6..d698045601c30d62267b82b03582a51290608d7a 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -259,7 +259,8 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 
                        procmsg_msginfo_unset_flags(msginfo, ~0, 0);
                        procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
 
                        procmsg_msginfo_unset_flags(msginfo, ~0, 0);
                        procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);

-                       folder_item_move_msg(save_folder, msginfo);
+                       msginfo->is_move = TRUE;
+                       msginfo->to_filter_folder = save_folder;

                } else {
                        folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
                }
                } else {
                        folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
                }


@@ -563,7 +564,8 @@ struct PluginFeature *plugin_provides(void)
 
 void spamassassin_register_hook(void)
 {
 
 void spamassassin_register_hook(void)
 {

-       hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
+       if (hook_id == -1)
+               hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);

        if (hook_id == -1) {
                g_warning("Failed to register mail filtering hook");
                config.process_emails = FALSE;
        if (hook_id == -1) {
                g_warning("Failed to register mail filtering hook");
                config.process_emails = FALSE;


@@ -575,4 +577,5 @@ void spamassassin_unregister_hook(void)
        if (hook_id != -1) {
                hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
        }
        if (hook_id != -1) {
                hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
        }

+       hook_id = -1;

 }
 }