aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/sa-junk-plugin/ChangeLog5
-rw-r--r--plugins/sa-junk-plugin/em-junk-filter.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
index d2a4a245c9..e8231a237a 100644
--- a/plugins/sa-junk-plugin/ChangeLog
+++ b/plugins/sa-junk-plugin/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-22 Kjartan Maraas <kmaraas@gnome.org>
+
+ * em-junk-filter.c: (em_junk_sa_init): #if 0 out unused function and
+ plug a leak.
+
2006-01-09 Kjartan Maraas <kmaraas@gnome.org>
* em-junk-filter.c: (em_junk_sa_run_spamd): Remove unused var.
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index d97fc1fe90..ea5159f59f 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -95,11 +95,13 @@ static int em_junk_sa_spamd_restarts_count = 0;
char *em_junk_sa_spamc_gconf_binary = NULL;
char *em_junk_sa_spamd_gconf_binary = NULL;
+#if 0
static const char *
em_junk_sa_get_name (void)
{
return _("Spamassassin (built-in)");
}
+#endif
static int
pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer)
@@ -755,7 +757,7 @@ em_junk_sa_init (void)
pthread_mutex_lock (&em_junk_sa_preferred_socket_path_lock);
g_free (em_junk_sa_preferred_socket_path);
- em_junk_sa_preferred_socket_path = g_strdup (gconf_client_get_string (em_junk_sa_gconf, "/apps/evolution/mail/junk/sa/socket_path", NULL));
+ em_junk_sa_preferred_socket_path = gconf_client_get_string (em_junk_sa_gconf, "/apps/evolution/mail/junk/sa/socket_path", NULL);
pthread_mutex_unlock (&em_junk_sa_preferred_socket_path_lock);
gconf_client_notify_add(em_junk_sa_gconf, "/apps/evolution/mail/junk/sa",