Fix bugs caused by EShellBackend changes.

3 files changed, 8 insertions, 8 deletions

diff --git a/calendar/modules/e-cal-shell-backend.c b/calendar/modules/e-cal-shell-backend.c
index d5b3ac7725..c6d84f0cf0 100644
--- a/calendar/modules/e-cal-shell-backend.c
+++ b/calendar/modules/e-cal-shell-backend.c
@@ -498,7 +498,7 @@ cal_shell_backend_init_preferences (EShell *shell)
 
 static gboolean
 cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
-                                const gchar *uri)
+                                 const gchar *uri)
 {
 	/* FIXME */
 	return FALSE;
@@ -506,14 +506,14 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
 
 static void
 cal_shell_backend_window_created_cb (EShellBackend *shell_backend,
-                                    GtkWindow *window)
+                                     GtkWindow *window)
 {
 	const gchar *backend_name;
 
 	if (!E_IS_SHELL_WINDOW (window))
 		return;
 
-	backend_name = G_TYPE_MODULE (shell_backend)->name;
+	backend_name = E_SHELL_BACKEND_GET_CLASS (shell_backend)->name;
 
 	e_shell_window_register_new_item_actions (
 		E_SHELL_WINDOW (window), backend_name,
@@ -605,11 +605,11 @@ cal_shell_backend_class_init (ECalShellBackendClass *class)
 	object_class->constructed = cal_shell_backend_constructed;
 
 	shell_backend_class = E_SHELL_BACKEND_CLASS (class);
+	shell_backend_class->shell_view_type = E_TYPE_CAL_SHELL_VIEW;
 	shell_backend_class->name = "calendar";
 	shell_backend_class->aliases = "";
 	shell_backend_class->schemes = "calendar";
 	shell_backend_class->sort_order = 400;
-	shell_backend_class->view_type = E_TYPE_CAL_SHELL_VIEW;
 	shell_backend_class->start = NULL;
 	shell_backend_class->is_busy = NULL;
 	shell_backend_class->shutdown = NULL;
diff --git a/calendar/modules/e-memo-shell-backend.c b/calendar/modules/e-memo-shell-backend.c
index e91399af24..130b41839a 100644
--- a/calendar/modules/e-memo-shell-backend.c
+++ b/calendar/modules/e-memo-shell-backend.c
@@ -481,7 +481,7 @@ memo_module_window_created_cb (EShellBackend *shell_backend,
 	if (!E_IS_SHELL_WINDOW (window))
 		return;
 
-	module_name = G_TYPE_MODULE (shell_backend)->name;
+	module_name = E_SHELL_BACKEND_GET_CLASS (shell_backend)->name;
 
 	e_shell_window_register_new_item_actions (
 		E_SHELL_WINDOW (window), module_name,
@@ -561,11 +561,11 @@ memo_shell_backend_class_init (EMemoShellBackendClass *class)
 	object_class->constructed = memo_shell_backend_constructed;
 
 	shell_backend_class = E_SHELL_BACKEND_CLASS (class);
+	shell_backend_class->shell_view_type = E_TYPE_MEMO_SHELL_VIEW;
 	shell_backend_class->name = "memos";
 	shell_backend_class->aliases = "";
 	shell_backend_class->schemes = "memo";
 	shell_backend_class->sort_order = 500;
-	shell_backend_class->view_type = E_TYPE_MEMO_SHELL_VIEW;
 	shell_backend_class->start = NULL;
 	shell_backend_class->is_busy = NULL;
 	shell_backend_class->shutdown = NULL;
diff --git a/calendar/modules/e-task-shell-backend.c b/calendar/modules/e-task-shell-backend.c
index 6a89a27938..3298764df3 100644
--- a/calendar/modules/e-task-shell-backend.c
+++ b/calendar/modules/e-task-shell-backend.c
@@ -487,7 +487,7 @@ task_module_window_created_cb (EShellBackend *shell_backend,
 	if (!E_IS_SHELL_WINDOW (window))
 		return;
 
-	module_name = G_TYPE_MODULE (shell_backend)->name;
+	module_name = E_SHELL_BACKEND_GET_CLASS (shell_backend)->name;
 
 	e_shell_window_register_new_item_actions (
 		E_SHELL_WINDOW (window), module_name,
@@ -567,11 +567,11 @@ task_shell_backend_class_init (ETaskShellBackendClass *class)
 	object_class->constructed = task_shell_backend_constructed;
 
 	shell_backend_class = E_SHELL_BACKEND_CLASS (class);
+	shell_backend_class->shell_view_type = E_TYPE_TASK_SHELL_VIEW;
 	shell_backend_class->name = "tasks";
 	shell_backend_class->aliases = "";
 	shell_backend_class->schemes = "task";
 	shell_backend_class->sort_order = 600;
-	shell_backend_class->view_type = E_TYPE_TASK_SHELL_VIEW;
 	shell_backend_class->start = NULL;
 	shell_backend_class->is_busy = NULL;
 	shell_backend_class->shutdown = NULL;