From 30d711da21ca466697b844095a3c4ecfbb60606f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 17 Feb 2013 08:02:01 -0500 Subject: TaskPage: Use EClientCache to obtain an EClient. --- calendar/gui/dialogs/task-page.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'calendar/gui/dialogs/task-page.c') diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index af13c3eaf8..31f99f8c14 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -1794,7 +1794,8 @@ tpage_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 ( @@ -1864,7 +1865,10 @@ source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage) { TaskPagePrivate *priv = tpage->priv; + EClientCache *client_cache; + CompEditor *editor; ESource *source; + EShell *shell; if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (tpage))) return; @@ -1878,8 +1882,13 @@ source_changed_cb (ESourceComboBox *source_combo_box, } priv->connect_cancellable = g_cancellable_new (); - e_cal_client_connect ( - source, E_CAL_CLIENT_SOURCE_TYPE_TASKS, + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tpage)); + 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_TASK_LIST, priv->connect_cancellable, tpage_client_connect_cb, tpage); -- cgit