aboutsummaryrefslogtreecommitdiffstats
path: root/libemail-engine
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-08-21 04:42:47 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-10-01 11:26:23 +0800
commitc539a9ec20f46e0dc66df76fa518f8b659467bcd (patch)
tree26699d756bf65041f34bb8cf69d6086ad0c525a7 /libemail-engine
parentf186c2a87448f0e6410344b5e8e4b8f587e9987f (diff)
downloadgsoc2013-evolution-c539a9ec20f46e0dc66df76fa518f8b659467bcd.tar
gsoc2013-evolution-c539a9ec20f46e0dc66df76fa518f8b659467bcd.tar.gz
gsoc2013-evolution-c539a9ec20f46e0dc66df76fa518f8b659467bcd.tar.bz2
gsoc2013-evolution-c539a9ec20f46e0dc66df76fa518f8b659467bcd.tar.lz
gsoc2013-evolution-c539a9ec20f46e0dc66df76fa518f8b659467bcd.tar.xz
gsoc2013-evolution-c539a9ec20f46e0dc66df76fa518f8b659467bcd.tar.zst
gsoc2013-evolution-c539a9ec20f46e0dc66df76fa518f8b659467bcd.zip
Remove e_mail_junk_filter_available().
Because we now check for junk filtering software in configure, junk filtering modules can now safely assume the required junk filtering software is installed. No more having the module installed but not the required software. If this invariant is broken, an error will be shown for each new message received.
Diffstat (limited to 'libemail-engine')
-rw-r--r--libemail-engine/e-mail-junk-filter.c13
-rw-r--r--libemail-engine/e-mail-junk-filter.h2
-rw-r--r--libemail-engine/e-mail-session.c27
3 files changed, 3 insertions, 39 deletions
diff --git a/libemail-engine/e-mail-junk-filter.c b/libemail-engine/e-mail-junk-filter.c
index fda8efb163..d6c77eae61 100644
--- a/libemail-engine/e-mail-junk-filter.c
+++ b/libemail-engine/e-mail-junk-filter.c
@@ -39,19 +39,6 @@ e_mail_junk_filter_init (EMailJunkFilter *junk_filter)
{
}
-gboolean
-e_mail_junk_filter_available (EMailJunkFilter *junk_filter)
-{
- EMailJunkFilterClass *class;
-
- g_return_val_if_fail (E_IS_MAIL_JUNK_FILTER (junk_filter), FALSE);
-
- class = E_MAIL_JUNK_FILTER_GET_CLASS (junk_filter);
- g_return_val_if_fail (class->available != NULL, FALSE);
-
- return class->available (junk_filter);
-}
-
GtkWidget *
e_mail_junk_filter_new_config_widget (EMailJunkFilter *junk_filter)
{
diff --git a/libemail-engine/e-mail-junk-filter.h b/libemail-engine/e-mail-junk-filter.h
index 375a0f2c60..efcd25f9d9 100644
--- a/libemail-engine/e-mail-junk-filter.h
+++ b/libemail-engine/e-mail-junk-filter.h
@@ -58,12 +58,10 @@ struct _EMailJunkFilterClass {
const gchar *filter_name;
const gchar *display_name;
- gboolean (*available) (EMailJunkFilter *junk_filter);
GtkWidget * (*new_config_widget) (EMailJunkFilter *junk_filter);
};
GType e_mail_junk_filter_get_type (void) G_GNUC_CONST;
-gboolean e_mail_junk_filter_available (EMailJunkFilter *junk_filter);
GtkWidget * e_mail_junk_filter_new_config_widget
(EMailJunkFilter *junk_filter);
gint e_mail_junk_filter_compare (EMailJunkFilter *junk_filter_a,
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 79dcad2edf..d89515eedd 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -421,11 +421,7 @@ mail_session_set_junk_filter_name (EMailSession *session,
if (junk_filter_name != NULL) {
junk_filter = g_hash_table_lookup (
session->priv->junk_filters, junk_filter_name);
- if (junk_filter != NULL) {
- if (!e_mail_junk_filter_available (
- E_MAIL_JUNK_FILTER (junk_filter)))
- junk_filter = NULL;
- } else {
+ if (junk_filter == NULL) {
g_warning (
"Unrecognized junk filter name "
"'%s' in GSettings", junk_filter_name);
@@ -1996,30 +1992,13 @@ e_mail_session_get_local_folder_uri (EMailSession *session,
GList *
e_mail_session_get_available_junk_filters (EMailSession *session)
{
- GList *list, *link;
- GQueue trash = G_QUEUE_INIT;
+ GList *list;
g_return_val_if_fail (E_IS_MAIL_SESSION (session), NULL);
list = g_hash_table_get_values (session->priv->junk_filters);
- /* Discard unavailable junk filters. (e.g. Junk filter
- * requires Bogofilter but Bogofilter is not installed,
- * hence the junk filter is unavailable.) */
-
- for (link = list; link != NULL; link = g_list_next (link)) {
- EMailJunkFilter *junk_filter;
-
- junk_filter = E_MAIL_JUNK_FILTER (link->data);
- if (!e_mail_junk_filter_available (junk_filter))
- g_queue_push_tail (&trash, link);
- }
-
- while ((link = g_queue_pop_head (&trash)) != NULL)
- list = g_list_delete_link (list, link);
-
- /* Sort the remaining junk filters by display name. */
-
+ /* Sort the available junk filters by display name. */
return g_list_sort (list, (GCompareFunc) e_mail_junk_filter_compare);
}