diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-02-19 04:25:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-02-19 04:33:18 +0800 |
| commit | 223d47142c7d32c26090068215364a0579a5ca55 (patch) | |
| tree | 0351ecdb7994139b7dc91cde1551a9ddf024c621 /modules/calendar | |
| parent | 0e76355bcf8d60d58ac25cc4bd557a2a7dc7e95b (diff) | |
| download | gsoc2013-evolution-223d47142c7d32c26090068215364a0579a5ca55.tar gsoc2013-evolution-223d47142c7d32c26090068215364a0579a5ca55.tar.gz gsoc2013-evolution-223d47142c7d32c26090068215364a0579a5ca55.tar.bz2 gsoc2013-evolution-223d47142c7d32c26090068215364a0579a5ca55.tar.lz gsoc2013-evolution-223d47142c7d32c26090068215364a0579a5ca55.tar.xz gsoc2013-evolution-223d47142c7d32c26090068215364a0579a5ca55.tar.zst gsoc2013-evolution-223d47142c7d32c26090068215364a0579a5ca55.zip | |
EMemoShellSidebar: Use EClientSelector to obtain EClient instances.
Diffstat (limited to 'modules/calendar')
| -rw-r--r-- | modules/calendar/e-memo-shell-sidebar.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index 3040c2ccc1..c6936a11ce 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -221,8 +221,8 @@ memo_shell_sidebar_client_connect_cb (GObject *source_object, ConnectClosure *closure = user_data; GError *error = NULL; - client = e_client_cache_get_client_finish ( - E_CLIENT_CACHE (source_object), result, &error); + client = e_client_selector_get_client_finish ( + E_CLIENT_SELECTOR (source_object), result, &error); /* Sanity check. */ g_return_if_fail ( @@ -260,8 +260,8 @@ memo_shell_sidebar_default_connect_cb (GObject *source_object, priv = E_MEMO_SHELL_SIDEBAR_GET_PRIVATE (closure->memo_shell_sidebar); - client = e_client_cache_get_client_finish ( - E_CLIENT_CACHE (source_object), result, &error); + client = e_client_selector_get_client_finish ( + E_CLIENT_SELECTOR (source_object), result, &error); /* Sanity check. */ g_return_if_fail ( @@ -307,10 +307,12 @@ memo_shell_sidebar_set_default (EMemoShellSidebar *memo_shell_sidebar, ESource *source) { EMemoShellSidebarPrivate *priv; - EClientCache *client_cache; + ESourceSelector *selector; priv = memo_shell_sidebar->priv; + selector = e_memo_shell_sidebar_get_selector (memo_shell_sidebar); + /* already loading that source as default source */ if (source == priv->connecting_default_source_instance) return; @@ -326,17 +328,11 @@ memo_shell_sidebar_set_default (EMemoShellSidebar *memo_shell_sidebar, priv->connecting_default_source_instance = source; priv->connecting_default_client = g_cancellable_new (); - client_cache = - memo_shell_sidebar_ref_client_cache (memo_shell_sidebar); - - e_client_cache_get_client ( - client_cache, source, - E_SOURCE_EXTENSION_MEMO_LIST, + e_client_selector_get_client ( + E_CLIENT_SELECTOR (selector), source, priv->connecting_default_client, memo_shell_sidebar_default_connect_cb, connect_closure_new (memo_shell_sidebar, source)); - - g_object_unref (client_cache); } static void @@ -777,7 +773,6 @@ e_memo_shell_sidebar_add_source (EMemoShellSidebar *memo_shell_sidebar, ESource *source) { ESourceSelector *selector; - EClientCache *client_cache; const gchar *display_name; gchar *message; @@ -793,17 +788,11 @@ e_memo_shell_sidebar_add_source (EMemoShellSidebar *memo_shell_sidebar, memo_shell_sidebar_emit_status_message (memo_shell_sidebar, message); g_free (message); - client_cache = - memo_shell_sidebar_ref_client_cache (memo_shell_sidebar); - - e_client_cache_get_client ( - client_cache, source, - E_SOURCE_EXTENSION_MEMO_LIST, + e_client_selector_get_client ( + E_CLIENT_SELECTOR (selector), source, memo_shell_sidebar->priv->loading_clients, memo_shell_sidebar_client_connect_cb, connect_closure_new (memo_shell_sidebar, source)); - - g_object_unref (client_cache); } void |