EMailPartHeaders: Add a "default-headers" property.

This will replace the headers API in EMailFormatter.  Need a more
permanent place for headers since EMailFormatter is too disposable.

Also add an ESettingsMailPartHeaders class, which binds the new property
to the "show-headers" setting with a suitable mapping function to filter
out disabled header names.

4 files changed, 196 insertions, 0 deletions

diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am
index 7e3658f426..27dc8c7292 100644
--- a/modules/settings/Makefile.am
+++ b/modules/settings/Makefile.am
@@ -31,6 +31,8 @@ module_settings_la_SOURCES = \
 	e-settings-mail-browser.h \
 	e-settings-mail-formatter.c \
 	e-settings-mail-formatter.h \
+	e-settings-mail-part-headers.c \
+	e-settings-mail-part-headers.h \
 	e-settings-mail-reader.c \
 	e-settings-mail-reader.h \
 	e-settings-meeting-store.c \
diff --git a/modules/settings/e-settings-mail-part-headers.c b/modules/settings/e-settings-mail-part-headers.c
new file mode 100644
index 0000000000..3a846b17a7
--- /dev/null
+++ b/modules/settings/e-settings-mail-part-headers.c
@@ -0,0 +1,126 @@
+/*
+ * e-settings-mail-part-headers.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-part-headers.h"
+
+#include <em-format/e-mail-part-headers.h>
+
+G_DEFINE_DYNAMIC_TYPE (
+	ESettingsMailPartHeaders,
+	e_settings_mail_part_headers,
+	E_TYPE_EXTENSION)
+
+static EMailPartHeaders *
+settings_mail_part_headers_get_extensible (ESettingsMailPartHeaders *extension)
+{
+	EExtensible *extensible;
+
+	extensible = e_extension_get_extensible (E_EXTENSION (extension));
+
+	return E_MAIL_PART_HEADERS (extensible);
+}
+
+static gboolean
+settings_mail_part_headers_get_mapping (GValue *value,
+                                        GVariant *variant,
+                                        gpointer user_data)
+{
+	gchar **strv;
+	gsize ii, n_children;
+	guint index = 0;
+
+	/* Form a string array of enabled header names. */
+
+	n_children = g_variant_n_children (variant);
+
+	strv = g_new0 (gchar *, n_children + 1);
+
+	for (ii = 0; ii < n_children; ii++) {
+		const gchar *name = NULL;
+		gboolean enabled = FALSE;
+
+		g_variant_get_child (variant, ii, "(&sb)", &name, &enabled);
+
+		if (enabled && name != NULL)
+			strv[index++] = g_strdup (name);
+	}
+
+	g_value_take_boxed (value, strv);
+
+	return TRUE;
+}
+
+static void
+settings_mail_part_headers_constructed (GObject *object)
+{
+	ESettingsMailPartHeaders *extension;
+	EMailPartHeaders *part;
+	GSettings *settings;
+
+	extension = E_SETTINGS_MAIL_PART_HEADERS (object);
+	part = settings_mail_part_headers_get_extensible (extension);
+
+	settings = g_settings_new ("org.gnome.evolution.mail");
+
+	g_settings_bind_with_mapping (
+		settings, "show-headers",
+		part, "default-headers",
+		G_SETTINGS_BIND_GET,
+		settings_mail_part_headers_get_mapping,
+		(GSettingsBindSetMapping) NULL,
+		NULL, (GDestroyNotify) NULL);
+
+	g_object_unref (settings);
+
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_settings_mail_part_headers_parent_class)->
+		constructed (object);
+}
+
+static void
+e_settings_mail_part_headers_class_init (ESettingsMailPartHeadersClass *class)
+{
+	GObjectClass *object_class;
+	EExtensionClass *extension_class;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = settings_mail_part_headers_constructed;
+
+	extension_class = E_EXTENSION_CLASS (class);
+	extension_class->extensible_type = E_TYPE_MAIL_PART_HEADERS;
+}
+
+static void
+e_settings_mail_part_headers_class_finalize (ESettingsMailPartHeadersClass *class)
+{
+}
+
+static void
+e_settings_mail_part_headers_init (ESettingsMailPartHeaders *extension)
+{
+}
+
+void
+e_settings_mail_part_headers_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_part_headers_register_type (type_module);
+}
+
diff --git a/modules/settings/e-settings-mail-part-headers.h b/modules/settings/e-settings-mail-part-headers.h
new file mode 100644
index 0000000000..e1917a4eb7
--- /dev/null
+++ b/modules/settings/e-settings-mail-part-headers.h
@@ -0,0 +1,66 @@
+/*
+ * e-settings-mail-part-headers.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_PART_HEADERS_H
+#define E_SETTINGS_MAIL_PART_HEADERS_H
+
+#include <libebackend/libebackend.h>
+
+/* Standard GObject macros */
+#define E_TYPE_SETTINGS_MAIL_PART_HEADERS \
+	(e_settings_mail_part_headers_get_type ())
+#define E_SETTINGS_MAIL_PART_HEADERS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_SETTINGS_MAIL_PART_HEADERS, ESettingsMailPartHeaders))
+#define E_SETTINGS_MAIL_PART_HEADERS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_SETTINGS_MAIL_PART_HEADERS, ESettingsMailPartHeadersClass))
+#define E_IS_SETTINGS_MAIL_PART_HEADERS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_SETTINGS_MAIL_PART_HEADERS))
+#define E_IS_SETTINGS_MAIL_PART_HEADERS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_SETTINGS_MAIL_PART_HEADERS))
+#define E_SETTINGS_MAIL_PART_HEADERS_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_SETTINGS_MAIL_PART_HEADERS, ESettingsMailPartHeadersClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ESettingsMailPartHeaders ESettingsMailPartHeaders;
+typedef struct _ESettingsMailPartHeadersClass ESettingsMailPartHeadersClass;
+typedef struct _ESettingsMailPartHeadersPrivate ESettingsMailPartHeadersPrivate;
+
+struct _ESettingsMailPartHeaders {
+	EExtension parent;
+	ESettingsMailPartHeadersPrivate *priv;
+};
+
+struct _ESettingsMailPartHeadersClass {
+	EExtensionClass parent_class;
+};
+
+GType		e_settings_mail_part_headers_get_type
+						(void) G_GNUC_CONST;
+void		e_settings_mail_part_headers_type_register
+						(GTypeModule *type_module);
+
+G_END_DECLS
+
+#endif /* E_SETTINGS_MAIL_PART_HEADERS_H */
+
diff --git a/modules/settings/evolution-module-settings.c b/modules/settings/evolution-module-settings.c
index 4de90226fe..7cde55a306 100644
--- a/modules/settings/evolution-module-settings.c
+++ b/modules/settings/evolution-module-settings.c
@@ -25,6 +25,7 @@
 #include "e-settings-deprecated.h"
 #include "e-settings-mail-browser.h"
 #include "e-settings-mail-formatter.h"
+#include "e-settings-mail-part-headers.h"
 #include "e-settings-mail-reader.h"
 #include "e-settings-meeting-store.h"
 #include "e-settings-meeting-time-selector.h"
@@ -50,6 +51,7 @@ e_module_load (GTypeModule *type_module)
 	e_settings_deprecated_type_register (type_module);
 	e_settings_mail_browser_type_register (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_meeting_store_type_register (type_module);
 	e_settings_meeting_time_selector_type_register (type_module);