[evolution/gnome-3-8] EMemoShellSidebar: Reduce diff noise with master branch.

[Matthew Barnes <mbarnes src gnome org>]

commit 38b8926d2e65b95657738db8a9d37a37b7be4ba2
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Apr 25 12:02:37 2013 -0400

    EMemoShellSidebar: Reduce diff noise with master branch.

 modules/calendar/e-memo-shell-sidebar.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 2998c94..fce6fbe 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -357,7 +357,6 @@ memo_shell_sidebar_restore_state_cb (EShellWindow *shell_window,
 {
        EMemoShellSidebarPrivate *priv;
        EShell *shell;
-       EShellBackend *shell_backend;
        EShellSettings *shell_settings;
        ESourceRegistry *registry;
        ESourceSelector *selector;
@@ -368,14 +367,10 @@ memo_shell_sidebar_restore_state_cb (EShellWindow *shell_window,
        shell = e_shell_window_get_shell (shell_window);
        shell_settings = e_shell_get_shell_settings (shell);
 
-       shell_backend = e_shell_view_get_shell_backend (shell_view);
-       g_return_if_fail (E_IS_MEMO_SHELL_BACKEND (shell_backend));
-
        selector = E_SOURCE_SELECTOR (priv->selector);
+       registry = e_source_selector_get_registry (selector);
        model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
 
-       registry = e_shell_get_registry (shell);
-
        g_signal_connect_swapped (
                model, "row-changed",
                G_CALLBACK (memo_shell_sidebar_row_changed_cb),
@@ -386,6 +381,8 @@ memo_shell_sidebar_restore_state_cb (EShellWindow *shell_window,
                G_CALLBACK (memo_shell_sidebar_primary_selection_changed_cb),
                shell_sidebar);
 
+       /* Bind GObject properties to settings keys. */
+
        g_object_bind_property_full (
                shell_settings, "cal-primary-memo-list",
                selector, "primary-selection",