Adapt addressbook to EShellBackend changes.

Builds, but not tested.  Use as a reference for other backends.

13 files changed, 190 insertions, 188 deletions

diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 1efdb341f3..4f89f823c7 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -29,12 +29,12 @@ libevolution_module_contacts_la_SOURCES = 	\
 	autocompletion-config.h		\
 	eab-composer-util.c		\
 	eab-composer-util.h		\
+	e-book-shell-backend.c		\
+	e-book-shell-backend.h		\
 	e-book-shell-content.c		\
 	e-book-shell-content.h		\
-	e-book-shell-module.c		\
-	e-book-shell-module.h		\
-	e-book-shell-module-migrate.c	\
-	e-book-shell-module-migrate.h	\
+	e-book-shell-migrate.c		\
+	e-book-shell-migrate.h		\
 	e-book-shell-sidebar.c		\
 	e-book-shell-sidebar.h		\
 	e-book-shell-view.c		\
diff --git a/addressbook/gui/component/e-book-shell-module.c b/addressbook/gui/component/e-book-shell-backend.c
index 03b2496dba..0e2cddc85f 100644
--- a/addressbook/gui/component/e-book-shell-module.c
+++ b/addressbook/gui/component/e-book-shell-backend.c
@@ -1,5 +1,5 @@
 /*
- * e-book-shell-module.c
+ * e-book-shell-backend.c
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,7 @@
  *
  */
 
-#include "e-book-shell-module.h"
+#include "e-book-shell-backend.h"
 
 #include <config.h>
 
@@ -43,39 +43,39 @@
 #include <addressbook-config.h>
 #include <autocompletion-config.h>
 
+#include "e-book-shell-migrate.h"
 #include "e-book-shell-view.h"
-#include "e-book-shell-module-migrate.h"
 
 #ifdef ENABLE_SMIME
 #include "smime/gui/component.h"
 #include "smime/gui/certificate-manager.h"
 #endif
 
-#define E_BOOK_SHELL_MODULE_GET_PRIVATE(obj) \
+#define E_BOOK_SHELL_BACKEND_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_BOOK_SHELL_MODULE, EBookShellModulePrivate))
+	((obj), E_TYPE_BOOK_SHELL_BACKEND, EBookShellBackendPrivate))
 
 #define LDAP_BASE_URI		"ldap://"
 #define PERSONAL_RELATIVE_URI	"system"
 
-struct _EBookShellModulePrivate {
+struct _EBookShellBackendPrivate {
 	ESourceList *source_list;
 };
 
 /* Module Entry Points */
-void e_shell_load (GTypeModule *type_module);
-void e_shell_unload (GTypeModule *type_module);
+void e_module_load (GTypeModule *type_module);
+void e_module_unload (GTypeModule *type_module);
 
-GType e_book_shell_module_type = 0;
+GType e_book_shell_backend_type = 0;
 static gpointer parent_class;
 
 static void
-book_module_ensure_sources (EShellModule *shell_module)
+book_shell_backend_ensure_sources (EShellBackend *shell_backend)
 {
-	/* XXX This is basically the same algorithm across all modules.
-	 *     Maybe we could somehow integrate this into EShellModule? */
+	/* XXX This is basically the same algorithm across all backends.
+	 *     Maybe we could somehow integrate this into EShellBackend? */
 
-	EBookShellModulePrivate *priv;
+	EBookShellBackendPrivate *priv;
 	ESourceGroup *on_this_computer;
 	ESourceGroup *on_ldap_servers;
 	ESource *personal;
@@ -89,14 +89,14 @@ book_module_ensure_sources (EShellModule *shell_module)
 	on_ldap_servers = NULL;
 	personal = NULL;
 
-	priv = E_BOOK_SHELL_MODULE_GET_PRIVATE (shell_module);
+	priv = E_BOOK_SHELL_BACKEND_GET_PRIVATE (shell_backend);
 
 	if (!e_book_get_addressbooks (&priv->source_list, NULL)) {
 		g_warning ("Could not get addressbook sources from GConf!");
 		return;
 	}
 
-	data_dir = e_shell_module_get_data_dir (shell_module);
+	data_dir = e_shell_backend_get_data_dir (shell_backend);
 	filename = g_build_filename (data_dir, "local", NULL);
 	base_uri = g_filename_to_uri (filename, NULL, NULL);
 	g_free (filename);
@@ -201,7 +201,7 @@ book_module_ensure_sources (EShellModule *shell_module)
 }
 
 static void
-book_module_init_importers (void)
+book_shell_backend_init_importers (void)
 {
 	EImportClass *import_class;
 	EImportImporter *importer;
@@ -225,9 +225,9 @@ book_module_init_importers (void)
 }
 
 static void
-book_module_book_loaded_cb (EBook *book,
-                            EBookStatus status,
-                            gpointer user_data)
+book_shell_backend_book_loaded_cb (EBook *book,
+                                   EBookStatus status,
+                                   gpointer user_data)
 {
 	EContact *contact;
 	GtkAction *action;
@@ -290,7 +290,8 @@ action_contact_new_cb (GtkAction *action,
 	if (book == NULL)
 		book = e_book_new_default_addressbook (NULL);
 
-	e_book_async_open (book, FALSE, book_module_book_loaded_cb, action);
+	e_book_async_open (
+		book, FALSE, book_shell_backend_book_loaded_cb, action);
 }
 
 static void
@@ -328,8 +329,8 @@ static GtkActionEntry source_entries[] = {
 };
 
 static gboolean
-book_module_handle_uri_cb (EShellModule *shell_module,
-                           const gchar *uri)
+book_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
+                                  const gchar *uri)
 {
 	EUri *euri;
 	const gchar *cp;
@@ -394,31 +395,31 @@ book_module_handle_uri_cb (EShellModule *shell_module,
 }
 
 static void
-book_module_window_created_cb (EShellModule *shell_module,
-                               GtkWindow *window)
+book_shell_backend_window_created_cb (EShellBackend *shell_backend,
+                                      GtkWindow *window)
 {
-	const gchar *module_name;
+	const gchar *backend_name;
 
 	if (!E_IS_SHELL_WINDOW (window))
 		return;
 
-	module_name = G_TYPE_MODULE (shell_module)->name;
+	backend_name = E_SHELL_BACKEND_GET_CLASS (shell_backend)->name;
 
 	e_shell_window_register_new_item_actions (
-		E_SHELL_WINDOW (window), module_name,
+		E_SHELL_WINDOW (window), backend_name,
 		item_entries, G_N_ELEMENTS (item_entries));
 
 	e_shell_window_register_new_source_actions (
-		E_SHELL_WINDOW (window), module_name,
+		E_SHELL_WINDOW (window), backend_name,
 		source_entries, G_N_ELEMENTS (source_entries));
 }
 
 static void
-book_shell_module_dispose (GObject *object)
+book_shell_backend_dispose (GObject *object)
 {
-	EBookShellModulePrivate *priv;
+	EBookShellBackendPrivate *priv;
 
-	priv = E_BOOK_SHELL_MODULE_GET_PRIVATE (object);
+	priv = E_BOOK_SHELL_BACKEND_GET_PRIVATE (object);
 
 	if (priv->source_list != NULL) {
 		g_object_unref (priv->source_list);
@@ -430,13 +431,13 @@ book_shell_module_dispose (GObject *object)
 }
 
 static void
-book_shell_module_constructed (GObject *object)
+book_shell_backend_constructed (GObject *object)
 {
 	EShell *shell;
-	EShellModule *shell_module;
+	EShellBackend *shell_backend;
 
-	shell_module = E_SHELL_MODULE (object);
-	shell = e_shell_module_get_shell (shell_module);
+	shell_backend = E_SHELL_BACKEND (object);
+	shell = e_shell_backend_get_shell (shell_backend);
 
 	/* XXX Why is this here?  Address books aren't the only
 	 *     things that use S/MIME.  Maybe put it in EShell? */
@@ -445,107 +446,109 @@ book_shell_module_constructed (GObject *object)
 	certificate_manager_config_init (shell);
 #endif
 
-	book_module_init_importers ();
-	book_module_ensure_sources (shell_module);
+	book_shell_backend_init_importers ();
+	book_shell_backend_ensure_sources (shell_backend);
 
 	e_plugin_hook_register_type (eab_config_get_type ());
 
 	g_signal_connect_swapped (
 		shell, "handle-uri",
-		G_CALLBACK (book_module_handle_uri_cb), shell_module);
+		G_CALLBACK (book_shell_backend_handle_uri_cb),
+		shell_backend);
 
 	g_signal_connect_swapped (
 		shell, "window-created",
-		G_CALLBACK (book_module_window_created_cb), shell_module);
+		G_CALLBACK (book_shell_backend_window_created_cb),
+		shell_backend);
 
 	autocompletion_config_init (shell);
 }
 
 static gboolean
-book_shell_module_is_busy (EShellModule *shell_module)
+book_shell_backend_is_busy (EShellBackend *shell_backend)
 {
 	return !eab_editor_request_close_all ();
 }
 
 static gboolean
-book_shell_module_shutdown (EShellModule *shell_module)
+book_shell_backend_shutdown (EShellBackend *shell_backend)
 {
 	/* FIXME */
 	return TRUE;
 }
 
 static void
-book_shell_module_class_init (EBookShellModuleClass *class)
+book_shell_backend_class_init (EBookShellBackendClass *class)
 {
 	GObjectClass *object_class;
-	EShellModuleClass *shell_module_class;
+	EShellBackendClass *shell_backend_class;
 
 	parent_class = g_type_class_peek_parent (class);
-	g_type_class_add_private (class, sizeof (EBookShellModulePrivate));
+	g_type_class_add_private (class, sizeof (EBookShellBackendPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose = book_shell_module_dispose;
-	object_class->constructed = book_shell_module_constructed;
-
-	shell_module_class = E_SHELL_MODULE_CLASS (class);
-	shell_module_class->name = "addressbook";
-	shell_module_class->aliases = "contacts";
-	shell_module_class->schemes = "";
-	shell_module_class->sort_order = 300;
-	shell_module_class->view_type = E_TYPE_BOOK_SHELL_VIEW;
-	shell_module_class->start = NULL;
-	shell_module_class->is_busy = book_shell_module_is_busy;
-	shell_module_class->shutdown = book_shell_module_shutdown;
-	shell_module_class->migrate = e_book_shell_module_migrate;
+	object_class->dispose = book_shell_backend_dispose;
+	object_class->constructed = book_shell_backend_constructed;
+
+	shell_backend_class = E_SHELL_BACKEND_CLASS (class);
+	shell_backend_class->name = "addressbook";
+	shell_backend_class->aliases = "contacts";
+	shell_backend_class->schemes = "";
+	shell_backend_class->sort_order = 300;
+	shell_backend_class->view_type = E_TYPE_BOOK_SHELL_VIEW;
+	shell_backend_class->start = NULL;
+	shell_backend_class->is_busy = book_shell_backend_is_busy;
+	shell_backend_class->shutdown = book_shell_backend_shutdown;
+	shell_backend_class->migrate = e_book_shell_backend_migrate;
 }
 
 static void
-book_shell_module_init (EBookShellModule *book_shell_module)
+book_shell_backend_init (EBookShellBackend *book_shell_backend)
 {
-	book_shell_module->priv =
-		E_BOOK_SHELL_MODULE_GET_PRIVATE (book_shell_module);
+	book_shell_backend->priv =
+		E_BOOK_SHELL_BACKEND_GET_PRIVATE (book_shell_backend);
 }
 
 GType
-e_book_shell_module_get_type (GTypeModule *type_module)
+e_book_shell_backend_get_type (GTypeModule *type_module)
 {
-	if (e_book_shell_module_type == 0) {
+	if (e_book_shell_backend_type == 0) {
 		const GTypeInfo type_info = {
-			sizeof (EBookShellModuleClass),
+			sizeof (EBookShellBackendClass),
 			(GBaseInitFunc) NULL,
 			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) book_shell_module_class_init,
+			(GClassInitFunc) book_shell_backend_class_init,
 			(GClassFinalizeFunc) NULL,
 			NULL,  /* class_data */
-			sizeof (EBookShellModule),
+			sizeof (EBookShellBackend),
 			0,     /* n_preallocs */
-			(GInstanceInitFunc) book_shell_module_init,
+			(GInstanceInitFunc) book_shell_backend_init,
 			NULL   /* value_table */
 		};
 
-		e_book_shell_module_type =
+		e_book_shell_backend_type =
 			g_type_module_register_type (
-				type_module, E_TYPE_SHELL_MODULE,
-				"EBookShellModule", &type_info, 0);
+				type_module, E_TYPE_SHELL_BACKEND,
+				"EBookShellBackend", &type_info, 0);
 	}
 
-	return e_book_shell_module_type;
+	return e_book_shell_backend_type;
 }
 
 ESourceList *
-e_book_shell_module_get_source_list (EBookShellModule *book_shell_module)
+e_book_shell_backend_get_source_list (EBookShellBackend *book_shell_backend)
 {
 	g_return_val_if_fail (
-		E_IS_BOOK_SHELL_MODULE (book_shell_module), NULL);
+		E_IS_BOOK_SHELL_BACKEND (book_shell_backend), NULL);
 
-	return book_shell_module->priv->source_list;
+	return book_shell_backend->priv->source_list;
 }
 
 void
 e_module_load (GTypeModule *type_module)
 {
 	e_book_shell_view_get_type (type_module);
-	e_book_shell_module_get_type (type_module);
+	e_book_shell_backend_get_type (type_module);
 }
 
 void
diff --git a/addressbook/gui/component/e-book-shell-backend.h b/addressbook/gui/component/e-book-shell-backend.h
new file mode 100644
index 0000000000..9a5e744ae2
--- /dev/null
+++ b/addressbook/gui/component/e-book-shell-backend.h
@@ -0,0 +1,71 @@
+/*
+ * e-book-shell-backend.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/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef E_BOOK_SHELL_BACKEND_H
+#define E_BOOK_SHELL_BACKEND_H
+
+#include <shell/e-shell-backend.h>
+#include <libedataserver/e-source-list.h>
+
+/* Standard GObject macros */
+#define E_TYPE_BOOK_SHELL_BACKEND \
+	(e_book_shell_backend_type)
+#define E_BOOK_SHELL_BACKEND(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_BOOK_SHELL_BACKEND, EBookShellBackend))
+#define E_BOOK_SHELL_BACKEND_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_BOOK_SHELL_BACKEND, EBookShellBackendClass))
+#define E_IS_BOOK_SHELL_BACKEND(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_BOOK_SHELL_BACKEND))
+#define E_IS_BOOK_SHELL_BACKEND_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_BOOK_SHELL_BACKEND))
+#define E_BOOK_SHELL_BACKEND_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_BOOK_SHELL_BACKEND, EBookShellBackendClass))
+
+G_BEGIN_DECLS
+
+extern GType e_book_shell_backend_type;
+
+typedef struct _EBookShellBackend EBookShellBackend;
+typedef struct _EBookShellBackendClass EBookShellBackendClass;
+typedef struct _EBookShellBackendPrivate EBookShellBackendPrivate;
+
+struct _EBookShellBackend {
+	EShellBackend parent;
+	EBookShellBackendPrivate *priv;
+};
+
+struct _EBookShellBackendClass {
+	EShellBackendClass parent_class;
+};
+
+GType		e_book_shell_backend_get_type
+					(GTypeModule *type_module);
+ESourceList *	e_book_shell_backend_get_source_list
+					(EBookShellBackend *book_shell_backend);
+
+G_END_DECLS
+
+#endif /* E_BOOK_SHELL_BACKEND_H */
diff --git a/addressbook/gui/component/e-book-shell-module-migrate.c b/addressbook/gui/component/e-book-shell-migrate.c
index e4e2c04098..2b775fd95e 100644
--- a/addressbook/gui/component/e-book-shell-module-migrate.c
+++ b/addressbook/gui/component/e-book-shell-migrate.c
@@ -47,7 +47,7 @@
 #include "e-util/e-xml-utils.h"
 #include "e-util/e-folder-map.h"
 
-#include "e-book-shell-module-migrate.h"
+#include "e-book-shell-migrate.h"
 
 /*#define SLOW_MIGRATION*/
 
@@ -1112,11 +1112,11 @@ migration_context_free (MigrationContext *context)
 }
 
 gboolean
-e_book_shell_module_migrate (EShellModule *shell_module,
-                             gint major,
-                             gint minor,
-                             gint micro,
-                             GError **error)
+e_book_shell_backend_migrate (EShellBackend *shell_backend,
+                              gint major,
+                              gint minor,
+                              gint micro,
+                              GError **error)
 {
 	ESourceGroup *on_this_computer;
 	ESourceGroup *on_ldap_servers;
@@ -1125,9 +1125,9 @@ e_book_shell_module_migrate (EShellModule *shell_module,
 	gboolean need_dialog = FALSE;
 	const gchar *data_dir;
 
-	g_return_val_if_fail (E_IS_SHELL_MODULE (shell_module), FALSE);
+	g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), FALSE);
 
-	data_dir = e_shell_module_get_data_dir (shell_module);
+	data_dir = e_shell_backend_get_data_dir (shell_backend);
 	context = migration_context_new (data_dir);
 
 	/* we call this unconditionally now - create_groups either
diff --git a/addressbook/gui/component/e-book-shell-module-migrate.h b/addressbook/gui/component/e-book-shell-migrate.h
index 8e19c73989..f631ef6a50 100644
--- a/addressbook/gui/component/e-book-shell-module-migrate.h
+++ b/addressbook/gui/component/e-book-shell-migrate.h
@@ -1,5 +1,5 @@
 /*
- * e-book-shell-module-migrate.h
+ * e-book-shell-migrate.h
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,15 +22,15 @@
  *
  */
 
-#ifndef E_BOOK_SHELL_MODULE_MIGRATE_H
-#define E_BOOK_SHELL_MODULE_MIGRATE_H
+#ifndef E_BOOK_SHELL_MIGRATE_H
+#define E_BOOK_SHELL_MIGRATE_H
 
 #include <glib.h>
-#include <shell/e-shell-module.h>
+#include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
 
-gboolean	e_book_shell_module_migrate	(EShellModule *shell_module,
+gboolean	e_book_shell_backend_migrate	(EShellBackend *shell_backend,
 						 gint major,
 						 gint minor,
 						 gint micro,
@@ -38,4 +38,4 @@ gboolean	e_book_shell_module_migrate	(EShellModule *shell_module,
 
 G_END_DECLS
 
-#endif /* E_BOOK_SHELL_MODULE_MIGRATE_H */
+#endif /* E_BOOK_SHELL_MIGRATE_H */
diff --git a/addressbook/gui/component/e-book-shell-module.h b/addressbook/gui/component/e-book-shell-module.h
deleted file mode 100644
index 4a0088a557..0000000000
--- a/addressbook/gui/component/e-book-shell-module.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * e-book-shell-module.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/>  
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef E_BOOK_SHELL_MODULE_H
-#define E_BOOK_SHELL_MODULE_H
-
-#include <shell/e-shell-module.h>
-#include <libedataserver/e-source-list.h>
-
-/* Standard GObject macros */
-#define E_TYPE_BOOK_SHELL_MODULE \
-	(e_book_shell_module_type)
-#define E_BOOK_SHELL_MODULE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_BOOK_SHELL_MODULE, EBookShellModule))
-#define E_BOOK_SHELL_MODULE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_BOOK_SHELL_MODULE, EBookShellModuleClass))
-#define E_IS_BOOK_SHELL_MODULE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_BOOK_SHELL_MODULE))
-#define E_IS_BOOK_SHELL_MODULE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_BOOK_SHELL_MODULE))
-#define E_BOOK_SHELL_MODULE_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_BOOK_SHELL_MODULE, EBookShellModuleClass))
-
-G_BEGIN_DECLS
-
-extern GType e_book_shell_module_type;
-
-typedef struct _EBookShellModule EBookShellModule;
-typedef struct _EBookShellModuleClass EBookShellModuleClass;
-typedef struct _EBookShellModulePrivate EBookShellModulePrivate;
-
-struct _EBookShellModule {
-	EShellModule parent;
-	EBookShellModulePrivate *priv;
-};
-
-struct _EBookShellModuleClass {
-	EShellModuleClass parent_class;
-};
-
-GType		e_book_shell_module_get_type
-					(GTypeModule *type_module);
-ESourceList *	e_book_shell_module_get_source_list
-					(EBookShellModule *book_shell_module);
-
-G_END_DECLS
-
-#endif /* E_BOOK_SHELL_MODULE_H */
diff --git a/addressbook/gui/component/e-book-shell-sidebar.c b/addressbook/gui/component/e-book-shell-sidebar.c
index d7e121e110..fc45f3367c 100644
--- a/addressbook/gui/component/e-book-shell-sidebar.c
+++ b/addressbook/gui/component/e-book-shell-sidebar.c
@@ -25,7 +25,7 @@
 #include <glib/gi18n.h>
 
 #include "e-book-shell-view.h"
-#include "e-book-shell-module.h"
+#include "e-book-shell-backend.h"
 #include "e-addressbook-selector.h"
 
 #define E_BOOK_SHELL_SIDEBAR_GET_PRIVATE(obj) \
@@ -81,9 +81,9 @@ book_shell_sidebar_constructed (GObject *object)
 {
 	EBookShellSidebarPrivate *priv;
 	EShellView *shell_view;
-	EShellModule *shell_module;
+	EShellBackend *shell_backend;
 	EShellSidebar *shell_sidebar;
-	EBookShellModule *book_shell_module;
+	EBookShellBackend *book_shell_backend;
 	ESourceList *source_list;
 	GtkContainer *container;
 	GtkWidget *widget;
@@ -95,9 +95,9 @@ book_shell_sidebar_constructed (GObject *object)
 
 	shell_sidebar = E_SHELL_SIDEBAR (object);
 	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
-	shell_module = e_shell_view_get_shell_module (shell_view);
-	book_shell_module = E_BOOK_SHELL_MODULE (shell_module);
-	source_list = e_book_shell_module_get_source_list (book_shell_module);
+	shell_backend = e_shell_view_get_shell_backend (shell_view);
+	book_shell_backend = E_BOOK_SHELL_BACKEND (shell_backend);
+	source_list = e_book_shell_backend_get_source_list (book_shell_backend);
 
 	container = GTK_CONTAINER (shell_sidebar);
 
diff --git a/addressbook/gui/component/e-book-shell-view-actions.c b/addressbook/gui/component/e-book-shell-view-actions.c
index 4241c1f73e..918ff57e9f 100644
--- a/addressbook/gui/component/e-book-shell-view-actions.c
+++ b/addressbook/gui/component/e-book-shell-view-actions.c
@@ -47,7 +47,7 @@ action_address_book_delete_cb (GtkAction *action,
 {
 	EShellView *shell_view;
 	EShellWindow *shell_window;
-	EBookShellModule *book_shell_module;
+	EBookShellBackend *book_shell_backend;
 	EBookShellSidebar *book_shell_sidebar;
 	ESource *source;
 	ESourceSelector *selector;
@@ -60,8 +60,8 @@ action_address_book_delete_cb (GtkAction *action,
 	shell_view = E_SHELL_VIEW (book_shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
-	book_shell_module = book_shell_view->priv->book_shell_module;
-	source_list = e_book_shell_module_get_source_list (book_shell_module);
+	book_shell_backend = book_shell_view->priv->book_shell_backend;
+	source_list = e_book_shell_backend_get_source_list (book_shell_backend);
 
 	book_shell_sidebar = book_shell_view->priv->book_shell_sidebar;
 	selector = e_book_shell_sidebar_get_selector (book_shell_sidebar);
diff --git a/addressbook/gui/component/e-book-shell-view-private.c b/addressbook/gui/component/e-book-shell-view-private.c
index 1fe372a05b..5f9bb4c5db 100644
--- a/addressbook/gui/component/e-book-shell-view-private.c
+++ b/addressbook/gui/component/e-book-shell-view-private.c
@@ -402,7 +402,6 @@ e_book_shell_view_private_init (EBookShellView *book_shell_view,
 	EBookShellViewPrivate *priv = book_shell_view->priv;
 	GHashTable *uid_to_view;
 	GHashTable *uid_to_editor;
-	GObject *object;
 
 	uid_to_view = g_hash_table_new_full (
 		g_str_hash, g_str_equal,
@@ -431,13 +430,13 @@ e_book_shell_view_private_constructed (EBookShellView *book_shell_view)
 	EBookShellViewPrivate *priv = book_shell_view->priv;
 	EShellContent *shell_content;
 	EShellSidebar *shell_sidebar;
-	EShellModule *shell_module;
+	EShellBackend *shell_backend;
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	ESourceSelector *selector;
 
 	shell_view = E_SHELL_VIEW (book_shell_view);
-	shell_module = e_shell_view_get_shell_module (shell_view);
+	shell_backend = e_shell_view_get_shell_backend (shell_view);
 	shell_content = e_shell_view_get_shell_content (shell_view);
 	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
@@ -446,7 +445,7 @@ e_book_shell_view_private_constructed (EBookShellView *book_shell_view)
 	e_shell_window_add_action_group (shell_window, "contacts-filter");
 
 	/* Cache these to avoid lots of awkward casting. */
-	priv->book_shell_module = g_object_ref (shell_module);
+	priv->book_shell_backend = g_object_ref (shell_backend);
 	priv->book_shell_content = g_object_ref (shell_content);
 	priv->book_shell_sidebar = g_object_ref (shell_sidebar);
 
@@ -487,7 +486,7 @@ e_book_shell_view_private_dispose (EBookShellView *book_shell_view)
 {
 	EBookShellViewPrivate *priv = book_shell_view->priv;
 
-	DISPOSE (priv->book_shell_module);
+	DISPOSE (priv->book_shell_backend);
 	DISPOSE (priv->book_shell_content);
 	DISPOSE (priv->book_shell_sidebar);
 
diff --git a/addressbook/gui/component/e-book-shell-view-private.h b/addressbook/gui/component/e-book-shell-view-private.h
index 9be603e6d4..f93b720ccc 100644
--- a/addressbook/gui/component/e-book-shell-view-private.h
+++ b/addressbook/gui/component/e-book-shell-view-private.h
@@ -43,7 +43,7 @@
 #include "addressbook/gui/widgets/e-addressbook-view.h"
 #include "addressbook/gui/widgets/e-addressbook-selector.h"
 
-#include "e-book-shell-module.h"
+#include "e-book-shell-backend.h"
 #include "e-book-shell-content.h"
 #include "e-book-shell-sidebar.h"
 #include "e-book-shell-view-actions.h"
@@ -94,7 +94,7 @@ enum {
 struct _EBookShellViewPrivate {
 
 	/* These are just for convenience. */
-	EBookShellModule *book_shell_module;
+	EBookShellBackend *book_shell_backend;
 	EBookShellContent *book_shell_content;
 	EBookShellSidebar *book_shell_sidebar;
 
diff --git a/addressbook/gui/component/e-book-shell-view.c b/addressbook/gui/component/e-book-shell-view.c
index 9a6736b178..7520c1e304 100644
--- a/addressbook/gui/component/e-book-shell-view.c
+++ b/addressbook/gui/component/e-book-shell-view.c
@@ -102,7 +102,7 @@ static void
 book_shell_view_constructed (GObject *object)
 {
 	EBookShellView *book_shell_view;
-	EBookShellModule *book_shell_module;
+	EBookShellBackend *book_shell_backend;
 	ESourceList *source_list;
 
 	/* Chain up to parent's constructed() method. */
@@ -111,8 +111,8 @@ book_shell_view_constructed (GObject *object)
 	book_shell_view = E_BOOK_SHELL_VIEW (object);
 	e_book_shell_view_private_constructed (book_shell_view);
 
-	book_shell_module = book_shell_view->priv->book_shell_module;
-	source_list = e_book_shell_module_get_source_list (book_shell_module);
+	book_shell_backend = book_shell_view->priv->book_shell_backend;
+	source_list = e_book_shell_backend_get_source_list (book_shell_backend);
 
 	g_signal_connect_swapped (
 		source_list, "changed",
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index a979e5a1cb..7131a61005 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -910,11 +910,11 @@ status_message (EAddressbookView *view,
 {
 	EActivity *activity;
 	EShellView *shell_view;
-	EShellModule *shell_module;
+	EShellBackend *shell_backend;
 
 	activity = view->priv->activity;
 	shell_view = e_addressbook_view_get_shell_view (view);
-	shell_module = e_shell_view_get_shell_module (shell_view);
+	shell_backend = e_shell_view_get_shell_backend (shell_view);
 
 	if (status == NULL || *status == '\0') {
 		if (activity != NULL) {
@@ -926,7 +926,7 @@ status_message (EAddressbookView *view,
 	} else if (activity == NULL) {
 		activity = e_activity_new (status);
 		view->priv->activity = activity;
-		e_shell_module_add_activity (shell_module, activity);
+		e_shell_backend_add_activity (shell_backend, activity);
 
 	} else
 		e_activity_set_primary_text (activity, status);
diff --git a/mail/message-list.h b/mail/message-list.h
index 0876d93d05..bf48f40458 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -29,7 +29,7 @@
 #include <table/e-tree-scrolled.h>
 
 #include <camel/camel-folder.h>
-#include <shell/e-shell-module.h>
+#include <shell/e-shell-backend.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -187,8 +187,8 @@ typedef enum {
 } MessageListSelectDirection;
 
 GType          message_list_get_type   (void);
-GtkWidget     *message_list_new        (EShellModule *shell_module);
-EShellModule  *message_list_get_shell_module (MessageList *message_list);
+GtkWidget     *message_list_new        (EShellBackend *shell_backend);
+EShellBackend  *message_list_get_shell_backend (MessageList *message_list);
 void           message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, const char *uri, gboolean outgoing);
 
 void	       message_list_freeze(MessageList *ml);