[evolution] Add ESettingsMailSession.

[Matthew Barnes <mbarnes src gnome org>]

commit 21effa0d45ba56fb80a0a07c2b8e40f36434b642
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Nov 24 17:42:54 2013 -0500

    Add ESettingsMailSession.
    
    Handles junk mail settings.

 libemail-engine/e-mail-session.c             |   17 -----
 modules/settings/Makefile.am                 |    3 +
 modules/settings/e-settings-mail-session.c   |   94 ++++++++++++++++++++++++++
 modules/settings/e-settings-mail-session.h   |   66 ++++++++++++++++++
 modules/settings/evolution-module-settings.c |    2 +
 5 files changed, 165 insertions(+), 17 deletions(-)
---
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 23ed2ce..0c594ac 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -462,16 +462,6 @@ mail_session_resolve_popb4smtp (ESourceRegistry *registry,
        return pop_uid;
 }
 
-static void
-mail_session_check_junk_notify (GSettings *settings,
-                                const gchar *key,
-                                CamelSession *session)
-{
-       if (strcmp (key, "junk-check-incoming") == 0)
-               camel_session_set_check_junk (
-                       session, g_settings_get_boolean (settings, key));
-}
-
 static const gchar *
 mail_session_get_junk_filter_name (EMailSession *session)
 {
@@ -1310,13 +1300,6 @@ mail_session_constructed (GObject *object)
                object, "junk-filter-name",
                G_SETTINGS_BIND_DEFAULT);
 
-       camel_session_set_check_junk (
-               CAMEL_SESSION (session), g_settings_get_boolean (
-               settings, "junk-check-incoming"));
-       g_signal_connect (
-               settings, "changed",
-               G_CALLBACK (mail_session_check_junk_notify), session);
-
        mail_config_reload_junk_headers (session);
 
        e_proxy_setup_proxy (session->priv->proxy);
diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am
index d7c00b7..faf0fdf 100644
--- a/modules/settings/Makefile.am
+++ b/modules/settings/Makefile.am
@@ -35,6 +35,8 @@ module_settings_la_SOURCES = \
        e-settings-mail-part-headers.h \
        e-settings-mail-reader.c \
        e-settings-mail-reader.h \
+       e-settings-mail-session.c \
+       e-settings-mail-session.h \
        e-settings-meeting-store.c \
        e-settings-meeting-store.h \
        e-settings-meeting-time-selector.c \
@@ -54,6 +56,7 @@ module_settings_la_SOURCES = \
        $(NULL)
 
 module_settings_la_LIBADD = \
+       $(top_builddir)/libemail-engine/libemail-engine.la \
        $(top_builddir)/e-util/libevolution-util.la \
        $(top_builddir)/em-format/libevolution-mail-formatter.la \
        $(top_builddir)/shell/libevolution-shell.la \
diff --git a/modules/settings/e-settings-mail-session.c b/modules/settings/e-settings-mail-session.c
new file mode 100644
index 0000000..0029a5a
--- /dev/null
+++ b/modules/settings/e-settings-mail-session.c
@@ -0,0 +1,94 @@
+/*
+ * e-settings-mail-session.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 <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "e-settings-mail-session.h"
+
+#include <mail/e-mail-ui-session.h>
+
+#define E_SETTINGS_MAIL_SESSION_GET_PRIVATE(obj) \
+       (G_TYPE_INSTANCE_GET_PRIVATE \
+       ((obj), E_TYPE_SETTINGS_MAIL_SESSION, ESettingsMailSessionPrivate))
+
+struct _ESettingsMailSessionPrivate {
+       gint placeholder;
+};
+
+G_DEFINE_DYNAMIC_TYPE (
+       ESettingsMailSession,
+       e_settings_mail_session,
+       E_TYPE_EXTENSION)
+
+static void
+settings_mail_session_constructed (GObject *object)
+{
+       EExtensible *extensible;
+       GSettings *settings;
+
+       extensible = e_extension_get_extensible (E_EXTENSION (object));
+
+       settings = g_settings_new ("org.gnome.evolution.mail");
+
+       if (E_IS_MAIL_UI_SESSION (extensible)) {
+               g_settings_bind (
+                       settings, "junk-check-incoming",
+                       extensible, "check-junk",
+                       G_SETTINGS_BIND_DEFAULT);
+       }
+
+       g_object_unref (settings);
+
+       /* Chain up to parent's constructed() method. */
+       G_OBJECT_CLASS (e_settings_mail_session_parent_class)->
+               constructed (object);
+}
+
+static void
+e_settings_mail_session_class_init (ESettingsMailSessionClass *class)
+{
+       GObjectClass *object_class;
+       EExtensionClass *extension_class;
+
+       g_type_class_add_private (class, sizeof (ESettingsMailSessionPrivate));
+
+       object_class = G_OBJECT_CLASS (class);
+       object_class->constructed = settings_mail_session_constructed;
+
+       extension_class = E_EXTENSION_CLASS (class);
+       extension_class->extensible_type = E_TYPE_MAIL_SESSION;
+}
+
+static void
+e_settings_mail_session_class_finalize (ESettingsMailSessionClass *class)
+{
+}
+
+static void
+e_settings_mail_session_init (ESettingsMailSession *extension)
+{
+       extension->priv = E_SETTINGS_MAIL_SESSION_GET_PRIVATE (extension);
+}
+
+void
+e_settings_mail_session_type_register (GTypeModule *type_module)
+{
+       /* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
+        *     function, so we have to wrap it with a public function in
+        *     order to register types from a separate compilation unit. */
+       e_settings_mail_session_register_type (type_module);
+}
+
diff --git a/modules/settings/e-settings-mail-session.h b/modules/settings/e-settings-mail-session.h
new file mode 100644
index 0000000..81b2b96
--- /dev/null
+++ b/modules/settings/e-settings-mail-session.h
@@ -0,0 +1,66 @@
+/*
+ * e-settings-mail-session.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 <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef E_SETTINGS_MAIL_SESSION_H
+#define E_SETTINGS_MAIL_SESSION_H
+
+#include <libebackend/libebackend.h>
+
+/* Standard GObject macros */
+#define E_TYPE_SETTINGS_MAIL_SESSION \
+       (e_settings_mail_session_get_type ())
+#define E_SETTINGS_MAIL_SESSION(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST \
+       ((obj), E_TYPE_SETTINGS_MAIL_SESSION, ESettingsMailSession))
+#define E_SETTINGS_MAIL_SESSION_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_CAST \
+       ((cls), E_TYPE_SETTINGS_MAIL_SESSION, ESettingsMailSessionClass))
+#define E_IS_SETTINGS_MAIL_SESSION(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE \
+       ((obj), E_TYPE_SETTINGS_MAIL_SESSION))
+#define E_IS_SETTINGS_MAIL_SESSION_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_TYPE \
+       ((cls), E_TYPE_SETTINGS_MAIL_SESSION))
+#define E_SETTINGS_MAIL_SESSION_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS \
+       ((obj), E_TYPE_SETTINGS_MAIL_SESSION, ESettingsMailSessionClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ESettingsMailSession ESettingsMailSession;
+typedef struct _ESettingsMailSessionClass ESettingsMailSessionClass;
+typedef struct _ESettingsMailSessionPrivate ESettingsMailSessionPrivate;
+
+struct _ESettingsMailSession {
+       EExtension parent;
+       ESettingsMailSessionPrivate *priv;
+};
+
+struct _ESettingsMailSessionClass {
+       EExtensionClass parent_class;
+};
+
+GType          e_settings_mail_session_get_type
+                                               (void) G_GNUC_CONST;
+void           e_settings_mail_session_type_register
+                                               (GTypeModule *type_module);
+
+G_END_DECLS
+
+#endif /* E_SETTINGS_MAIL_SESSION_H */
+
diff --git a/modules/settings/evolution-module-settings.c b/modules/settings/evolution-module-settings.c
index f1c31ab..bf4c3ca 100644
--- a/modules/settings/evolution-module-settings.c
+++ b/modules/settings/evolution-module-settings.c
@@ -27,6 +27,7 @@
 #include "e-settings-mail-formatter.h"
 #include "e-settings-mail-part-headers.h"
 #include "e-settings-mail-reader.h"
+#include "e-settings-mail-session.h"
 #include "e-settings-meeting-store.h"
 #include "e-settings-meeting-time-selector.h"
 #include "e-settings-message-list.h"
@@ -54,6 +55,7 @@ e_module_load (GTypeModule *type_module)
        e_settings_mail_formatter_type_register (type_module);
        e_settings_mail_part_headers_type_register (type_module);
        e_settings_mail_reader_type_register (type_module);
+       e_settings_mail_session_type_register (type_module);
        e_settings_meeting_store_type_register (type_module);
        e_settings_meeting_time_selector_type_register (type_module);
        e_settings_message_list_type_register (type_module);