aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-17 20:57:05 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-18 02:36:37 +0800
commitc9cdd46ebcd37ac9d5d7e3fbb0e29fbe5039850f (patch)
tree7a858589b2a603f6d6a24f617047b6f8756fdd9b /calendar/gui
parente041807a6158e209892971fac9caf445b4b89746 (diff)
downloadgsoc2013-evolution-c9cdd46ebcd37ac9d5d7e3fbb0e29fbe5039850f.tar
gsoc2013-evolution-c9cdd46ebcd37ac9d5d7e3fbb0e29fbe5039850f.tar.gz
gsoc2013-evolution-c9cdd46ebcd37ac9d5d7e3fbb0e29fbe5039850f.tar.bz2
gsoc2013-evolution-c9cdd46ebcd37ac9d5d7e3fbb0e29fbe5039850f.tar.lz
gsoc2013-evolution-c9cdd46ebcd37ac9d5d7e3fbb0e29fbe5039850f.tar.xz
gsoc2013-evolution-c9cdd46ebcd37ac9d5d7e3fbb0e29fbe5039850f.tar.zst
gsoc2013-evolution-c9cdd46ebcd37ac9d5d7e3fbb0e29fbe5039850f.zip
EventPage: Use EClientCache to obtain an EClient.
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/dialogs/event-page.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index a65da3469b..dfe3368be9 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2997,7 +2997,8 @@ epage_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 (
@@ -3067,7 +3068,10 @@ source_changed_cb (ESourceComboBox *source_combo_box,
EventPage *epage)
{
EventPagePrivate *priv = epage->priv;
+ EClientCache *client_cache;
+ CompEditor *editor;
ESource *source;
+ EShell *shell;
if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (epage)))
return;
@@ -3081,8 +3085,13 @@ source_changed_cb (ESourceComboBox *source_combo_box,
}
priv->connect_cancellable = g_cancellable_new ();
- e_cal_client_connect (
- source, E_CAL_CLIENT_SOURCE_TYPE_EVENTS,
+ editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (epage));
+ 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_CALENDAR,
priv->connect_cancellable,
epage_client_connect_cb, epage);