aboutsummaryrefslogtreecommitdiffstats
path: root/modules/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-04-26 00:02:37 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-04-26 00:04:20 +0800
commit38b8926d2e65b95657738db8a9d37a37b7be4ba2 (patch)
treea55deb619ce1cc7caed3b2c9f47018ed2db6e279 /modules/calendar
parentafe9eea99cb48f7e86d6d124b82c15a40c7cbd38 (diff)
downloadgsoc2013-evolution-38b8926d2e65b95657738db8a9d37a37b7be4ba2.tar
gsoc2013-evolution-38b8926d2e65b95657738db8a9d37a37b7be4ba2.tar.gz
gsoc2013-evolution-38b8926d2e65b95657738db8a9d37a37b7be4ba2.tar.bz2
gsoc2013-evolution-38b8926d2e65b95657738db8a9d37a37b7be4ba2.tar.lz
gsoc2013-evolution-38b8926d2e65b95657738db8a9d37a37b7be4ba2.tar.xz
gsoc2013-evolution-38b8926d2e65b95657738db8a9d37a37b7be4ba2.tar.zst
gsoc2013-evolution-38b8926d2e65b95657738db8a9d37a37b7be4ba2.zip
EMemoShellSidebar: Reduce diff noise with master branch.
Diffstat (limited to 'modules/calendar')
-rw-r--r--modules/calendar/e-memo-shell-sidebar.c9
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 2998c94c32..fce6fbe240 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",