diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-02-19 04:37:24 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-02-19 04:38:26 +0800 |
| commit | 9b1298e6cf007429fd524783a497c021137827f6 (patch) | |
| tree | 64b6fd9ea63eb355d0da3a88a30a8599a40eb804 | |
| parent | b17432ffbca0b72603ebd0756764a8868f1956b7 (diff) | |
| download | gsoc2013-evolution-9b1298e6cf007429fd524783a497c021137827f6.tar.gz gsoc2013-evolution-9b1298e6cf007429fd524783a497c021137827f6.tar.zst gsoc2013-evolution-9b1298e6cf007429fd524783a497c021137827f6.zip | |
Remove memo_shell_sidebar_ref_client_cache().
Use e_client_selector_ref_cached_client() for remaining cases.
| -rw-r--r-- | modules/calendar/e-memo-shell-sidebar.c | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index c6936a11ce..f6d219c7b3 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -152,22 +152,6 @@ memo_shell_sidebar_emit_status_message (EMemoShellSidebar *memo_shell_sidebar, g_signal_emit (memo_shell_sidebar, signal_id, 0, status_message, -1.0); } -static EClientCache * -memo_shell_sidebar_ref_client_cache (EMemoShellSidebar *memo_shell_sidebar) -{ - EShell *shell; - EShellView *shell_view; - EShellBackend *shell_backend; - EShellSidebar *shell_sidebar; - - shell_sidebar = E_SHELL_SIDEBAR (memo_shell_sidebar); - shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); - shell_backend = e_shell_view_get_shell_backend (shell_view); - shell = e_shell_backend_get_shell (shell_backend); - - return g_object_ref (e_shell_get_client_cache (shell)); -} - static void memo_shell_sidebar_handle_connect_error (EMemoShellSidebar *memo_shell_sidebar, const gchar *parent_display_name, @@ -560,7 +544,6 @@ memo_shell_sidebar_check_state (EShellSidebar *shell_sidebar) if (source != NULL) { EClient *client; ESource *collection; - EClientCache *client_cache; has_primary_source = TRUE; is_writable = e_source_get_writable (source); @@ -575,11 +558,8 @@ memo_shell_sidebar_check_state (EShellSidebar *shell_sidebar) g_object_unref (collection); } - client_cache = memo_shell_sidebar_ref_client_cache ( - E_MEMO_SHELL_SIDEBAR (shell_sidebar)); - client = e_client_cache_ref_cached_client ( - client_cache, source, E_SOURCE_EXTENSION_MEMO_LIST); - g_object_unref (client_cache); + client = e_client_selector_ref_cached_client ( + E_CLIENT_SELECTOR (selector), source); if (client != NULL) { refresh_supported = @@ -799,17 +779,16 @@ void e_memo_shell_sidebar_remove_source (EMemoShellSidebar *memo_shell_sidebar, ESource *source) { - EClientCache *client_cache; + ESourceSelector *selector; EClient *client; g_return_if_fail (E_IS_MEMO_SHELL_SIDEBAR (memo_shell_sidebar)); g_return_if_fail (E_IS_SOURCE (source)); - client_cache = - memo_shell_sidebar_ref_client_cache (memo_shell_sidebar); - client = e_client_cache_ref_cached_client ( - client_cache, source, E_SOURCE_EXTENSION_MEMO_LIST); - g_object_unref (client_cache); + selector = e_memo_shell_sidebar_get_selector (memo_shell_sidebar); + + client = e_client_selector_ref_cached_client ( + E_CLIENT_SELECTOR (selector), source); if (client != NULL) { memo_shell_sidebar_emit_client_removed ( |