GNOME.org
 

[evolution-kolab/account-mgmt: 21/29] Reimplement mail account configuration.

commit ca41e011dff0b4cf86bc04ff4693318655e0ddc1
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jun 30 14:41:33 2012 -0400

    Reimplement mail account configuration.
    
    Uses the EExtension framework now instead of EPlugin.
    
    Installs module-kolab-configuration.so as an Evolution module.

 configure.ac                                    |    9 +-
 src/Makefile.am                                 |    2 +-
 src/configuration/Makefile.am                   |   27 ++
 src/configuration/e-mail-config-kolab-backend.c |  334 +++++++++++++++++++++++
 src/configuration/e-mail-config-kolab-backend.h |   64 +++++
 src/configuration/module-kolab-configuration.c  |   33 +++
 6 files changed, 464 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index caa3977..248899e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ PKG_CHECK_MODULES(SOUP, libsoup-2.4 libsoup-gnome-2.4)
 PKG_CHECK_MODULES(CURL, libcurl)
 PKG_CHECK_MODULES(ICAL, libical)
 PKG_CHECK_MODULES(GMIME, gmime-2.4,,[PKG_CHECK_MODULES(GMIME, gmime-2.6)]) dnl TODO make tests optional
-PKG_CHECK_MODULES(EVOLUTION, evolution-plugin-3.0 libebook-1.2 libecal-1.2)
+PKG_CHECK_MODULES(EVOLUTION, evolution-mail-3.0 libebook-1.2 libecal-1.2)
 
 dnl ***********
 dnl Kerberos 5
@@ -178,8 +178,9 @@ AC_SUBST_FILE(EVO_PLUGIN_RULE)
 dnl *******************
 dnl Special directories
 dnl *******************
-plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-3.0`
-AC_SUBST(plugindir)
+
+evo_moduledir=`$PKG_CONFIG --variable=moduledir evolution-shell-3.0`
+AC_SUBST(evo_moduledir)
 
 ebook_backenddir=`$PKG_CONFIG --variable=backenddir libedata-book-1.2`
 AC_SUBST(ebook_backenddir)
@@ -249,7 +250,7 @@ src/Makefile
 src/addressbook/Makefile
 src/calendar/Makefile
 src/camel/Makefile
-src/eplugin/Makefile
+src/configuration/Makefile
 src/libekolab/Makefile
 src/libekolabconv/Makefile
 src/libekolabconv/main/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 49b56fe..c438383 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS =		\
 	libekolab	\
 	addressbook	\
 	calendar	\
-	eplugin		\
+	configuration	\
 	tests
 
 bin_PROGRAMS = evolution_kolab
diff --git a/src/configuration/Makefile.am b/src/configuration/Makefile.am
new file mode 100644
index 0000000..e1c4bc8
--- /dev/null
+++ b/src/configuration/Makefile.am
@@ -0,0 +1,27 @@
+NULL =
+
+evo_module_LTLIBRARIES = module-kolab-configuration.la
+
+module_kolab_configuration_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir) \
+	-I$(top_builddir)/src \
+	$(EVOLUTION_CFLAGS) \
+	$(NULL)
+
+module_kolab_configuration_la_SOURCES = \
+	module-kolab-configuration.c \
+	e-mail-config-kolab-backend.c \
+	e-mail-config-kolab-backend.h \
+	$(NULL)
+
+module_kolab_configuration_la_LIBADD = \
+	$(EVOLUTION_LIBS) \
+	$(NULL)
+
+module_kolab_configuration_la_LDFLAGS = \
+	-module -avoid-version $(NO_UNDEFINED)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/configuration/e-mail-config-kolab-backend.c b/src/configuration/e-mail-config-kolab-backend.c
new file mode 100644
index 0000000..a86fa90
--- /dev/null
+++ b/src/configuration/e-mail-config-kolab-backend.c
@@ -0,0 +1,334 @@
+/*
+ * 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.1 of the License, or (at your option) any later version.
+ *
+ * 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
+
+/* XXX This is heavily based on the EMailConfigRemoveBackend class in
+ *     evolution/modules/mail-config/e-mail-config-remove-accounts.c */
+
+#include "e-mail-config-kolab-backend.h"
+
+#include <config.h>
+#include <glib/gi18n-lib.h>
+
+#include <misc/e-port-entry.h>
+
+#include <mail/e-mail-config-auth-check.h>
+#include <mail/e-mail-config-service-page.h>
+
+#include "libekolabutil/kolab-util-camel.h"
+
+#define E_MAIL_CONFIG_KOLAB_BACKEND_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_MAIL_CONFIG_KOLAB_BACKEND, EMailConfigKolabBackendPrivate))
+
+struct _EMailConfigKolabBackendPrivate {
+	GtkWidget *host_entry;		/* not referenced */
+	GtkWidget *port_entry;		/* not referenced */
+	GtkWidget *user_entry;		/* not referenced */
+	GtkWidget *security_combo_box;	/* not referenced */
+	GtkWidget *auth_check;		/* not referenced */
+};
+
+G_DEFINE_DYNAMIC_TYPE (
+	EMailConfigKolabBackend,
+	e_mail_config_kolab_backend,
+	E_TYPE_MAIL_CONFIG_SERVICE_BACKEND)
+
+static ESource *
+mail_config_kolab_backend_new_collection (EMailConfigServiceBackend *backend)
+{
+	EMailConfigServiceBackendClass *class;
+	ESourceBackend *extension;
+	ESource *source;
+	const gchar *extension_name;
+
+	class = E_MAIL_CONFIG_SERVICE_BACKEND_GET_CLASS (backend);
+
+	source = e_source_new (NULL, NULL, NULL);
+	extension_name = E_SOURCE_EXTENSION_COLLECTION;
+	extension = e_source_get_extension (source, extension_name);
+	e_source_backend_set_backend_name (extension, class->backend_name);
+
+	return source;
+}
+
+static void
+mail_config_kolab_backend_insert_widgets (EMailConfigServiceBackend *backend,
+                                          GtkBox *parent)
+{
+	EMailConfigKolabBackendPrivate *priv;
+	CamelProvider *provider;
+	CamelSettings *settings;
+	ESource *source;
+	ESourceBackend *extension;
+	EMailConfigServicePage *page;
+	EMailConfigServicePageClass *class;
+	GtkLabel *label;
+	GtkWidget *widget;
+	GtkWidget *container;
+	const gchar *backend_name;
+	const gchar *extension_name;
+	const gchar *text;
+	gchar *markup;
+
+	priv = E_MAIL_CONFIG_KOLAB_BACKEND_GET_PRIVATE (backend);
+
+	page = e_mail_config_service_backend_get_page (backend);
+	source = e_mail_config_service_backend_get_source (backend);
+	settings = e_mail_config_service_backend_get_settings (backend);
+
+	class = E_MAIL_CONFIG_SERVICE_PAGE_GET_CLASS (page);
+	extension_name = class->extension_name;
+	extension = e_source_get_extension (source, extension_name);
+	backend_name = e_source_backend_get_backend_name (extension);
+
+	text = _("Configuration");
+	markup = g_markup_printf_escaped ("<b>%s</b>", text);
+	widget = gtk_label_new (markup);
+	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
+	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+	g_free (markup);
+
+	widget = gtk_grid_new ();
+	gtk_widget_set_margin_left (widget, 12);
+	gtk_grid_set_row_spacing (GTK_GRID (widget), 6);
+	gtk_grid_set_column_spacing (GTK_GRID (widget), 6);
+	gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = gtk_label_new_with_mnemonic (_("_Server:"));
+	gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5);
+	gtk_grid_attach (GTK_GRID (container), widget, 0, 0, 1, 1);
+	gtk_widget_show (widget);
+
+	label = GTK_LABEL (widget);
+
+	widget = gtk_entry_new ();
+	gtk_widget_set_hexpand (widget, TRUE);
+	gtk_label_set_mnemonic_widget (label, widget);
+	gtk_grid_attach (GTK_GRID (container), widget, 1, 0, 1, 1);
+	priv->host_entry = widget;  /* do not reference */
+	gtk_widget_show (widget);
+
+	widget = gtk_label_new_with_mnemonic (_("_Port:"));
+	gtk_grid_attach (GTK_GRID (container), widget, 2, 0, 1, 1);
+	gtk_widget_show (widget);
+
+	label = GTK_LABEL (widget);
+
+	widget = e_port_entry_new ();
+	gtk_label_set_mnemonic_widget (label, widget);
+	gtk_grid_attach (GTK_GRID (container), widget, 3, 0, 1, 1);
+	priv->port_entry = widget;  /* do not reference */
+	gtk_widget_show (widget);
+
+	widget = gtk_label_new_with_mnemonic (_("User_name:"));
+	gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5);
+	gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1);
+	gtk_widget_show (widget);
+
+	label = GTK_LABEL (widget);
+
+	widget = gtk_entry_new ();
+	gtk_widget_set_hexpand (widget, TRUE);
+	gtk_label_set_mnemonic_widget (label, widget);
+	gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 3, 1);
+	priv->user_entry = widget;  /* do not reference */
+	gtk_widget_show (widget);
+
+	text = _("Security");
+	markup = g_markup_printf_escaped ("<b>%s</b>", text);
+	widget = gtk_label_new (markup);
+	gtk_widget_set_margin_top (widget, 6);
+	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
+	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+	g_free (markup);
+
+	widget = gtk_grid_new ();
+	gtk_widget_set_margin_left (widget, 12);
+	gtk_grid_set_row_spacing (GTK_GRID (widget), 6);
+	gtk_grid_set_column_spacing (GTK_GRID (widget), 6);
+	gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = gtk_label_new_with_mnemonic (_("Encryption _method:"));
+	gtk_grid_attach (GTK_GRID (container), widget, 0, 0, 1, 1);
+	gtk_widget_show (widget);
+
+	label = GTK_LABEL (widget);
+
+	/* The IDs correspond to the CamelNetworkSecurityMethod enum. */
+	widget = gtk_combo_box_text_new ();
+	gtk_combo_box_text_append (
+		GTK_COMBO_BOX_TEXT (widget),
+		"none",
+		_("No encryption"));
+	gtk_combo_box_text_append (
+		GTK_COMBO_BOX_TEXT (widget),
+		"starttls-on-standard-port",
+		_("STARTTLS after connecting"));
+	gtk_combo_box_text_append (
+		GTK_COMBO_BOX_TEXT (widget),
+		"ssl-on-alternate-port",
+		_("SSL on a dedicated port"));
+	gtk_label_set_mnemonic_widget (label, widget);
+	gtk_widget_set_halign (widget, GTK_ALIGN_START);
+	gtk_grid_attach (GTK_GRID (container), widget, 1, 0, 1, 1);
+	priv->security_combo_box = widget;  /* do not reference */
+	gtk_widget_show (widget);
+
+	provider = camel_provider_get (backend_name, NULL);
+	if (provider != NULL && provider->port_entries != NULL)
+		e_port_entry_set_camel_entries (
+			E_PORT_ENTRY (priv->port_entry),
+			provider->port_entries);
+
+	text = _("Authentication");
+	markup = g_markup_printf_escaped ("<b>%s</b>", text);
+	widget = gtk_label_new (markup);
+	gtk_widget_set_margin_top (widget, 6);
+	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
+	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+	g_free (markup);
+
+	widget = e_mail_config_auth_check_new (backend);
+	gtk_widget_set_margin_left (widget, 12);
+	gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0);
+	priv->auth_check = widget;  /* do not reference */
+	gtk_widget_show (widget);
+
+	g_object_bind_property (
+		settings, "host",
+		priv->host_entry, "text",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
+
+	g_object_bind_property_full (
+		settings, "security-method",
+		priv->security_combo_box, "active-id",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE,
+		e_binding_transform_enum_value_to_nick,
+		e_binding_transform_enum_nick_to_value,
+		NULL, (GDestroyNotify) NULL);
+
+	g_object_bind_property (
+		settings, "port",
+		priv->port_entry, "port",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
+
+	g_object_bind_property (
+		settings, "security-method",
+		priv->port_entry, "security-method",
+		G_BINDING_SYNC_CREATE);
+
+	g_object_bind_property (
+		settings, "user",
+		priv->user_entry, "text",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
+
+	/* Don't use G_BINDING_SYNC_CREATE here since the widget
+	 * chooses its initial mechanism more intelligently than
+	 * a simple property binding would. */
+	g_object_bind_property (
+		settings, "auth-mechanism",
+		priv->auth_check, "active-mechanism",
+		G_BINDING_BIDIRECTIONAL);
+}
+
+static gboolean
+mail_config_kolab_backend_check_complete (EMailConfigServiceBackend *backend)
+{
+	EMailConfigKolabBackendPrivate *priv;
+	CamelSettings *settings;
+	CamelNetworkSettings *network_settings;
+	const gchar *host;
+	const gchar *user;
+
+	priv = E_MAIL_CONFIG_KOLAB_BACKEND_GET_PRIVATE (backend);
+
+	settings = e_mail_config_service_backend_get_settings (backend);
+
+	network_settings = CAMEL_NETWORK_SETTINGS (settings);
+	host = camel_network_settings_get_host (network_settings);
+	user = camel_network_settings_get_user (network_settings);
+
+	if (host == NULL || *host == '\0')
+		return FALSE;
+
+	if (!e_port_entry_is_valid (E_PORT_ENTRY (priv->port_entry)))
+		return FALSE;
+
+	if (user == NULL || *user == '\0')
+		return FALSE;
+
+	return TRUE;
+}
+
+static void
+mail_config_kolab_backend_commit_changes (EMailConfigServiceBackend *backend)
+{
+	/* All CamelNetworkSettings properties are already up-to-date,
+	 * and these properties are bound to ESourceExtension properties,
+	 * so nothing to do here. */
+}
+
+static void
+e_mail_config_kolab_backend_class_init (EMailConfigKolabBackendClass *class)
+{
+	EMailConfigServiceBackendClass *backend_class;
+
+	g_type_class_add_private (class, sizeof (EMailConfigKolabBackendPrivate));
+
+	backend_class = E_MAIL_CONFIG_SERVICE_BACKEND_CLASS (class);
+	backend_class->backend_name = KOLAB_CAMEL_PROVIDER_PROTOCOL;
+	backend_class->new_collection = mail_config_kolab_backend_new_collection;
+	backend_class->insert_widgets = mail_config_kolab_backend_insert_widgets;
+	backend_class->check_complete = mail_config_kolab_backend_check_complete;
+	backend_class->commit_changes = mail_config_kolab_backend_commit_changes;
+}
+
+static void
+e_mail_config_kolab_backend_class_finalize (EMailConfigKolabBackendClass *class)
+{
+}
+
+static void
+e_mail_config_kolab_backend_init (EMailConfigKolabBackend *backend)
+{
+	backend->priv = E_MAIL_CONFIG_KOLAB_BACKEND_GET_PRIVATE (backend);
+}
+
+void
+e_mail_config_kolab_backend_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_mail_config_kolab_backend_register_type (type_module);
+}
+
diff --git a/src/configuration/e-mail-config-kolab-backend.h b/src/configuration/e-mail-config-kolab-backend.h
new file mode 100644
index 0000000..d8c2545
--- /dev/null
+++ b/src/configuration/e-mail-config-kolab-backend.h
@@ -0,0 +1,64 @@
+/*
+ * 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.1 of the License, or (at your option) any later version.
+ *
+ * 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
+
+#ifndef E_MAIL_CONFIG_KOLAB_BACKEND_H
+#define E_MAIL_CONFIG_KOLAB_BACKEND_H
+
+#include <mail/e-mail-config-service-backend.h>
+
+/* Standard GObject macros */
+#define E_TYPE_MAIL_CONFIG_KOLAB_BACKEND \
+	(e_mail_config_kolab_backend_get_type ())
+#define E_MAIL_CONFIG_KOLAB_BACKEND(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_MAIL_CONFIG_KOLAB_BACKEND, EMailConfigKolabBackend))
+#define E_MAIL_CONFIG_KOLAB_BACKEND_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_MAIL_CONFIG_KOLAB_BACKEND, EMailConfigKolabBackendClass))
+#define E_IS_MAIL_CONFIG_KOLAB_BACKEND(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_MAIL_CONFIG_KOLAB_BACKEND))
+#define E_IS_MAIL_CONFIG_KOLAB_BACKEND_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_MAIL_CONFIG_KOLAB_BACKEND))
+#define E_MAIL_CONFIG_KOLAB_BACKEND_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_MAIL_CONFIG_KOLAB_BACKEND, EMailConfigKolabBackendClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EMailConfigKolabBackend EMailConfigKolabBackend;
+typedef struct _EMailConfigKolabBackendClass EMailConfigKolabBackendClass;
+typedef struct _EMailConfigKolabBackendPrivate EMailConfigKolabBackendPrivate;
+
+struct _EMailConfigKolabBackend {
+	EMailConfigServiceBackend parent;
+	EMailConfigKolabBackendPrivate *priv;
+};
+
+struct _EMailConfigKolabBackendClass {
+	EMailConfigServiceBackendClass parent_class;
+};
+
+GType		e_mail_config_kolab_backend_get_type
+						(void) G_GNUC_CONST;
+void		e_mail_config_kolab_backend_type_register
+						(GTypeModule *type_module);
+
+G_END_DECLS
+
+#endif /* E_MAIL_CONFIG_KOLAB_BACKEND_H */
+
diff --git a/src/configuration/module-kolab-configuration.c b/src/configuration/module-kolab-configuration.c
new file mode 100644
index 0000000..62362b2
--- /dev/null
+++ b/src/configuration/module-kolab-configuration.c
@@ -0,0 +1,33 @@
+/*
+ * 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.1 of the License, or (at your option) any later version.
+ *
+ * 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
+
+#include "e-mail-config-kolab-backend.h"
+
+/* Module Entry Points */
+void e_module_load (GTypeModule *type_module);
+void e_module_unload (GTypeModule *type_module);
+
+G_MODULE_EXPORT void
+e_module_load (GTypeModule *type_module)
+{
+	e_mail_config_kolab_backend_type_register (type_module);
+}
+
+G_MODULE_EXPORT void
+e_module_unload (GTypeModule *type_module)
+{
+}
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]