Mail formatter rewrite - convert some plugins to modules

audio-inline, itip-formatter, prefer-plain, tnef-attachments
and vcard-inline plugins were converted to modules so that they
can fit into concept of the new formatter.

Every module still installs .eplug file, because there is no
suitable API at the moment to register plugins to the plugins dialog
and to extend the Preferences dialog.

3 files changed, 245 insertions, 0 deletions

diff --git a/modules/prefer-plain/plugin/Makefile.am b/modules/prefer-plain/plugin/Makefile.am
new file mode 100644
index 0000000000..3a0e16d29a
--- /dev/null
+++ b/modules/prefer-plain/plugin/Makefile.am
@@ -0,0 +1,28 @@
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-prefer-plain.eplug
+plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la
+
+liborg_gnome_prefer_plain_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
+
+liborg_gnome_prefer_plain_la_SOURCES =		\
+	config-ui.c
+
+liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+liborg_gnome_prefer_plain_la_LIBADD =				\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
+
+BUILT_SOURCES = $(plugin_DATA)
+
+CLEANFILES = $(BUILT_SOURCES)
+
+EXTRA_DIST = \
+	org-gnome-prefer-plain.eplug.xml
diff --git a/modules/prefer-plain/plugin/config-ui.c b/modules/prefer-plain/plugin/config-ui.c
new file mode 100644
index 0000000000..29b81a60fe
--- /dev/null
+++ b/modules/prefer-plain/plugin/config-ui.c
@@ -0,0 +1,192 @@
+/*
+ * 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/>
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include <mail/em-config.h>
+
+#include <libedataserverui/libedataserverui.h>
+
+GtkWidget *prefer_plain_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
+
+enum {
+	EPP_NORMAL,
+	EPP_PREFER,
+	EPP_TEXT
+};
+
+static GSettings *epp_settings = NULL;
+static gint epp_mode = -1;
+static gboolean epp_show_suppressed = TRUE;
+
+static struct {
+	const gchar *key;
+	const gchar *label;
+	const gchar *description;
+} epp_options[] = {
+	{ "normal",
+	  N_("Show HTML if present"),
+	  N_("Let Evolution choose the best part to show.") },
+
+	{ "prefer_plain",
+	  N_("Show plain text if present"),
+	  N_("Show plain text part, if present, otherwise "
+	     "let Evolution choose the best part to show.") },
+
+	{ "only_plain",
+	  N_("Only ever show plain text"),
+	  N_("Always show plain text part and make attachments "
+	     "from other parts, if requested.") },
+};
+
+static void
+update_info_label (GtkWidget *info_label,
+                   guint mode)
+{
+	gchar *str = g_strconcat ("<i>", _(epp_options[mode > 2 ? 0 : mode].description), "</i>", NULL);
+
+	gtk_label_set_markup (GTK_LABEL (info_label), str);
+
+	g_free (str);
+}
+
+static void
+epp_mode_changed (GtkComboBox *dropdown,
+                  GtkWidget *info_label)
+{
+	epp_mode = gtk_combo_box_get_active (dropdown);
+	if (epp_mode > 2)
+		epp_mode = 0;
+
+	g_settings_set_string (epp_settings, "mode", epp_options[epp_mode].key);
+	update_info_label (info_label, epp_mode);
+}
+
+static void
+epp_show_suppressed_toggled (GtkToggleButton *check,
+                             gpointer data)
+{
+	g_return_if_fail (check != NULL);
+
+	epp_show_suppressed = gtk_toggle_button_get_active (check);
+	g_settings_set_boolean (epp_settings, "show-suppressed", epp_show_suppressed);
+}
+
+GtkWidget *
+prefer_plain_page_factory (EPlugin *epl,
+                           struct _EConfigHookItemFactoryData *data)
+{
+	GtkComboBox *dropdown;
+	GtkCellRenderer *cell;
+	GtkListStore *store;
+	GtkWidget *dropdown_label, *info, *check;
+	guint i;
+	GtkTreeIter iter;
+
+	if (data->old)
+		return data->old;
+
+	check = gtk_check_button_new_with_mnemonic (_("Show s_uppressed HTML parts as attachments"));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), epp_show_suppressed);
+	gtk_widget_show (check);
+	g_signal_connect (
+		check, "toggled",
+		G_CALLBACK (epp_show_suppressed_toggled), NULL);
+
+	dropdown = (GtkComboBox *) gtk_combo_box_new ();
+	cell = gtk_cell_renderer_text_new ();
+	store = gtk_list_store_new (1, G_TYPE_STRING);
+	for (i = 0; i < G_N_ELEMENTS (epp_options); i++) {
+		gtk_list_store_append (store, &iter);
+		gtk_list_store_set (store, &iter, 0, _(epp_options[i].label), -1);
+	}
+
+	gtk_cell_layout_pack_start ((GtkCellLayout *) dropdown, cell, TRUE);
+	gtk_cell_layout_set_attributes((GtkCellLayout *)dropdown, cell, "text", 0, NULL);
+	gtk_combo_box_set_model (dropdown, (GtkTreeModel *) store);
+	/*gtk_combo_box_set_active(dropdown, -1);*/
+	gtk_combo_box_set_active (dropdown, epp_mode);
+	gtk_widget_show ((GtkWidget *) dropdown);
+
+	dropdown_label = gtk_label_new_with_mnemonic (_("HTML _Mode"));
+	gtk_widget_show (dropdown_label);
+	gtk_label_set_mnemonic_widget (GTK_LABEL (dropdown_label), (GtkWidget *) dropdown);
+
+	info = gtk_label_new (NULL);
+	gtk_misc_set_alignment (GTK_MISC (info), 0.0, 0.5);
+	gtk_label_set_line_wrap (GTK_LABEL (info), TRUE);
+
+	gtk_widget_show (info);
+	update_info_label (info, epp_mode);
+
+	g_signal_connect (
+		dropdown, "changed",
+		G_CALLBACK (epp_mode_changed), info);
+
+	g_object_get (data->parent, "n-rows", &i, NULL);
+	gtk_table_attach ((GtkTable *) data->parent, check, 0, 2, i, i + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+	gtk_table_attach ((GtkTable *) data->parent, dropdown_label, 0, 1, i + 1, i + 2, 0, 0, 0, 0);
+	gtk_table_attach ((GtkTable *) data->parent, (GtkWidget *) dropdown, 1, 2, i + 1, i + 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+	gtk_table_attach ((GtkTable *) data->parent, info, 1, 2, i + 2, i + 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+
+	/* since this isnt dynamic, we don't need to track each item */
+
+	return (GtkWidget *) dropdown;
+}
+
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep,
+                     gint enable)
+{
+	gchar *key;
+	gint i;
+
+	if (epp_settings || epp_mode != -1)
+		return 0;
+
+	if (enable) {
+
+		epp_settings = g_settings_new ("org.gnome.evolution.plugin.prefer-plain");
+		key = g_settings_get_string (epp_settings, "mode");
+		if (key) {
+			for (i = 0; i < G_N_ELEMENTS (epp_options); i++) {
+				if (!strcmp (epp_options[i].key, key)) {
+					epp_mode = i;
+					break;
+				}
+			}
+			g_free (key);
+		} else {
+			epp_mode = 0;
+		}
+
+		epp_show_suppressed = g_settings_get_boolean (epp_settings, "show-suppressed");
+	} else {
+		if (epp_settings) {
+			g_object_unref (epp_settings);
+			epp_settings = NULL;
+		}
+	}
+
+	return 0;
+}
diff --git a/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml b/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml
new file mode 100644
index 0000000000..43948e3a69
--- /dev/null
+++ b/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<e-plugin-list>
+  <e-plugin
+    type="shlib"
+    id="org.gnome.evolution.plugin.preferPlain"
+    location="@PLUGINDIR@/liborg-gnome-prefer-plain@SOEXT@"
+    _name="Prefer Plain Text">
+
+
+    <_description>View mail messages as plain text, even if they contain HTML content.</_description>
+    <author name="Michael Zucchi" email="NotZed@Ximian.com"/>
+
+
+    <!-- hook into the 'html mail' preferences page -->
+    <hook class="org.gnome.evolution.mail.config:1.0">
+      <group target="prefs" id="org.gnome.evolution.mail.prefs">
+	<!-- we could also just insert our own items from a section factory, -->
+	<!-- but then we also need to create our own section frame -->
+	<item type="section_table" path="10.html/80.mode" _label="Plain Text Mode"/>
+	<item type="item_table" path="10.html/80.mode/00.mode" factory="prefer_plain_page_factory"/>
+      </group>
+    </hook>
+
+  </e-plugin>
+</e-plugin-list>
\ No newline at end of file