Adapt memos to EShellBackend changes.

1 files changed, 4 insertions, 12 deletions

diff --git a/calendar/modules/e-memo-shell-view-private.c b/calendar/modules/e-memo-shell-view-private.c
index 2fcd5ddd9a..dbb474a7a2 100644
--- a/calendar/modules/e-memo-shell-view-private.c
+++ b/calendar/modules/e-memo-shell-view-private.c
@@ -151,16 +151,6 @@ void
 e_memo_shell_view_private_init (EMemoShellView *memo_shell_view,
                                 EShellViewClass *shell_view_class)
 {
-	EMemoShellViewPrivate *priv = memo_shell_view->priv;
-	ESourceList *source_list;
-	GObject *object;
-
-	object = G_OBJECT (shell_view_class->type_module);
-	source_list = g_object_get_data (object, "source-list");
-	g_return_if_fail (E_IS_SOURCE_LIST (source_list));
-
-	priv->source_list = g_object_ref (source_list);
-
 	if (!gal_view_collection_loaded (shell_view_class->view_collection))
 		memo_shell_view_load_view_collection (shell_view_class);
 
@@ -176,6 +166,7 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 	EMemoShellContent *memo_shell_content;
 	EMemoShellSidebar *memo_shell_sidebar;
 	EShellView *shell_view;
+	EShellBackend *shell_backend;
 	EShellContent *shell_content;
 	EShellSidebar *shell_sidebar;
 	EShellWindow *shell_window;
@@ -185,6 +176,7 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 	ESourceSelector *selector;
 
 	shell_view = E_SHELL_VIEW (memo_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);
@@ -193,6 +185,7 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 	e_shell_window_add_action_group (shell_window, "memos-filter");
 
 	/* Cache these to avoid lots of awkward casting. */
+	priv->memo_shell_backend = g_object_ref (shell_backend);
 	priv->memo_shell_content = g_object_ref (shell_content);
 	priv->memo_shell_sidebar = g_object_ref (shell_sidebar);
 
@@ -285,8 +278,7 @@ e_memo_shell_view_private_dispose (EMemoShellView *memo_shell_view)
 {
 	EMemoShellViewPrivate *priv = memo_shell_view->priv;
 
-	DISPOSE (priv->source_list);
-
+	DISPOSE (priv->memo_shell_backend);
 	DISPOSE (priv->memo_shell_content);
 	DISPOSE (priv->memo_shell_sidebar);