*
* 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
#include <sys/wait.h>
#include <glib.h>
+#include <glib/gi18n.h>
#if HAVE_LOCALE_H
# include <locale.h>
#include "folder.h"
#include "prefs.h"
#include "prefs_gtk.h"
-#include "intl.h"
#include "libspamc.h"
#include "spamassassin.h"
running |= CHILD_RUNNING;
- g_timeout_add(1000, timeout_func, &running);
+ g_timeout_add(50, timeout_func, &running);
running |= TIMEOUT_RUNNING;
while(running & CHILD_RUNNING) {
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;
}
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");
"\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";
}