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. --- mail/Makefile.am | 6 +- mail/e-mail-junk-filter.c | 82 + mail/e-mail-junk-filter.h | 74 + mail/e-mail-junk-options.c | 372 ++ mail/e-mail-junk-options.h | 67 + mail/e-mail-session.c | 273 +- mail/e-mail-session.h | 6 +- mail/em-junk.c | 35 - mail/em-junk.h | 65 - mail/evolution-mail.schemas.in | 28 - mail/mail-config.ui | 7319 +++++++++++++++++++++------------------- 11 files changed, 4694 insertions(+), 3633 deletions(-) create mode 100644 mail/e-mail-junk-filter.c create mode 100644 mail/e-mail-junk-filter.h create mode 100644 mail/e-mail-junk-options.c create mode 100644 mail/e-mail-junk-options.h delete mode 100644 mail/em-junk.c delete mode 100644 mail/em-junk.h (limited to 'mail') diff --git a/mail/Makefile.am b/mail/Makefile.am index 520e6876cd..0d2864d59f 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -56,6 +56,8 @@ mailinclude_HEADERS = \ e-mail-enums.h \ e-mail-enumtypes.h \ e-mail-folder-utils.h \ + e-mail-junk-filter.h \ + e-mail-junk-options.h \ e-mail-label-action.h \ e-mail-label-dialog.h \ e-mail-label-list-store.h \ @@ -91,7 +93,6 @@ mailinclude_HEADERS = \ em-format-html-display.h \ em-format-html-print.h \ em-html-stream.h \ - em-junk.h \ em-search-context.h \ em-subscription-editor.h \ em-sync-stream.h \ @@ -128,6 +129,8 @@ libevolution_mail_la_SOURCES = \ e-mail-display.c \ e-mail-enumtypes.c \ e-mail-folder-utils.c \ + e-mail-junk-filter.c \ + e-mail-junk-options.c \ e-mail-label-action.c \ e-mail-label-dialog.c \ e-mail-label-list-store.c \ @@ -163,7 +166,6 @@ libevolution_mail_la_SOURCES = \ em-format-html-display.c \ em-format-html-print.c \ em-html-stream.c \ - em-junk.c \ em-search-context.c \ em-subscription-editor.c \ em-sync-stream.c \ diff --git a/mail/e-mail-junk-filter.c b/mail/e-mail-junk-filter.c new file mode 100644 index 0000000000..71128013ad --- /dev/null +++ b/mail/e-mail-junk-filter.c @@ -0,0 +1,82 @@ +/* + * e-mail-junk-filter.c + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + */ + +#include "e-mail-junk-filter.h" + +#include + +G_DEFINE_ABSTRACT_TYPE ( + EMailJunkFilter, + e_mail_junk_filter, + E_TYPE_EXTENSION) + +static void +e_mail_junk_filter_class_init (EMailJunkFilterClass *class) +{ + EExtensionClass *extension_class; + + extension_class = E_EXTENSION_CLASS (class); + extension_class->extensible_type = E_TYPE_MAIL_SESSION; +} + +static void +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) +{ + EMailJunkFilterClass *class; + GtkWidget *widget = NULL; + + g_return_val_if_fail (E_IS_MAIL_JUNK_FILTER (junk_filter), NULL); + + class = E_MAIL_JUNK_FILTER_GET_CLASS (junk_filter); + + if (class->new_config_widget != NULL) + widget = class->new_config_widget (junk_filter); + + return widget; +} + +gint +e_mail_junk_filter_compare (EMailJunkFilter *junk_filter_a, + EMailJunkFilter *junk_filter_b) +{ + EMailJunkFilterClass *class_a; + EMailJunkFilterClass *class_b; + + class_a = E_MAIL_JUNK_FILTER_GET_CLASS (junk_filter_a); + class_b = E_MAIL_JUNK_FILTER_GET_CLASS (junk_filter_b); + + return g_utf8_collate (class_a->display_name, class_b->display_name); +} diff --git a/mail/e-mail-junk-filter.h b/mail/e-mail-junk-filter.h new file mode 100644 index 0000000000..34d95e56c7 --- /dev/null +++ b/mail/e-mail-junk-filter.h @@ -0,0 +1,74 @@ +/* + * e-mail-junk-filter.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + */ + +#ifndef E_MAIL_JUNK_FILTER_H +#define E_MAIL_JUNK_FILTER_H + +#include +#include + +/* Standard GObject macros */ +#define E_TYPE_MAIL_JUNK_FILTER \ + (e_mail_junk_filter_get_type ()) +#define E_MAIL_JUNK_FILTER(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_MAIL_JUNK_FILTER, EMailJunkFilter)) +#define E_MAIL_JUNK_FILTER_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_MAIL_JUNK_FILTER, EMailJunkFilterClass)) +#define E_IS_MAIL_JUNK_FILTER(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_MAIL_JUNK_FILTER)) +#define E_IS_MAIL_JUNK_FILTER_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_MAIL_JUNK_FILTER)) +#define E_MAIL_JUNK_FILTER_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_MAIL_JUNK_FILTER, EMailJunkFilterClass)) + +G_BEGIN_DECLS + +typedef struct _EMailJunkFilter EMailJunkFilter; +typedef struct _EMailJunkFilterClass EMailJunkFilterClass; +typedef struct _EMailJunkFilterPrivate EMailJunkFilterPrivate; + +struct _EMailJunkFilter { + EExtension parent; + EMailJunkFilterPrivate *priv; +}; + +struct _EMailJunkFilterClass { + EExtensionClass parent_class; + + 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, + EMailJunkFilter *junk_filter_b); + +G_END_DECLS + +#endif /* E_MAIL_JUNK_FILTER_H */ diff --git a/mail/e-mail-junk-options.c b/mail/e-mail-junk-options.c new file mode 100644 index 0000000000..d57e1d6dc6 --- /dev/null +++ b/mail/e-mail-junk-options.c @@ -0,0 +1,372 @@ +/* + * e-mail-junk-options.c + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + */ + +#include "e-mail-junk-options.h" + +#include +#include + +#include + +#define E_MAIL_JUNK_OPTIONS_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_MAIL_JUNK_OPTIONS, EMailJunkOptionsPrivate)) + +G_DEFINE_TYPE ( + EMailJunkOptions, + e_mail_junk_options, + GTK_TYPE_GRID) + +struct _EMailJunkOptionsPrivate { + EMailSession *session; + + GtkWidget *label; /* not referenced */ + GtkWidget *combo_box; /* not referenced */ + GtkWidget *option_box; /* not referenced */ + GPtrArray *widgets; /* not referenced */ + + GBinding *active_id_binding; +}; + +enum { + PROP_0, + PROP_SESSION +}; + +enum { + COLUMN_FILTER_NAME, + COLUMN_DISPLAY_NAME +}; + +static void +mail_junk_options_combo_box_changed_cb (GtkComboBox *combo_box, + EMailJunkOptions *options) +{ + GPtrArray *array; + gint active; + guint ii; + + array = options->priv->widgets; + active = gtk_combo_box_get_active (combo_box); + + for (ii = 0; ii < array->len; ii++) { + GtkWidget *widget = GTK_WIDGET (array->pdata[ii]); + gtk_widget_set_visible (widget, ii == active); + } +} + +static void +mail_junk_options_rebuild (EMailJunkOptions *options) +{ + EMailSession *session; + GtkComboBox *combo_box; + GtkTreeModel *model; + GtkBox *option_box; + GList *list = NULL; + GList *link; + guint n_filters; + + session = e_mail_junk_options_get_session (options); + combo_box = GTK_COMBO_BOX (options->priv->combo_box); + option_box = GTK_BOX (options->priv->option_box); + + /* Remove the GtkComboBox:active-id binding so it doesn't + * affect EMailSession:junk-filter-name when we clear the + * combo box's list model. */ + if (options->priv->active_id_binding != NULL) { + g_object_unref (options->priv->active_id_binding); + options->priv->active_id_binding = NULL; + } + + model = gtk_combo_box_get_model (combo_box); + gtk_list_store_clear (GTK_LIST_STORE (model)); + + g_ptr_array_foreach ( + options->priv->widgets, + (GFunc) gtk_widget_destroy, NULL); + g_ptr_array_set_size (options->priv->widgets, 0); + + if (session != NULL) + list = e_mail_session_get_available_junk_filters (session); + + for (link = list; link != NULL; link = g_list_next (link)) { + EMailJunkFilter *junk_filter; + EMailJunkFilterClass *class; + GtkWidget *widget; + GtkTreeIter iter; + + junk_filter = E_MAIL_JUNK_FILTER (link->data); + class = E_MAIL_JUNK_FILTER_GET_CLASS (junk_filter); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + + gtk_list_store_set ( + GTK_LIST_STORE (model), &iter, + COLUMN_FILTER_NAME, class->filter_name, + COLUMN_DISPLAY_NAME, class->display_name, + -1); + + /* Create a configuration widget for this junk filter, + * or else just create an empty placeholder widget. */ + widget = e_mail_junk_filter_new_config_widget (junk_filter); + if (widget == NULL) + widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + + g_ptr_array_add (options->priv->widgets, widget); + + /* Set extra padding to 12px, since only one child of + * 'option_box' is visible at a time, and we still want + * the extra padding if the first grid row is invisible. */ + gtk_box_pack_start (option_box, widget, FALSE, FALSE, 12); + } + + /* Synchronize the combo box with the active junk filter. */ + if (session != NULL) { + GBinding *binding; + + binding = g_object_bind_property ( + session, "junk-filter-name", + combo_box, "active-id", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); + options->priv->active_id_binding = binding; + } + + /* Select the first combo box item if we need to. If there's + * no first item to select, this will silently do nothing. */ + if (gtk_combo_box_get_active (combo_box) < 0) + gtk_combo_box_set_active (combo_box, 0); + + /* Update visibility of widgets. */ + n_filters = g_list_length (list); + gtk_widget_set_visible (GTK_WIDGET (options), n_filters > 0); + gtk_widget_set_visible (options->priv->label, n_filters > 1); + gtk_widget_set_visible (options->priv->combo_box, n_filters > 1); + + g_list_free (list); +} + +static void +mail_junk_options_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + switch (property_id) { + case PROP_SESSION: + e_mail_junk_options_set_session ( + E_MAIL_JUNK_OPTIONS (object), + g_value_get_object (value)); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +} + +static void +mail_junk_options_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + switch (property_id) { + case PROP_SESSION: + g_value_set_object ( + value, + e_mail_junk_options_get_session ( + E_MAIL_JUNK_OPTIONS (object))); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +} + +static void +mail_junk_options_dispose (GObject *object) +{ + EMailJunkOptionsPrivate *priv; + + priv = E_MAIL_JUNK_OPTIONS_GET_PRIVATE (object); + + if (priv->session != NULL) { + g_object_unref (priv->session); + priv->session = NULL; + } + + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (e_mail_junk_options_parent_class)->dispose (object); +} + +static void +mail_junk_options_finalize (GObject *object) +{ + EMailJunkOptionsPrivate *priv; + + priv = E_MAIL_JUNK_OPTIONS_GET_PRIVATE (object); + + g_ptr_array_free (priv->widgets, TRUE); + + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (e_mail_junk_options_parent_class)->finalize (object); +} + +static void +mail_junk_options_constructed (GObject *object) +{ + EMailJunkOptionsPrivate *priv; + GtkCellRenderer *cell_renderer; + GtkCellLayout *cell_layout; + GtkListStore *list_store; + GtkWidget *widget; + + priv = E_MAIL_JUNK_OPTIONS_GET_PRIVATE (object); + + /* XXX The margins we're using here are tailored to its + * placement in the Junk tab of Mail Preferences. + * EMailJunkOptions is not really reusable as is. */ + + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_mail_junk_options_parent_class)->constructed (object); + + gtk_grid_set_column_spacing (GTK_GRID (object), 6); + + list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); + + /* Label + combo box has a 12px left margin so it's + * aligned with the junk mail options above it. */ + widget = gtk_label_new (_("Junk filtering software:")); + gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); + gtk_widget_set_margin_left (widget, 12); + gtk_grid_attach (GTK_GRID (object), widget, 0, 0, 1, 1); + priv->label = widget; /* not referenced */ + gtk_widget_show (widget); + + widget = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list_store)); + gtk_combo_box_set_id_column ( + GTK_COMBO_BOX (widget), COLUMN_FILTER_NAME); + gtk_grid_attach (GTK_GRID (object), widget, 1, 0, 1, 1); + priv->combo_box = widget; /* not referenced */ + gtk_widget_show (widget); + + g_signal_connect ( + widget, "changed", + G_CALLBACK (mail_junk_options_combo_box_changed_cb), object); + + /* The config widgets that come from EMailJunkFilter have no + * left margin, since they usually include a bold header and + * interactive widgets with their own left margin. */ + widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_grid_attach (GTK_GRID (object), widget, 0, 1, 2, 1); + priv->option_box = widget; /* not referenced */ + gtk_widget_show (widget); + + cell_layout = GTK_CELL_LAYOUT (priv->combo_box); + cell_renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (cell_layout, cell_renderer, FALSE); + + gtk_cell_layout_add_attribute ( + cell_layout, cell_renderer, + "text", COLUMN_DISPLAY_NAME); + + g_object_unref (list_store); +} + +static void +mail_junk_options_map (GtkWidget *widget) +{ + /* Chain up to parent's map() method. */ + GTK_WIDGET_CLASS (e_mail_junk_options_parent_class)->map (widget); + + mail_junk_options_rebuild (E_MAIL_JUNK_OPTIONS (widget)); +} + +static void +e_mail_junk_options_class_init (EMailJunkOptionsClass *class) +{ + GObjectClass *object_class; + GtkWidgetClass *widget_class; + + g_type_class_add_private (class, sizeof (EMailJunkOptionsPrivate)); + + object_class = G_OBJECT_CLASS (class); + object_class->set_property = mail_junk_options_set_property; + object_class->get_property = mail_junk_options_get_property; + object_class->dispose = mail_junk_options_dispose; + object_class->finalize = mail_junk_options_finalize; + object_class->constructed = mail_junk_options_constructed; + + widget_class = GTK_WIDGET_CLASS (class); + widget_class->map = mail_junk_options_map; + + g_object_class_install_property ( + object_class, + PROP_SESSION, + g_param_spec_object ( + "session", + NULL, + NULL, + E_TYPE_MAIL_SESSION, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); +} + +static void +e_mail_junk_options_init (EMailJunkOptions *options) +{ + options->priv = E_MAIL_JUNK_OPTIONS_GET_PRIVATE (options); + + options->priv->widgets = g_ptr_array_new (); +} + +GtkWidget * +e_mail_junk_options_new (EMailSession *session) +{ + g_return_val_if_fail (E_IS_MAIL_SESSION (session), NULL); + + return g_object_new ( + E_TYPE_MAIL_JUNK_OPTIONS, "session", session, NULL); +} + +EMailSession * +e_mail_junk_options_get_session (EMailJunkOptions *options) +{ + g_return_val_if_fail (E_IS_MAIL_JUNK_OPTIONS (options), NULL); + + return options->priv->session; +} + +void +e_mail_junk_options_set_session (EMailJunkOptions *options, + EMailSession *session) +{ + g_return_if_fail (E_IS_MAIL_JUNK_OPTIONS (options)); + + if (session != NULL) { + g_return_if_fail (E_IS_MAIL_SESSION (session)); + g_object_ref (session); + } + + if (options->priv->session != NULL) + g_object_unref (options->priv->session); + + options->priv->session = session; + + g_object_notify (G_OBJECT (options), "session"); + + mail_junk_options_rebuild (options); +} diff --git a/mail/e-mail-junk-options.h b/mail/e-mail-junk-options.h new file mode 100644 index 0000000000..5e2c99faf7 --- /dev/null +++ b/mail/e-mail-junk-options.h @@ -0,0 +1,67 @@ +/* + * e-mail-junk-options.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + */ + +#ifndef E_MAIL_JUNK_OPTIONS_H +#define E_MAIL_JUNK_OPTIONS_H + +#include +#include + +/* Standard GObject macros */ +#define E_TYPE_MAIL_JUNK_OPTIONS \ + (e_mail_junk_options_get_type ()) +#define E_MAIL_JUNK_OPTIONS(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_MAIL_JUNK_OPTIONS, EMailJunkOptions)) +#define E_MAIL_JUNK_OPTIONS_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_MAIL_JUNK_OPTIONS, EMailJunkOptionsClass)) +#define E_IS_MAIL_JUNK_OPTIONS(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_MAIL_JUNK_OPTIONS)) +#define E_IS_MAIL_JUNK_OPTIONS_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_MAIL_JUNK_OPTIONS)) +#define E_MAIL_JUNK_OPTIONS_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_MAIL_JUNK_OPTIONS, EMailJunkOptionsClass)) + +G_BEGIN_DECLS + +typedef struct _EMailJunkOptions EMailJunkOptions; +typedef struct _EMailJunkOptionsClass EMailJunkOptionsClass; +typedef struct _EMailJunkOptionsPrivate EMailJunkOptionsPrivate; + +struct _EMailJunkOptions { + GtkGrid parent; + EMailJunkOptionsPrivate *priv; +}; + +struct _EMailJunkOptionsClass { + GtkGridClass parent_class; +}; + +GType e_mail_junk_options_get_type (void); +GtkWidget * e_mail_junk_options_new (EMailSession *session); +EMailSession * e_mail_junk_options_get_session (EMailJunkOptions *options); +void e_mail_junk_options_set_session (EMailJunkOptions *options, + EMailSession *session); + +G_END_DECLS + +#endif /* E_MAIL_JUNK_OPTIONS_H */ diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index 44bbd8d0aa..8a3072447a 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -50,9 +50,12 @@ #include "e-util/e-util.h" #include "e-util/e-account-utils.h" #include "e-util/e-alert-dialog.h" +#include "e-util/e-extensible.h" #include "e-util/e-util-private.h" +#include "e-util/gconf-bridge.h" #include "e-mail-folder-utils.h" +#include "e-mail-junk-filter.h" #include "e-mail-local.h" #include "e-mail-session.h" #include "em-composer-utils.h" @@ -78,7 +81,7 @@ struct _EMailSessionPrivate { MailFolderCache *folder_cache; FILE *filter_logfile; - GList *junk_plugins; + GHashTable *junk_filters; }; struct _AsyncContext { @@ -93,7 +96,8 @@ struct _AsyncContext { enum { PROP_0, - PROP_FOLDER_CACHE + PROP_FOLDER_CACHE, + PROP_JUNK_FILTER_NAME }; static gchar *mail_data_dir; @@ -103,10 +107,11 @@ static gchar *mail_config_dir; static MailMsgInfo ms_thread_info_dummy = { sizeof (MailMsg) }; #endif -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_CODE ( EMailSession, e_mail_session, - CAMEL_TYPE_SESSION) + CAMEL_TYPE_SESSION, + G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) /* Support for CamelSession.alert_user() *************************************/ @@ -546,6 +551,84 @@ mail_session_check_junk_notify (GConfClient *gconf, } } +static const gchar * +mail_session_get_junk_filter_name (EMailSession *session) +{ + CamelJunkFilter *junk_filter; + GHashTableIter iter; + gpointer key, value; + + /* XXX This property can be removed once Evolution moves to + * GSettings and can use transform functions when binding + * properties to settings. That's why this is private. */ + + g_hash_table_iter_init (&iter, session->priv->junk_filters); + junk_filter = camel_session_get_junk_filter (CAMEL_SESSION (session)); + + while (g_hash_table_iter_next (&iter, &key, &value)) { + if (junk_filter == CAMEL_JUNK_FILTER (value)) + return (const gchar *) key; + } + + if (junk_filter != NULL) + g_warning ( + "Camel is using a junk filter " + "unknown to Evolution of type %s", + G_OBJECT_TYPE_NAME (junk_filter)); + + return ""; /* GConfBridge doesn't like NULL strings */ +} + +static void +mail_session_set_junk_filter_name (EMailSession *session, + const gchar *junk_filter_name) +{ + CamelJunkFilter *junk_filter = NULL; + + /* XXX This property can be removed once Evolution moves to + * GSettings and can use transform functions when binding + * properties to settings. That's why this is private. */ + + /* An empty string is equivalent to a NULL string. */ + if (junk_filter_name != NULL && *junk_filter_name == '\0') + junk_filter_name = NULL; + + 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 { + g_warning ( + "Unrecognized junk filter name " + "'%s' in GConf", junk_filter_name); + } + } + + camel_session_set_junk_filter (CAMEL_SESSION (session), junk_filter); + + /* XXX We emit the "notify" signal in mail_session_notify(). */ +} + +static void +mail_session_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + switch (property_id) { + case PROP_JUNK_FILTER_NAME: + mail_session_set_junk_filter_name ( + E_MAIL_SESSION (object), + g_value_get_string (value)); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +} + static void mail_session_get_property (GObject *object, guint property_id, @@ -559,6 +642,13 @@ mail_session_get_property (GObject *object, e_mail_session_get_folder_cache ( E_MAIL_SESSION (object))); return; + + case PROP_JUNK_FILTER_NAME: + g_value_set_string ( + value, + mail_session_get_junk_filter_name ( + E_MAIL_SESSION (object))); + return; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -583,8 +673,13 @@ mail_session_dispose (GObject *object) static void mail_session_finalize (GObject *object) { + EMailSessionPrivate *priv; GConfClient *client; + priv = E_MAIL_SESSION_GET_PRIVATE (object); + + g_hash_table_destroy (priv->junk_filters); + client = gconf_client_get_default (); if (session_check_junk_notify_id != 0) { @@ -606,6 +701,87 @@ mail_session_finalize (GObject *object) G_OBJECT_CLASS (e_mail_session_parent_class)->finalize (object); } +static void +mail_session_notify (GObject *object, + GParamSpec *pspec) +{ + /* GObject does not implement this method; do not chain up. */ + + /* XXX Delete this once Evolution moves to GSettings and + * we're able to get rid of PROP_JUNK_FILTER_NAME. */ + if (g_strcmp0 (pspec->name, "junk-filter") == 0) + g_object_notify (object, "junk-filter-name"); +} + +static void +mail_session_constructed (GObject *object) +{ + EMailSessionPrivate *priv; + EExtensible *extensible; + GType extension_type; + GList *list, *iter; + + priv = E_MAIL_SESSION_GET_PRIVATE (object); + + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_mail_session_parent_class)->constructed (object); + + extensible = E_EXTENSIBLE (object); + e_extensible_load_extensions (extensible); + + /* Add junk filter extensions to an internal hash table. */ + + extension_type = E_TYPE_MAIL_JUNK_FILTER; + list = e_extensible_list_extensions (extensible, extension_type); + + for (iter = list; iter != NULL; iter = g_list_next (iter)) { + EMailJunkFilter *junk_filter; + EMailJunkFilterClass *class; + + junk_filter = E_MAIL_JUNK_FILTER (iter->data); + class = E_MAIL_JUNK_FILTER_GET_CLASS (junk_filter); + + if (!CAMEL_IS_JUNK_FILTER (junk_filter)) { + g_warning ( + "Skipping %s: Does not implement " + "CamelJunkFilterInterface", + G_OBJECT_TYPE_NAME (junk_filter)); + continue; + } + + if (class->filter_name == NULL) { + g_warning ( + "Skipping %s: filter_name unset", + G_OBJECT_TYPE_NAME (junk_filter)); + continue; + } + + if (class->display_name == NULL) { + g_warning ( + "Skipping %s: display_name unset", + G_OBJECT_TYPE_NAME (junk_filter)); + continue; + } + + /* No need to reference the EMailJunkFilter since + * EMailSession owns the reference to it already. */ + g_hash_table_insert ( + priv->junk_filters, + (gpointer) class->filter_name, + junk_filter); + } + + g_list_free (list); + + /* Bind the "/apps/evolution/mail/junk/default_plugin" + * GConf key to our "junk-filter-name" property. */ + + gconf_bridge_bind_property ( + gconf_bridge_get (), + "/apps/evolution/mail/junk/default_plugin", + object, "junk-filter-name"); +} + static gchar * mail_session_get_password (CamelSession *session, CamelService *service, @@ -928,9 +1104,12 @@ e_mail_session_class_init (EMailSessionClass *class) g_type_class_add_private (class, sizeof (EMailSessionPrivate)); object_class = G_OBJECT_CLASS (class); + object_class->set_property = mail_session_set_property; object_class->get_property = mail_session_get_property; object_class->dispose = mail_session_dispose; object_class->finalize = mail_session_finalize; + object_class->notify = mail_session_notify; + object_class->constructed = mail_session_constructed; session_class = CAMEL_SESSION_CLASS (class); session_class->get_password = mail_session_get_password; @@ -948,7 +1127,22 @@ e_mail_session_class_init (EMailSessionClass *class) NULL, NULL, MAIL_TYPE_FOLDER_CACHE, - G_PARAM_READABLE)); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + + /* XXX This property can be removed once Evolution moves to + * GSettings and can use transform functions when binding + * properties to settings. */ + g_object_class_install_property ( + object_class, + PROP_JUNK_FILTER_NAME, + g_param_spec_string ( + "junk-filter-name", + NULL, + NULL, + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); } static void @@ -958,6 +1152,8 @@ e_mail_session_init (EMailSession *session) session->priv = E_MAIL_SESSION_GET_PRIVATE (session); session->priv->folder_cache = mail_folder_cache_new (); + session->priv->junk_filters = g_hash_table_new ( + (GHashFunc) g_str_hash, (GEqualFunc) g_str_equal); /* Initialize the EAccount setup. */ e_account_writable (NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD); @@ -974,7 +1170,6 @@ e_mail_session_init (EMailSession *session) client, "/apps/evolution/mail/junk", (GConfClientNotifyFunc) mail_session_check_junk_notify, session, NULL, NULL); - CAMEL_SESSION (session)->junk_plugin = NULL; mail_config_reload_junk_headers (session); @@ -1003,6 +1198,36 @@ e_mail_session_get_folder_cache (EMailSession *session) return session->priv->folder_cache; } +GList * +e_mail_session_get_available_junk_filters (EMailSession *session) +{ + GList *list, *link; + GQueue trash = G_QUEUE_INIT; + + 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. */ + + return g_list_sort (list, (GCompareFunc) e_mail_junk_filter_compare); +} + static void mail_session_get_inbox_thread (GSimpleAsyncResult *simple, EMailSession *session, @@ -1327,42 +1552,6 @@ mail_session_flush_filter_log (EMailSession *session) fflush (session->priv->filter_logfile); } -void -mail_session_add_junk_plugin (EMailSession *session, - const gchar *plugin_name, - CamelJunkPlugin *junk_plugin) -{ - GConfClient *client; - gchar *def_plugin; - const gchar *key; - - g_return_if_fail (E_IS_MAIL_SESSION (session)); - - client = gconf_client_get_default (); - key = "/apps/evolution/mail/junk/default_plugin"; - def_plugin = gconf_client_get_string (client, key, NULL); - g_object_unref (client); - - session->priv->junk_plugins = g_list_append ( - session->priv->junk_plugins, junk_plugin); - if (def_plugin && plugin_name) { - if (!strcmp (def_plugin, plugin_name)) { - CAMEL_SESSION (session)->junk_plugin = junk_plugin; - camel_junk_plugin_init (junk_plugin); - } - } - - g_free (def_plugin); -} - -const GList * -mail_session_get_junk_plugins (EMailSession *session) -{ - g_return_val_if_fail (E_IS_MAIL_SESSION (session), NULL); - - return session->priv->junk_plugins; -} - const gchar * mail_session_get_data_dir (void) { diff --git a/mail/e-mail-session.h b/mail/e-mail-session.h index 5cc6b8976e..653404ca7a 100644 --- a/mail/e-mail-session.h +++ b/mail/e-mail-session.h @@ -66,6 +66,8 @@ GType e_mail_session_get_type (void); EMailSession * e_mail_session_new (void); MailFolderCache * e_mail_session_get_folder_cache (EMailSession *session); +GList * e_mail_session_get_available_junk_filters + (EMailSession *session); CamelFolder * e_mail_session_get_inbox_sync (EMailSession *session, const gchar *service_uid, GCancellable *cancellable, @@ -113,10 +115,6 @@ CamelFolder * e_mail_session_uri_to_folder_finish /*** Legacy API ***/ void mail_session_flush_filter_log (EMailSession *session); -void mail_session_add_junk_plugin (EMailSession *session, - const gchar *plugin_name, - CamelJunkPlugin *junk_plugin); -const GList * mail_session_get_junk_plugins (EMailSession *session); const gchar * mail_session_get_data_dir (void); const gchar * mail_session_get_config_dir (void); diff --git a/mail/em-junk.c b/mail/em-junk.c deleted file mode 100644 index 1026e4d76a..0000000000 --- a/mail/em-junk.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * em-junk.c - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Vivek Jain - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "em-junk.h" - -GQuark -em_junk_error_quark (void) -{ - return g_quark_from_static_string ("em-junk-error-quark"); -} diff --git a/mail/em-junk.h b/mail/em-junk.h deleted file mode 100644 index 978f5ece7d..0000000000 --- a/mail/em-junk.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * em-junk.h - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Vivek Jain - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef EM_JUNK_H -#define EM_JUNK_H - -#include -#include - -#define EM_JUNK_ERROR (em_junk_error_quark ()) - -G_BEGIN_DECLS - -typedef struct _EMJunkTarget EMJunkTarget; -typedef struct _EMJunkInterface EMJunkInterface; - -typedef void (*EMJunkHookFunc) (EPlugin *plugin, EMJunkTarget *data); - -struct _EMJunkTarget { - CamelMimeMessage *m; - GError *error; -}; - -struct _EMJunkInterface { - CamelJunkPlugin camel; - - /* The hook forwards calls from Camel to the EPlugin. */ - EPluginHook *hook; - - /* These are symbol names in the EPlugin. */ - gchar *check_junk; - gchar *report_junk; - gchar *report_notjunk; - gchar *commit_reports; - gchar *validate_binary; - - gchar *plugin_name; -}; - -GQuark em_junk_error_quark (void); - -G_END_DECLS - -#endif /* EM_JUNK_H */ diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index cb697b5aff..3261788016 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -1433,34 +1433,6 @@ - - /schemas/apps/evolution/mail/junk/sa/local_only - /apps/evolution/mail/junk/sa/local_only - evolution-mail - bool - true - - Use only local spam tests. - - Use only the local spam tests (no DNS). - - - - - - /schemas/apps/evolution/mail/junk/sa/use_daemon - /apps/evolution/mail/junk/sa/use_daemon - evolution-mail - bool - true - - Use SpamAssassin daemon and client - - Use SpamAssassin daemon and client (spamc/spamd). - - - - /schemas/apps/evolution/mail/junk/lookup_addressbook /apps/evolution/mail/junk/lookup_addressbook diff --git a/mail/mail-config.ui b/mail/mail-config.ui index d2e5d8dd34..213f397660 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -1,798 +1,463 @@ - + - - - - 1.5 - 10 - 1 - 1 - - - 30000 - 1 - 10 - - - 5 - 1 - 100 - 1 - 10 - - - 65535 - 1 - 10 - - - 65535 - 1 - 10 - - - - - - - - - a - - - b - - - - - - - - - - - a - - - b - - - - - - - - - - - Attachment - - - Inline (Outlook style) - - - Quoted - - - Do not quote - - - - - - - - - - - Attachment - - - Inline - - - Quoted - - - - - - - - - - - Default - - - SHA1 - - - SHA256 - - - SHA384 - - - SHA512 - - - - - True + + + 400 + False 12 - vertical - 12 - - + Set custom junk header + False + dialog + + True + False vertical - 6 - - + 12 + + True - 0 - Account Information - - - + False + end + + + gtk-cancel + True + True + False + False + True + True + + + False + False + 0 + + + + + gtk-ok + True + True + False + False + True + True + + + False + False + 1 + + False - False + True + end 0 - + True - 12 - - - True - 6 - 2 - - - True - vertical - 6 - - - True - 0 - Type the name by which you would like to refer to this account. -For example: "Work" or "Personal" - True - - - False - 0 - - - - - True - 12 - - - True - _Name: - True - right - management_name - - - False - False - 0 - - - - - True - True - ● - - - 1 - - - - - False - 1 - - - - - - + False + All new emails with header that matches given content will be automatically filtered as junk + True + False + True 1 - - - False - False - 0 - - - - - True - vertical - 6 - + True - 0 - Required Information - - - - - - False - False - 0 - - - - - True - 12 + False + 2 + 2 + 12 + 6 - + True - 2 - 2 - 12 - 6 - - - True - True - ● - - - - - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Email _Address: - True - identity_address - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - Full Nam_e: - True - identity_full_name - - - GTK_FILL - - - - - - True - True - ● - - - - - - - 1 - 2 - - - + False + 0 + Header name + junk-header-name + + + GTK_SHRINK + + + + + True + False + 0 + Header content + junk-header-content + + + 1 + 2 + GTK_SHRINK + + + + + True + True + + + 1 + 2 + + + + + True + True + + 1 + 2 + 1 + 2 + - 1 + False + True + 2 - - False - False - 1 - - - + + junk-header-cancel + junk-header-ok + + + + False + normal + + True + False vertical - 6 - - + 12 + + True - 0 - Optional Information - - - + False + end + + + True + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-add + + + False + False + 0 + + + + + True + False + _Add Signature + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + gtk-cancel + True + True + True + False + False + True + + + False + False + 1 + + False - False + True + end 0 - + True - 12 + False - + True - 4 - 2 - 12 - 6 - - - True - 0 - Signat_ure: - True - signature_dropdown - - - 3 - 4 - GTK_FILL - - - + False + 12 + 6 - + True + False 6 - + True + False + 0 + gtk-dialog-info + 6 - False - False + True + True 0 - - Add Ne_w Signature... + True - True - True - True - + False + 0 + The output of this script will be used as your +signature. The name you specify will be used +for display purposes only. + True False False - end 1 - 1 - 2 - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - True - ● - - - - - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - Or_ganization: - True - identity_organization - - - 2 - 3 - GTK_FILL - - - - - - True - True - ● - - - - - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Re_ply-To: - True - center - identity_reply_to - - - 1 - 2 - GTK_FILL - + False + False + 0 - - _Make this my default account + True - True - False - True - True + False + 2 + 2 + 6 + 6 + + + True + False + 0 + _Name: + True + center + entry_add_script_name + + + GTK_FILL + + + + + + True + False + 0 + _Script: + True + center + filechooserbutton_add_script + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + + + + + + True + False + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + - 2 - GTK_FILL - GTK_FILL + True + True + 1 + + False + False + 0 + + False + True 1 - - False - False - 2 - + + button_add_script_add + button_add_script_cancel + - + + 10 + 1.5 + 1 + 1 + + + 30000 + 1 + 10 + + + 1 + 100 + 5 + 1 + 10 + + + 65535 + 1 + 10 + + + 65535 + 1 + 10 + + True - 12 - vertical - 12 + True - + True - 2 - 3 - 12 - 6 - - - True - 0 - Server _Type: - True - right - source_type_dropdown - - - GTK_FILL - - - - - - True - 0 - 0 - Description: - center - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - 0 - description - True - - - 1 - 3 - 1 - 2 - GTK_FILL - - - + False + 12 + 6 - + True - - - 1 - 3 - GTK_FILL - - - - - - False - False - 0 - - - - - True - - - False - False - 1 - - - - - True - vertical - 6 - - - True - 0 - Configuration - - - - - - False - False - 0 - - - - - True - 12 + False + 6 - + True - 3 - 4 - 12 - 6 - - - True - 1 - _Server: - True - source_host - - - 0 - 1 - 0 - GTK_FILL - - - - - - True - 1 - _Port: - True - source_port - - - 0 - 1 - 2 - GTK_FILL - - - - - - True - 1 - User _Name: - True - source_user - - - 1 - GTK_FILL - - - - - - True - True - ● - - - 1 - 0 - - - - - True - True - - - 3 - 0 - - - - - - - True - True - ● - - - 1 - 4 - 1 - 2 - - - - - - True - 1 - _Path: - True - - - 2 - 3 - GTK_FILL - - - - - - True - Mailbox location - - - 1 - 2 - 2 - 3 - - - + False + 0 + Default Behavior + + + + + False + False + 0 + - - - 1 - - - - - False - False - 2 - - - - - True - vertical - 6 - - - True - 0 - Security - source_auth_dropdown - - - - - - False - False - 0 - - - - - True - 12 - + True - vertical - 6 + False + 12 - + True - 12 + False + 8 - + + Format messages in _HTML True - _Use Secure Connection: + True + False + False True - center - source_use_ssl + True False @@ -801,15 +466,14 @@ For example: "Work" or "Personal" - + + Automatically insert _emoticon images True - use_ssl_model - - - - 0 - - + True + False + False + True + True False @@ -817,79 +481,78 @@ For example: "Work" or "Personal" 1 - - - False - False - 0 - - - - - True - 6 - + + Always request rea_d receipt True - gtk-dialog-warning + True + False + False + True + True False False - 0 + 2 - + + Encode file names in an Outlook/GMail way True - 0 - SSL is not supported in this build of Evolution - center - - - + True + False + False + True + True False False - 1 + 3 - - - 1 - + + + True + False + 6 + + + True + False + 1 + C_haracter set: + True + center + + + False + False + 0 + + + + + + + + False + False + 4 + + + + + False + False + 1 + - - 1 - - - - - False - False - 3 - - - - - True - vertical - 6 - - - True - 0 - _Authentication Type - True - source_auth_dropdown - - - - False False @@ -897,351 +560,488 @@ For example: "Work" or "Personal" - + True - 12 + False + 6 - + True - vertical - 6 + False + 0 + Replies and Forwards + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 6 + False + 6 + 2 + 6 + 6 - + True + False + 1 + _Reply style: + True - False - False - 0 + GTK_FILL + - - Ch_eck for Supported Types + + True + False + 1 + _Forward style: + True + + + 1 + 2 + GTK_FILL + + + + + + Start _typing at the bottom on replying True True - True + False + False True + True - False - False - 1 + 2 + 2 + 3 + + + + + + _Keep signature above the original message on replying + True + True + False + False + True + True + + + 2 + 3 + 4 + + + + + + Ignore Reply-To: for mailing lists + True + True + False + False + True + True + + + 2 + 4 + 5 + + + + + + Group Reply goes only to mailing list, if possible + True + True + False + False + True + True + + + 2 + 5 + 6 + + + + + + True + False + 0 + 0 + + + True + False + model3 + + + + 0 + + + + + + + 1 + 2 + + + + + True + False + 0 + 0 + + + True + False + model4 + + + + 0 + + + + + + + 1 + 2 + 1 + 2 - - 0 - - - - - Re_member password - True - True - False - True - True - - - False - False - 1 - + + False + False + 1 + + False + False 1 - - False - False - 4 - - - - - True - 12 - vertical - 12 - - - True - 2 - 3 - 12 - 6 - - - True - 0 - 0 - Server _Type: - True - right - transport_type_dropdown - - - GTK_FILL - - - - - - True - 0 - 0 - Description: - right - - - 1 - 2 - GTK_FILL - - - - - True - - - 1 - 3 - GTK_FILL - - - - - - True - 0 - 0 - description - True - - - 1 - 3 - 1 - 2 - GTK_FILL - - - - - - False - False - 0 - - - + + True + False + General + True + center - False - False - 1 + False - + True - vertical - 6 + False + 12 + 12 - + True - 0 - Server Configuration - - - + False + 6 + + + True + False + 0 + Sig_natures + True + + + + + + False + False + 0 + + + + + True + False + 12 + + + + + + True + True + 1 + + - False - False + True + True 0 - + True - 12 + False + 6 - + True - 2 - 4 - 12 - 6 - - - True - 1 - _Server: - True - transport_host - - - GTK_FILL - - - - - - True - _Port: - True - right - transport_port - - - 2 - GTK_FILL - - - - - - True - True - ● - - - 1 - 2 - - - - - - True - True - - - 3 - - - - + False + 0 + Preview + + + + + + False + False + 0 + + + + + True + False + 12 - - Ser_ver requires authentication + True True - False - True - True + in + + + - - 1 - 2 - 1 - 2 - + + True + True + 1 + + True + True 1 - False - False - 2 + 1 + + + + + True + False + Signatures + True + center + + + 1 + False - + True - vertical - 6 + False + 12 + 12 - + True - 0 - Security - - - - - - False - False - 0 - - - - - True - 12 + False + 6 - + True - 2 - 6 + False + 0 + _Languages + True + listSpellCheckLanguage + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 6 + False + 2 + 2 + 6 + 6 - + True - gtk-dialog-warning + False + 0 + gtk-dialog-info - False - False - 0 + 1 + 2 + + - + True + False 0 - SSL is not supported in this build of Evolution - center - - - + The list of languages here reflects only the languages for which you have a dictionary installed. + True - False - False - 1 + 1 + 2 + 1 + 2 + + + + + + True + True + in + + + True + True + False + + + Languages Table + + + + + + + + + + 2 - - 1 - 2 - + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + 0 + Options + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 12 + False + 6 - + + Check spelling while I _type True - _Use Secure Connection: + True + False + False True - center - transport_use_ssl + True False @@ -1250,14 +1050,39 @@ For example: "Work" or "Personal" - + True - use_ssl_model + False + 6 - - - 0 - + + True + False + Color for _misspelled words: + True + center + colorButtonSpellCheckColor + + + False + False + 0 + + + + + True + True + True + False + Pick a color + #000000000000 + + + False + False + 1 + @@ -1269,32 +1094,50 @@ For example: "Work" or "Personal" + + False + False + 1 + + False + False 1 - False - False - 3 + 2 + + + + + True + False + Spell Checking + True + center + + + 2 + False - + True - vertical - 6 + False + 12 + 12 - + True + False 0 - Authentication - - - + To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions: + True False @@ -1303,653 +1146,309 @@ For example: "Work" or "Personal" - + True + False 12 - + True - 3 - 2 - 12 - 6 + False + 6 - + + Sending a message with an _empty subject line True - 1 - T_ype: + True + False + False True - center - transport_auth_dropdown + True - GTK_FILL - + False + False + 0 - + + Sending a message with only _Bcc recipients defined True - 1 - User _Name: + True + False + False True - right - transport_user - - - 1 - 2 - GTK_FILL - - - - - - True - True - ● + True - 1 - 2 - 1 - 2 - + False + False + 1 - - Remember _password + + Sending a _private reply to a mailing list message True True False + False True True - 1 - 2 - 2 - 3 - - - - - True - 0 - 0 - - - True - 6 - - - True - - - False - False - 0 - - - - - Ch_eck for Supported Types - True - True - True - True - - - False - False - 1 - - - - - - - 1 - 2 - - - - - - - - - - 1 - - - - - False - False - 4 - - - - - True - 12 - vertical - 12 - - - True - vertical - 6 - - - True - 0 - Special Folders - - - - - - False - False - 0 - - - - - True - 0 - 0 - 12 - - - True - 5 - 2 - 12 - 6 - - - True - 0 - Drafts _Folder: - True - - - GTK_FILL - - - - - - True - 0 - Sent _Messages Folder: - True - - - 1 - 2 - GTK_FILL - + False + False + 2 - - _Trash Folder: + + Sending a reply to a large _number of recipients True True False + False True True - 2 - 3 - GTK_FILL - + False + False + 3 - - _Junk Folder: + + Allowing a _mailing list to redirect a private reply to the list True True False + False True True - 3 - 4 - GTK_FILL - - - - - - True - 0 - 0 - - - gtk-revert-to-saved - True - True - True - True - - - - - 1 - 2 - 4 - 5 - - - - - True - True - True - - - 1 - 2 - - - - - True - True - True - - - 1 - 2 - 1 - 2 - - - - - True - True - True - - - 1 - 2 - 2 - 3 + False + False + 4 - + + Sending a message with _recipients not entered as mail addresses True True - True + False + False + True + True - 1 - 2 - 3 - 4 + False + False + 5 - - - + True + True 1 - False - False - 0 + 3 + + + + + True + False + Confirmations + + + 3 + False + + + + + + + + + Default + + + SHA1 + + + SHA256 + + + SHA384 + + + SHA512 + + + + + + + + + + + a + + + b + + + + + + + + + + + a + + + b + + + + + + + + + + + Attachment + + + Inline (Outlook style) + + + Quoted + + + Do not quote + + + + + + + + + + + Attachment + + + Inline + + + Quoted + + + + + True + True - + True - vertical - 6 - - - True - 0 - Composing Messages - - - - - - False - False - 0 - - + False + 12 + 12 - + True - 12 + False + 6 - + True - 4 - 6 + False + 0 + Proxy Settings + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 18 + False + 6 - + + _Use system defaults True True - ● + False + False + True + True + True + + False + False + 0 + - - - 3 - 4 - - - - - Always _blind carbon-copy (bcc) to: - True - True - False - True - True - - - 2 - 3 - - - - - True - 18 - + + _Direct connection to the Internet True True - ● + False + False + True + True + rdoSysSettings - - - - 1 - 2 - - - - - Alway_s carbon-copy (cc) to: - True - True - False - True - True - - - - - - - 1 - - - - - False - False - 1 - - - - - True - vertical - 6 - - - True - 0 - Message Receipts - - - - - - False - False - 0 - - - - - True - 12 - - - True - 12 - - - True - S_end message receipts: - True - receipt_policy_dropdown - - - False - False - 0 - - - - - True - - - 1 - - - - - - - 1 - - - - - False - False - 2 - - - - - True - 12 - vertical - 12 - - - True - vertical - 6 - - - True - 0 - General - - - - - - False - False - 0 - - - - - True - 12 - - - _Do not sign meeting requests (for Outlook compatibility) - True - True - False - True - True - - - - - 1 - - - - - False - False - 0 - - - - - True - vertical - 6 - - - True - 0 - Pretty Good Privacy (PGP/GPG) - - - - - - False - False - 0 - - - - - True - 12 - - - True - 6 - 2 - - - True - vertical - 6 - - - True - 12 - - - True - 0 - PGP/GPG _Key ID: - True - pgp_key - - - False - False - 0 - - - - - True - True - ● - - - 1 - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - Si_gning algorithm: - True - pgp_hash_algo - - - False - False - 0 - - - - - True - hash_algo_model - - - - 0 - - - - - False - False - 1 - - - - - 1 - + + False + False + 1 + - - Al_ways sign outgoing messages when using this account + + _Manual proxy configuration: True True False + False True True + rdoSysSettings False @@ -1958,507 +1457,335 @@ For example: "Work" or "Personal" - - Always encrypt to _myself when sending encrypted messages - True - True - False - True - True - True - - - False - False - 3 - - - - - Always _trust keys in my keyring when encrypting + True - True - False - True - True - - - False - False - 4 - - - - - - - - - 1 - - - - - False - False - 1 - - - - - True - vertical - 6 - - - True - 0 - Secure MIME (S/MIME) - - - - - - False - False - 0 - - - - - True - 12 - - - True - 7 - 3 - 12 - 6 - - - True - True - ● - - - 1 - 2 - 1 - 2 - - - - - - True - True - ● - - - 1 - 2 - 6 - 7 - - - - - - Also encrypt to sel_f when sending encrypted messages - True - True - False - True - True - - - 3 - 5 - 6 - GTK_FILL - - - - - - Encrypt out_going messages (by default) - True - True - False - True - True - - - 3 - 4 - 5 - GTK_FILL - - - - - - Digitally sign o_utgoing messages (by default) - True - True - False - True - True - - - 3 - GTK_FILL - - - - - - True - - - 3 - 3 - 4 - GTK_FILL - GTK_FILL - 6 - - - - - True - 0 - Encry_ption certificate: - True - smime_encrypt_key - - - 6 - 7 - GTK_FILL - - - - - - True - 0 - Sig_ning certificate: - True - smime_sign_key - - - 1 - 2 - GTK_FILL - - - - - - True - 6 - - - True - True - True + False + 24 - + True - 0 - 0 + False + 6 - + True - 2 + False + 4 + 4 + 6 + 6 - + True - gtk-open + False + 0 + H_TTP Proxy: + True + txtHttpHost - False - False - 0 + GTK_FILL + - + True - S_elect... + False + 0 + _Secure HTTP Proxy: True + txtHttpsHost - False - False - 1 + 1 + 2 + GTK_FILL + - - - - - - - False - False - 0 - - - - - True - True - True - - - True - 0 - 0 - - - True - 2 - + True - gtk-clear + False + 0 + No _Proxy for: + True + txtIgnoreHosts - False - False - 0 + 3 + 4 + GTK_FILL + - + True - Clea_r - True + True + ● - False - False - 1 + 1 + 2 + - - - - - - - False - False - 1 - - - - - 2 - 3 - 6 - 7 - GTK_FILL - GTK_FILL - - - - - True - 0 - Signing _algorithm: - True - smime_hash_algo - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - - - True - hash_algo_model - - - - 0 - - - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - - - True - 6 - - - True - True - True + + + True + True + ● + + + 1 + 2 + 1 + 2 + + + + + + True + False + 0 + Port: + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + Port: + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + True + ● + adjustment4 + 1 + + + 3 + 4 + + + + + + True + True + ● + adjustment5 + 1 + + + 3 + 4 + 1 + 2 + + + + + + True + True + ● + + + 1 + 4 + 3 + 4 + + + + + + + + + + + + + + + + + + False + False + 0 + + - + + Use Authe_ntication True - 0 - 0 + True + False + False + True + True + + + False + False + 1 + + + + + True + False + 24 - + True - 2 + False + 2 + 2 + 6 + 3 - + True - gtk-open + False + 0 + Us_ername: + True + txtAuthUser - False - False - 0 + GTK_FILL + - + True - _Select... + False + 0 + Pass_word: True + txtAuthPwd - False - False - 1 + 1 + 2 + GTK_FILL + - - - - - - - False - False - 0 - - - - - True - True - True - - - True - 0 - 0 - - - True - 2 - + True - gtk-clear + True + ● - False - False - 0 + 1 + 2 + GTK_FILL - + True - Cle_ar - True + True + False + ● - False - False - 1 - + 1 + 2 + 1 + 2 + GTK_FILL + + + False + False + 2 + - - False - False - 1 - + + False + False + 3 + - - 2 - 3 - 1 - 3 - + + False + False + 1 + + False + False + 0 + + + + + True + False + + + + + + True + True 1 + + + + True + False + General + - False - False - 2 + False - - - - - - - - - - No encryption - never - - - TLS encryption - when-possible - - - SSL encryption - always - - - True True @@ -2466,17 +1793,18 @@ For example: "Work" or "Personal" True + False 12 - vertical 12 True - vertical + False 6 True + False 0 Start up @@ -2492,15 +1820,17 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 True + False 4 @@ -2508,6 +1838,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2527,6 +1858,7 @@ For example: "Work" or "Personal" True + False 4 @@ -2534,6 +1866,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2569,11 +1902,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Message Display @@ -2589,11 +1923,12 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 @@ -2601,6 +1936,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2613,10 +1949,12 @@ For example: "Work" or "Personal" True + False 24 True + False 2 2 6 @@ -2624,6 +1962,7 @@ For example: "Work" or "Personal" True + False 1 S_tandard Font: True @@ -2640,8 +1979,9 @@ For example: "Work" or "Personal" True True True + False Select HTML fixed width font - + 1 @@ -2657,8 +1997,9 @@ For example: "Work" or "Personal" True True True + False Select HTML variable width font - + 1 @@ -2670,6 +2011,7 @@ For example: "Work" or "Personal" True + False 1 Fix_ed Width Font: True @@ -2687,12 +2029,15 @@ For example: "Work" or "Personal" + True + True 1 True + False 6 @@ -2700,6 +2045,7 @@ For example: "Work" or "Personal" True True False + False True True True @@ -2715,6 +2061,7 @@ For example: "Work" or "Personal" True True True + False Pick a color #000000000000 @@ -2727,6 +2074,7 @@ For example: "Work" or "Personal" True + False color center @@ -2738,16 +2086,20 @@ For example: "Work" or "Personal" + True + True 2 True + False 6 True + False Default character e_ncoding: True center @@ -2763,6 +2115,8 @@ For example: "Work" or "Personal" + True + True 3 @@ -2772,10 +2126,13 @@ For example: "Work" or "Personal" True True False + False True True + True + True 4 @@ -2785,10 +2142,13 @@ For example: "Work" or "Personal" True True False + False True True + True + True 5 @@ -2796,6 +2156,8 @@ For example: "Work" or "Personal" + True + True 1 @@ -2809,11 +2171,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Delete Mail @@ -2829,15 +2192,17 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 True + False 4 @@ -2845,6 +2210,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2857,6 +2223,7 @@ For example: "Work" or "Personal" True + False model1 @@ -2884,6 +2251,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2897,6 +2265,8 @@ For example: "Work" or "Personal" + True + True 1 @@ -2915,6 +2285,7 @@ For example: "Work" or "Personal" True + False General True center @@ -2926,17 +2297,18 @@ For example: "Work" or "Personal" True + False 12 - vertical 12 True - vertical + False 6 True + False 0 General @@ -2952,11 +2324,12 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 @@ -2964,6 +2337,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2979,6 +2353,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -3007,11 +2382,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Loading Images @@ -3027,11 +2403,12 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 @@ -3039,6 +2416,7 @@ For example: "Work" or "Personal" True True False + False True True True @@ -3055,6 +2433,7 @@ For example: "Work" or "Personal" True True False + False True True True @@ -3072,6 +2451,7 @@ For example: "Work" or "Personal" True True False + False True True True @@ -3087,9 +2467,9 @@ For example: "Work" or "Personal" - 1 False False + 1 @@ -3108,6 +2488,7 @@ For example: "Work" or "Personal" True + False HTML Messages True center @@ -3120,12 +2501,13 @@ For example: "Work" or "Personal" True + False 12 - vertical 6 True + False 0 Labels @@ -3141,12 +2523,15 @@ For example: "Work" or "Personal" True + False 12 + True + True 1 @@ -3158,6 +2543,7 @@ For example: "Work" or "Personal" True + False Labels True center @@ -3170,17 +2556,18 @@ For example: "Work" or "Personal" True + False 12 - vertical 12 True - vertical + False 6 True + False 0 Sender Photograph @@ -3196,11 +2583,12 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 @@ -3208,6 +2596,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -3223,6 +2612,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -3251,11 +2641,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Displayed Message Headers True @@ -3273,21 +2664,23 @@ For example: "Work" or "Personal" True + False 12 True + False 12 True - vertical + False 12 True True - ● + ● False @@ -3299,8 +2692,6 @@ For example: "Work" or "Personal" True True - automatic - automatic in @@ -3312,24 +2703,29 @@ For example: "Work" or "Personal" Mail Headers Table + + + + True + True 1 - 0 True True + 0 True - vertical + False 6 @@ -3338,6 +2734,7 @@ For example: "Work" or "Personal" False True True + False True @@ -3352,6 +2749,7 @@ For example: "Work" or "Personal" True True True + False True @@ -3371,6 +2769,8 @@ For example: "Work" or "Personal" + True + True 1 @@ -3384,11 +2784,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Date/Time Format True @@ -3406,10 +2807,12 @@ For example: "Work" or "Personal" True + False 12 True + False 3 @@ -3424,9 +2827,9 @@ For example: "Work" or "Personal" - 1 False False + 1 @@ -3445,6 +2848,7 @@ For example: "Work" or "Personal" True + False Headers True @@ -3454,236 +2858,272 @@ For example: "Work" or "Personal" - + True - 12 - vertical - 12 + False + 0 + 0 - + True - vertical - 6 + False + 12 + immediate + 12 - + True - 0 - General - - - - - - False - False - 0 - - - - - True - 12 + False + 6 - + True - 9 - 3 + False + 0 + General + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 6 + False + 8 + 3 - + + Check incoming _messages for junk True - _Default junk plugin: + True + False + False True - default_junk_plugin + 0 + True - False - False - 6 - 0 + GTK_FILL + + 4 - + True + False + 4 + + + Delete junk messages on e_xit + True + True + False + False + True + 0 + True + + + False + False + 0 + + + + + True + False + model2 + + + + 0 + + + + + False + False + 1 + + - False - False - 1 + 1 + 2 + GTK_FILL + 4 - - - 7 - 8 - GTK_FILL - - - - - Check incoming _messages for junk - True - True - False - True - True - - - GTK_FILL - - 4 - - - - - True - 3 - + + Check cu_stom headers for junk True - gtk-info + True + False + False + True + 0 + True - False - False - 0 + 2 + 3 + GTK_FILL + + 4 - + True - True + False + 6 + + + True + True + in + + + True + True + + + + + + + + True + True + 0 + + + + + True + False + 6 + start + + + gtk-add + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-remove + True + True + True + True + False + True + + + False + False + 1 + + + + + False + True + 1 + + - False - False - 1 + 3 + 4 + 22 - - - 8 - 9 - GTK_FILL - 15 - - - - - True - 4 - - Delete junk messages on e_xit + + Do not mar_k messages as junk if sender is in my address book True True False + False True + 0 True - False - False - 0 - - - - - True - model2 - - - - 0 - - - - - False - False - 1 + 4 + 5 + GTK_FILL + + 4 - - - 1 - 2 - GTK_FILL - 4 - - - - - Check cu_stom headers for junk - True - True - False - True - True - - - 2 - 3 - GTK_FILL - - 4 - - - - - True - 6 - + + _Lookup in local address book only True True - automatic - automatic - in - - - True - True - - + False + False + True + 0 + True - 0 + 5 + 6 + GTK_FILL + + 25 - + True - vertical + False 6 - start - - gtk-add + True - True - True - True - True + False + gtk-info False - False + True 0 - - gtk-remove + True - True - True - True - True + False + Option is ignored if a match for custom junk headers is found. False @@ -3693,96 +3133,56 @@ For example: "Work" or "Personal" - False - 1 - - - - - 3 - 4 - 22 - - - - - Do not mar_k messages as junk if sender is in my address book - True - True - False - True - True - - - 4 - 5 - GTK_FILL - - 4 - - - - - _Lookup in local address book only - True - True - False - True - True - - - 5 - 6 - GTK_FILL - - 25 - - - - - True - 6 - - - True - gtk-info - - - False - 0 + 6 + 7 + GTK_FILL - + True - Option is ignored if a match for custom junk headers is found. + False + 12 + 6 + + + + + + + + + + + + + + + - False - False - 1 + 7 + 8 + GTK_FILL - - 6 - 7 - GTK_FILL - + + True + True + 1 + - 1 + False + False + 0 - - False - False - 0 - @@ -3792,6 +3192,7 @@ For example: "Work" or "Personal" True + False Junk True @@ -3801,142 +3202,243 @@ For example: "Work" or "Personal" - + + + + + + + + + + No encryption + never + + + TLS encryption + when-possible + + + SSL encryption + always + + + + True - True + False + 12 + 12 - + True - 12 - vertical + False 6 - + True - vertical - 6 - - - True - 0 - Default Behavior - - - - - - False - False - 0 - - + False + 0 + Special Folders + + + + + + False + False + 0 + + + + + True + False + 0 + 0 + 12 - + True - 12 + False + 5 + 2 + 12 + 6 - + True - vertical - 8 - - - Format messages in _HTML - True - True - False - True - True - - - False - False - 0 - - - - - Automatically insert _emoticon images - True - True - False - True - True - - - False - False - 1 - - - - - Always request rea_d receipt - True - True - False - True - True - - - False - False - 2 - - - - - Encode file names in an Outlook/GMail way - True - True - False - True - True - - - False - False - 3 - - + False + 0 + Drafts _Folder: + True + + + GTK_FILL + + + + + + True + False + 0 + Sent _Messages Folder: + True + + + 1 + 2 + GTK_FILL + + + + + + _Trash Folder: + True + True + False + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + _Junk Folder: + True + True + False + False + True + True + + + 3 + 4 + GTK_FILL + + + + + + True + False + 0 + 0 - + + gtk-revert-to-saved True - 6 - - - True - 1 - C_haracter set: - True - center - - - False - False - 0 - - - - - + True + True + False + True - - 4 - False - False - + + 1 + 2 + 4 + 5 + + + + + True + True + True + False + + + 1 + 2 + + + + + True + True + True + False + + + 1 + 2 + 1 + 2 + + + + + True + True + True + False + + + 1 + 2 + 2 + 3 + + + + + True + True + True + False + + + 1 + 2 + 3 + 4 + + + + - - 1 - False - False - + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + Composing Messages + + + + False False @@ -3944,293 +3446,151 @@ For example: "Work" or "Personal" - + True - vertical - 6 - - - True - 0 - Replies and Forwards - - - - - - 0 - False - False - - + False + 12 - + True - 12 + False + 4 + 6 - + True - 6 - 2 - 6 - 6 - - - True - 1 - _Reply style: - True - - - GTK_FILL - - - - - - True - 1 - _Forward style: - True - - - 1 - 2 - GTK_FILL - - - + False + 18 - - Start _typing at the bottom on replying + True True - False - True - True + ● - - 2 - 2 - 3 - - - - - - _Keep signature above the original message on replying - True - True - False - True - True - - - 2 - 3 - 4 - - - - - - Ignore Reply-To: for mailing lists - True - True - False - True - True - - - 2 - 4 - 5 - - + + + 3 + 4 + + + + + Always _blind carbon-copy (bcc) to: + True + True + False + False + True + True + + + 2 + 3 + + + + + True + False + 18 - - Group Reply goes only to mailing list, if possible + True True - False - True - True - - - 2 - 5 - 6 - - - - - - True - 0 - 0 - - - True - model3 - - - - 0 - - - - - - - 1 - 2 - - - - - True - 0 - 0 - - - True - model4 - - - - 0 - - - - + ● - - 1 - 2 - 1 - 2 - + + 1 + 2 + + + + + Alway_s carbon-copy (cc) to: + True + True + False + False + True + True + - - False - False - 1 - - False - False + True + True 1 - - - - True - General - True - center - - False + False + False + 1 - + True - 12 - vertical - 12 + False + 6 - + True - vertical - 6 - - - True - 0 - Sig_natures - True - - - - - - False - False - 0 - - - - - True - 12 - - - - - - 1 - True - True - - + False + 0 + Message Receipts + + + + False + False 0 - True - True - + True - vertical - 6 - - - True - 0 - Preview - - - - - - False - False - 0 - - + False + 12 - + True - 12 + False + 12 - + True - True - automatic - automatic - in - - - + False + S_end message receipts: + True + receipt_policy_dropdown + + + False + False + 0 + + + + + True + False + + True + True + 1 + - - 1 - True - True - @@ -4241,183 +3601,82 @@ For example: "Work" or "Personal" - 1 - - - - - True - Signatures - True - center - - - 1 - False + False + False + 2 + + + True + False + 12 + 12 - + True - 12 - vertical - 12 + False + 6 - + True - vertical - 6 - - - True - 0 - _Languages - True - listSpellCheckLanguage - - - - - - False - False - 0 - - - - - True - 12 - - - True - 2 - 2 - 6 - 6 - - - True - 0 - gtk-dialog-info - - - 1 - 2 - - - - - - - True - 0 - The list of languages here reflects only the languages for which you have a dictionary installed. - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - automatic - automatic - in - - - True - True - False - - - Languages Table - - - - - - - 2 - - - - - - - 1 - True - True - - + False + 0 + Account Information + + + + False + False 0 - True - True - + True - vertical - 6 - - - True - 0 - Options - - - - - - False - False - 0 - - + False + 12 - + True - 12 + False + 6 + 2 - + True - vertical + False 6 - - Check spelling while I _type + True - True - False - True - True + False + 0 + Type the name by which you would like to refer to this account. +For example: "Work" or "Personal" + True False - False + True 0 - + True - 6 + False + 12 - + True - Color for _misspelled words: + False + _Name: True - center - colorButtonSpellCheckColor + right + management_name False @@ -4426,71 +3685,56 @@ For example: "Work" or "Personal" - + True True - True - Pick a color - #000000000000 + ● - False - False + True + True 1 False - False + True 1 - - 1 - False - False - - False - False + True + True 1 - 2 - - - - - True - Spell Checking - True - center - - - 2 - False + False + False + 0 - + True - 12 - vertical - 12 + False + 6 - + True + False 0 - To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions: - True + Required Information + + + False @@ -4499,861 +3743,2028 @@ For example: "Work" or "Personal" - + True + False 12 - + True - vertical - 6 + False + 2 + 2 + 12 + 6 - - Sending a message with an _empty subject line + True True - False - True - True + ● + + + + - False - False - 0 + 1 + 2 + 1 + 2 + - - Sending a message with only _Bcc recipients defined + True - True - False - True - True - - - False - False - 1 - - - - - Sending a _private reply to a mailing list message - True - True - False - True - True - - - False - False - 2 - - - - - Sending a reply to a large _number of recipients - True - True - False + False + 0 + Email _Address: True - True + identity_address - False - False - 3 + 1 + 2 + GTK_FILL + - - Allowing a _mailing list to redirect a private reply to the list + True - True - False + False + 0 + Full Nam_e: True - True + identity_full_name - False - False - 4 + GTK_FILL + - - Sending a message with _recipients not entered as mail addresses + True True - False - True - True + ● + + + + - False - False - 5 + 1 + 2 + + True + True 1 - 3 - - - - - True - Confirmations - - - 3 - False + False + False + 1 - - - normal - - + + True - vertical - 12 + False + 6 - + + True + False + 0 + Optional Information + + + + + + False + False + 0 + + + + True - vertical + False + 12 - + True - 12 - vertical - 6 + False + 4 + 2 + 12 + 6 - + + True + False + 0 + Signat_ure: + True + signature_dropdown + + + 3 + 4 + GTK_FILL + + + + + True + False 6 - + True - 0 - gtk-dialog-info - 6 + False + False + False 0 - + + Add Ne_w Signature... True - 0 - The output of this script will be used as your -signature. The name you specify will be used -for display purposes only. - True + True + True + False + True + False False + end 1 - False - False - 0 + 1 + 2 + 3 + 4 + GTK_FILL + GTK_FILL - + True - 2 - 2 - 6 - 6 - - - True - 0 - _Name: - True - center - entry_add_script_name - - - GTK_FILL - - - - - - True - 0 - _Script: - True - center - filechooserbutton_add_script - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - + True + ● + + + + - 1 + 1 + 2 + 2 + 3 + - - - False - False - 0 - - - - - 1 - - - - - True - end - - - True - True - True - False - + True - 0 - 0 - - - True - 2 - - - True - gtk-add - - - False - False - 0 - - - - - True - _Add Signature - True - - - False - False - 1 - - - - + False + 0 + Or_ganization: + True + identity_organization + + 2 + 3 + GTK_FILL + + + + + + True + True + ● + + + + + + + 1 + 2 + 1 + 2 + + + + + + True + False + 0 + Re_ply-To: + True + center + identity_reply_to + + + 1 + 2 + GTK_FILL + + + + + + _Make this my default account + True + True + False + False + True + True + + + 2 + GTK_FILL + GTK_FILL + - - False - False - 0 - - - - - gtk-cancel - True - True - True - False - True - - - False - False - 1 - - False - end - 0 + True + True + 1 + + False + False + 2 + - - button_add_script_add - button_add_script_cancel - - + True - True + False + 12 + 12 - + True - 12 - vertical - 12 + False + 6 - + True - vertical - 6 + False + 0 + General + + + + + + False + False + 0 + + + + + True + False + 12 - + + _Do not sign meeting requests (for Outlook compatibility) True - 0 - Proxy Settings - - - + True + False + False + True + True - - 0 - False - False - + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + Pretty Good Privacy (PGP/GPG) + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 12 + False + 6 + 2 - + True - vertical + False 6 - - _Use system defaults + True - True - False - True - True - True + False + 12 + + + True + False + 0 + PGP/GPG _Key ID: + True + pgp_key + + + False + False + 0 + + + + + True + True + ● + + + True + True + 1 + + - 0 False False + 0 - - _Direct connection to the Internet + + True + False + 12 + + + True + False + 0 + Si_gning algorithm: + True + pgp_hash_algo + + + False + False + 0 + + + + + True + False + hash_algo_model + + + + 0 + + + + + False + False + 1 + + + + + True + True + 1 + + + + + Al_ways sign outgoing messages when using this account True True False + False True True - rdoSysSettings - 1 False False + 2 - - _Manual proxy configuration: + + Always encrypt to _myself when sending encrypted messages True True False + False True + True True - rdoSysSettings - 2 False False + 3 - + + Always _trust keys in my keyring when encrypting True - 24 + True + False + False + True + True + + + False + False + 4 + + + + + + + + + True + True + 1 + + + + + False + False + 1 + + + + + True + False + 6 + + + True + False + 0 + Secure MIME (S/MIME) + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 7 + 3 + 12 + 6 + + + True + True + ● + + + 1 + 2 + 1 + 2 + + + + + + True + True + ● + + + 1 + 2 + 6 + 7 + + + + + + Also encrypt to sel_f when sending encrypted messages + True + True + False + False + True + True + + + 3 + 5 + 6 + GTK_FILL + + + + + + Encrypt out_going messages (by default) + True + True + False + False + True + True + + + 3 + 4 + 5 + GTK_FILL + + + + + + Digitally sign o_utgoing messages (by default) + True + True + False + False + True + True + + + 3 + GTK_FILL + + + + + + True + False + + + 3 + 3 + 4 + GTK_FILL + GTK_FILL + 6 + + + + + True + False + 0 + Encry_ption certificate: + True + smime_encrypt_key + + + 6 + 7 + GTK_FILL + + + + + + True + False + 0 + Sig_ning certificate: + True + smime_sign_key + + + 1 + 2 + GTK_FILL + + + + + + True + False + 6 + + + True + True + True + False - + True - vertical - 6 + False + 0 + 0 - + True - 4 - 4 - 6 - 6 + False + 2 - + True - 0 - H_TTP Proxy: - True - txtHttpHost + False + gtk-open - GTK_FILL - + False + False + 0 - + True - 0 - _Secure HTTP Proxy: + False + S_elect... True - txtHttpsHost - 1 - 2 - GTK_FILL - + False + False + 1 + + + + + + + False + False + 0 + + + + + True + True + True + False + + + True + False + 0 + 0 + + + True + False + 2 - + True - 0 - No _Proxy for: - True - txtIgnoreHosts + False + gtk-clear - 3 - 4 - GTK_FILL - + False + False + 0 - + True - True - ● + False + Clea_r + True - 1 - 2 - + False + False + 1 + + + + + + + False + False + 1 + + + + + 2 + 3 + 6 + 7 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Signing _algorithm: + True + smime_hash_algo + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + 0 + + + True + False + hash_algo_model + + + + 0 + + + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + 0 + + + True + False + 6 + + + True + True + True + False + + + True + False + 0 + 0 - + True - True - ● + False + 2 + + + True + False + gtk-open + + + False + False + 0 + + + + + True + False + _Select... + True + + + False + False + 1 + + - - 1 - 2 - 1 - 2 - - + + + + + False + False + 0 + + + + + True + True + True + False + + + True + False + 0 + 0 - + True - 0 - Port: - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - Port: - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - True - ● - adjustment4 - 1 - - - 3 - 4 - - - - - - True - True - ● - adjustment5 - 1 - - - 3 - 4 - 1 - 2 - - - - - - True - True - ● - - - 1 - 4 - 3 - 4 - - - - - - - - - - - - - - - - - - False - False - 0 - - - - - Use Authe_ntication - True - True - False - True - True - - - False - False - 1 - - - - - True - 24 - - - True - 2 - 2 - 6 - 3 - - - True - 0 - Us_ername: - True - txtAuthUser - - - GTK_FILL - - - - - - True - 0 - Pass_word: - True - txtAuthPwd - - - 1 - 2 - GTK_FILL - - - - - - True - True - ● - - - 1 - 2 - GTK_FILL - - - - - True - True - False - ● - - - 1 - 2 - 1 - 2 - GTK_FILL - - + False + 2 + + + True + False + gtk-clear + + + False + False + 0 + + + + + True + False + Cle_ar + True + + + False + False + 1 + + - - False - False - 2 - + + False + False + 1 + + + + + + + 2 + 3 + 1 + 3 + + + + + + + True + True + 1 + + + + + False + False + 2 + + + + + True + False + 12 + 12 + + + True + False + 2 + 3 + 12 + 6 + + + True + False + 0 + Server _Type: + True + right + source_type_dropdown + + + GTK_FILL + + + + + + True + False + 0 + 0 + Description: + center + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + 0 + description + True + + + 1 + 3 + 1 + 2 + GTK_FILL + + + + + + True + False + + + 1 + 3 + GTK_FILL + + + + + + False + False + 0 + + + + + True + False + + + False + False + 1 + + + + + True + False + 6 + + + True + False + 0 + Configuration + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 3 + 4 + 12 + 6 + + + True + False + 1 + _Server: + True + source_host + + + GTK_FILL + + + + + + True + False + 1 + _Port: + True + source_port + + + 2 + GTK_FILL + + + + + + True + False + 1 + User _Name: + True + source_user + + + 1 + GTK_FILL + + + + + + True + True + ● + + + 1 + + + + + True + False + True + + + False + + + + + 3 + + + + + + + True + True + ● + + + 1 + 4 + 1 + 2 + + + + + + True + False + 1 + _Path: + True + + + 2 + 3 + GTK_FILL + + + + + + True + False + Mailbox location + + + 1 + 2 + 2 + 3 + + + + + + + + + + + + + + True + True + 1 + + + + + False + False + 2 + + + + + True + False + 6 + + + True + False + 0 + Security + source_auth_dropdown + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + True + False + 12 + + + True + False + _Use Secure Connection: + True + center + source_use_ssl + + + False + False + 0 + + + + + True + False + use_ssl_model + + + + 0 + + + + + False + False + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + gtk-dialog-warning + + + False + False + 0 + + + + + True + False + 0 + SSL is not supported in this build of Evolution + center + + + + + + False + False + 1 + + + + + True + True + 1 + + + + + + + True + True + 1 + + + + + False + False + 3 + + + + + True + False + 6 + + + True + False + 0 + _Authentication Type + True + source_auth_dropdown + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + True + False + 6 + + + True + False + + + False + False + 0 + + + + + Ch_eck for Supported Types + True + True + True + False + True + + + False + False + 1 + + + + + True + True + 0 + + + + + Re_member password + True + True + False + False + True + True + + + False + False + 1 + + + + + + + True + True + 1 + + + + + False + False + 4 + + + + + True + False + 12 + 12 + + + True + False + 2 + 3 + 12 + 6 + + + True + False + 0 + 0 + Server _Type: + True + right + transport_type_dropdown + + + GTK_FILL + + + + + + True + False + 0 + 0 + Description: + right + + + 1 + 2 + GTK_FILL + + + + + True + False + + + 1 + 3 + GTK_FILL + + + + + + True + False + 0 + 0 + description + True + + + 1 + 3 + 1 + 2 + GTK_FILL + + + + + + False + False + 0 + + + + + True + False + + + False + False + 1 + + + + + True + False + 6 + + + True + False + 0 + Server Configuration + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 2 + 4 + 12 + 6 + + + True + False + 1 + _Server: + True + transport_host + + + GTK_FILL + + + + + + True + False + _Port: + True + right + transport_port + + + 2 + GTK_FILL + + + + + + True + True + ● + + + 1 + 2 + + + + + + True + False + True + + + False + + + + + 3 + + + + + + + Ser_ver requires authentication + True + True + False + False + True + True + + + 1 + 2 + 1 + 2 + + + + + + + + + + + + + + + + True + True + 1 + + + + + False + False + 2 + + + + + True + False + 6 + + + True + False + 0 + Security + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 2 + 6 + + + True + False + 6 + + + True + False + gtk-dialog-warning + + + False + False + 0 + + + + + True + False + 0 + SSL is not supported in this build of Evolution + center + + + + + + False + False + 1 + + + + + 1 + 2 + + + + + True + False + 12 + + + True + False + _Use Secure Connection: + True + center + transport_use_ssl + + + False + False + 0 + + + + + True + False + use_ssl_model + + + + 0 + False False - 3 + 1 - - False - False - 1 - - - - - False - False - 0 - - - - - True - - + True + True 1 - - - - True - General - - False + False + False + 3 - - - dialog - Set custom junk header - 12 - 400 - FALSE - - + + True - vertical - 12 - 12 + False + 6 - + True - True - All new emails with header that matches given content will be automatically filtered as junk + False + 0 + Authentication + + + + + False + False + 0 + - - - True - 2 - 2 - 12 - 6 - - - True - Header name - junk-header-name - 0 - - - GTK_SHRINK - - - - - True - Header content - junk-header-content - 0 - - - 1 - 2 - GTK_SHRINK - - - - - True - True - - - 1 - 2 - - - - - True - True - - - 1 - 2> - 1 - 2 - - - - - - + + True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - + False + 12 - - gtk-ok + True - True - True - True + False + 3 + 2 + 12 + 6 + + + True + False + 1 + T_ype: + True + center + transport_auth_dropdown + + + GTK_FILL + + + + + + True + False + 1 + User _Name: + True + right + transport_user + + + 1 + 2 + GTK_FILL + + + + + + True + True + ● + + + 1 + 2 + 1 + 2 + + + + + + Remember _password + True + True + False + False + True + True + + + 1 + 2 + 2 + 3 + + + + + True + False + 0 + 0 + + + True + False + 6 + + + True + False + + + False + False + 0 + + + + + Ch_eck for Supported Types + True + True + True + False + True + + + False + False + 1 + + + + + + + 1 + 2 + + + + + - - False - False - 1 - - False - end - 0 + True + True + 1 + + False + False + 4 + - - junk-header-cancel - junk-header-ok - + + + + + + @@ -5362,10 +5773,4 @@ for display purposes only. - - - - - - -- cgit v1.2.3