2005-12-06 [paul] 1.9.100cvs69

[claws.git] / src / plugins / spamassassin / spamassassin.c

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index e9223402554b0d67df813bbcee8319d146990d2c..1a52c10f79efa30dae7426d621acee885e03afee 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,6 +27,7 @@
 #include <sys/wait.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #if HAVE_LOCALE_H
 #  include <locale.h>
@@ -41,7 +42,6 @@
 #include "folder.h"
 #include "prefs.h"
 #include "prefs_gtk.h"
-#include "intl.h"
 
 #include "libspamc.h"
 #include "spamassassin.h"
@@ -76,6 +76,7 @@ enum {
 static guint hook_id;
 static int flags = SPAMC_RAW_MODE | SPAMC_SAFE_FALLBACK | SPAMC_CHECK_ONLY;
 static gchar *username = NULL;
+static MessageCallback message_callback;
 
 static SpamAssassinConfig config;
 
@@ -178,7 +179,8 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                return FALSE;
 
        debug_print("Filtering message %d\n", msginfo->msgnum);
-       statusbar_print_all(_("SpamAssassin: filtering message..."));
+       if (message_callback != NULL)
+               message_callback(_("SpamAssassin: filtering message..."));
 
        if ((fp = procmsg_open_message(msginfo)) == NULL) {
                debug_print("failed to open message file\n");
@@ -193,7 +195,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 
                running |= CHILD_RUNNING;
 
-               g_timeout_add(1000, timeout_func, &running);
+               g_timeout_add(50, timeout_func, &running);
                running |= TIMEOUT_RUNNING;
 
                while(running & CHILD_RUNNING) {
@@ -269,15 +271,22 @@ void spamassassin_save_config(void)
        prefs_file_close(pfile);
 }
 
+void spamassassin_set_message_callback(MessageCallback callback)
+{
+       message_callback = callback;
+}
+
 gint plugin_init(gchar **error)
 {
+       gchar *rcpath;
+
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
+               *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the SpamAssassin plugin was built with");
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
-               *error = g_strdup("Your sylpheed version is too old");
+               *error = g_strdup("Your version of Sylpheed-Claws is too old for the SpamAssassin plugin");
                return -1;
        }
 
@@ -287,14 +296,18 @@ gint plugin_init(gchar **error)
                return -1;
        }
 
-       username = g_get_user_name();
+       username = (gchar*)g_get_user_name();
        if (username == NULL) {
+               hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
                *error = g_strdup("Failed to get username");
                return -1;
        }
 
        prefs_set_default(param);
-       prefs_read_config(param, "SpamAssassin", COMMON_RC);
+       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
+       prefs_read_config(param, "SpamAssassin", rcpath, NULL);
+       g_free(rcpath);
+       spamassassin_gtk_init();
 
        debug_print("Spamassassin plugin loaded\n");
 
@@ -307,6 +320,7 @@ void plugin_done(void)
        hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
        g_free(config.hostname);
        g_free(config.save_folder);
+       spamassassin_gtk_done();
 
        debug_print("Spamassassin plugin unloaded\n");
 }
@@ -325,14 +339,10 @@ const gchar *plugin_desc(void)
                 "\n"
                 "When a message is identified as spam it can be deleted or "
                 "saved into a special folder.\n"
-                "\n"
-                "This plugin only contains the actual function for filtering "
-                "and deleting or moving the message. You probably want to load "
-                "a User Interface plugin too, otherwise you will have to "
-                "manually write the plugin configuration.\n");
+                "\n");
 }
 
 const gchar *plugin_type(void)
 {
-       return "Common";
+       return "GTK2";
 }