2005-11-14 [paul] 1.9.100cvs13

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

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index a9860d0e4dc0adfaf77a7f6d49b27e43ac5981f4..37ef74af3bdeb9ea98637003866904a5a9d52dc2 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"
@@ -195,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) {
@@ -278,13 +278,15 @@ void spamassassin_set_message_callback(MessageCallback 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;
        }
 
@@ -294,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");
 
@@ -332,14 +338,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";
 }