From c238fbfd1525aa282673abdc435a7f9e4a7f7f3e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 12 Jul 2011 07:06:12 -0400 Subject: Convert junk filtering EPlugins to EExtensions. We now have a proper junk mail filtering API. All junk filtering extensions must subclass EMailJunkFilter for user preferences and availability testing, and implement the CamelJunkFilter interface for the actual junk filtering and learning operations. The bogofilter module should be feature-equivalent to its former EPlugin. The spamassassin module is far more complex. It's nearly feature-equivalent to its former EPlugin, but I ditched the spamd respawning code since it seemed unnecessary for a mail client to have to deal with. If there's a huge outcry from users about it I'll reluctantly put it back, but I don't expect one. This gets us a step closer to killing off EConfig, and eventually the EPlugin framework itself. --- modules/mail/em-mailer-prefs.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'modules/mail/em-mailer-prefs.h') diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h index d28fd5f5e4..35ebec3bf7 100644 --- a/modules/mail/em-mailer-prefs.h +++ b/modules/mail/em-mailer-prefs.h @@ -26,7 +26,6 @@ #include #include #include -#include #include /* Standard GObject macros */ @@ -56,8 +55,6 @@ typedef struct _EMMailerPrefsClass EMMailerPrefsClass; struct _EMMailerPrefs { GtkVBox parent_object; - EMailSession *session; - GtkBuilder *builder; GConfClient *gconf; @@ -95,9 +92,6 @@ struct _EMMailerPrefs { GtkToggleButton *sa_local_tests_only; GtkToggleButton *sa_use_daemon; - GtkComboBox *default_junk_plugin; - GtkLabel *plugin_status; - GtkImage *plugin_image; GtkToggleButton *junk_header_check; GtkTreeView *junk_header_tree; -- cgit v1.2.3 From fa4a42d741fade66d51857fb2653e27e347aef80 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 1 Nov 2011 17:26:07 +0100 Subject: Migrate SA extension to GSettings --- modules/mail/em-mailer-prefs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'modules/mail/em-mailer-prefs.h') diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h index 35ebec3bf7..eee2d248ac 100644 --- a/modules/mail/em-mailer-prefs.h +++ b/modules/mail/em-mailer-prefs.h @@ -24,7 +24,6 @@ #define EM_MAILER_PREFS_H #include -#include #include #include @@ -56,7 +55,7 @@ struct _EMMailerPrefs { GtkVBox parent_object; GtkBuilder *builder; - GConfClient *gconf; + GSettings *settings; /* General tab */ @@ -81,7 +80,6 @@ struct _EMMailerPrefs { GtkWidget *label_remove; GtkWidget *label_tree; GtkListStore *label_list_store; - guint labels_change_notify_id; /* mail_config's notify id */ /* Headers tab */ GtkButton *add_header; -- cgit v1.2.3 From 925b03c373fc79ccd56ab718a0ab97ab92c06115 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 9 Nov 2011 12:35:00 +0100 Subject: Make it fully build --- modules/mail/em-mailer-prefs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/mail/em-mailer-prefs.h') diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h index eee2d248ac..b8e01b360d 100644 --- a/modules/mail/em-mailer-prefs.h +++ b/modules/mail/em-mailer-prefs.h @@ -55,6 +55,7 @@ struct _EMMailerPrefs { GtkVBox parent_object; GtkBuilder *builder; + GConfClient *gconf; GSettings *settings; /* General tab */ -- cgit v1.2.3