diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-02-17 21:00:03 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-02-18 02:36:37 +0800 |
| commit | 2c078b30d749719a65326bd9f2cfbbf07f883407 (patch) | |
| tree | ca9ee00acfa889b75aa955b693356818d807951c /calendar | |
| parent | c9cdd46ebcd37ac9d5d7e3fbb0e29fbe5039850f (diff) | |
| download | gsoc2013-evolution-2c078b30d749719a65326bd9f2cfbbf07f883407.tar.gz gsoc2013-evolution-2c078b30d749719a65326bd9f2cfbbf07f883407.tar.zst gsoc2013-evolution-2c078b30d749719a65326bd9f2cfbbf07f883407.zip | |
MemoPage: Use EClientCache to obtain an EClient.
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/gui/dialogs/memo-page.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 54de19e954..9224d5cf4b 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -951,7 +951,8 @@ mpage_client_connect_cb (GObject *source_object, CompEditor *editor; GError *error = NULL; - client = e_cal_client_connect_finish (result, &error); + client = e_client_cache_get_client_finish ( + E_CLIENT_CACHE (source_object), result, &error); /* Sanity check. */ g_return_if_fail ( @@ -1019,7 +1020,10 @@ source_changed_cb (ESourceComboBox *source_combo_box, MemoPage *mpage) { MemoPagePrivate *priv = mpage->priv; + EClientCache *client_cache; + CompEditor *editor; ESource *source; + EShell *shell; if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (mpage))) return; @@ -1033,8 +1037,13 @@ source_changed_cb (ESourceComboBox *source_combo_box, } priv->connect_cancellable = g_cancellable_new (); - e_cal_client_connect ( - source, E_CAL_CLIENT_SOURCE_TYPE_MEMOS, + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (mpage)); + shell = comp_editor_get_shell (editor); + client_cache = e_shell_get_client_cache (shell); + + e_client_cache_get_client ( + client_cache, source, + E_SOURCE_EXTENSION_MEMO_LIST, priv->connect_cancellable, mpage_client_connect_cb, mpage); |