diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-01-24 05:05:08 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-01-30 22:35:27 +0800 |
commit | f19241d136043d5cfffbfbaf5b2d6d1affc70682 (patch) | |
tree | 6abc10286b092dfc9b046bde599f24767ad0c177 /calendar/gui/e-task-list-selector.c | |
parent | e583928e0401a4baea4432c5b7e12a1b1eff8c2e (diff) | |
download | gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.gz gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.bz2 gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.lz gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.xz gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.zst gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.zip |
Use e_cal_client_connect().
Instead of e_client_utils_open_new() or e_cal_client_new().
Diffstat (limited to 'calendar/gui/e-task-list-selector.c')
-rw-r--r-- | calendar/gui/e-task-list-selector.c | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c index 0989e7436c..151967f7f4 100644 --- a/calendar/gui/e-task-list-selector.c +++ b/calendar/gui/e-task-list-selector.c @@ -119,21 +119,24 @@ task_list_selector_update_objects (ECalClient *client, } static void -client_opened_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) +client_connect_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { - ESource *source = E_SOURCE (source_object); - EClient *client = NULL; + EClient *client; gchar *uid = user_data; GError *error = NULL; g_return_if_fail (uid != NULL); - e_client_utils_open_new_finish (source, result, &client, &error); + client = e_cal_client_connect_finish (result, &error); + + /* Sanity check. */ + g_return_if_fail ( + ((client != NULL) && (error == NULL)) || + ((client == NULL) && (error != NULL))); if (error != NULL) { - g_warn_if_fail (client == NULL); g_warning ( "%s: Failed to open task list: %s", G_STRFUNC, error->message); @@ -141,8 +144,6 @@ client_opened_cb (GObject *source_object, goto exit; } - g_return_if_fail (E_IS_CLIENT (client)); - if (!e_client_is_readonly (client)) e_cal_client_remove_object_sync ( E_CAL_CLIENT (client), uid, NULL, @@ -207,9 +208,9 @@ task_list_selector_process_data (ESourceSelector *selector, source = e_source_registry_ref_source (registry, source_uid); if (source != NULL) { - e_client_utils_open_new ( - source, E_CLIENT_SOURCE_TYPE_MEMOS, TRUE, NULL, - client_opened_cb, g_strdup (old_uid)); + e_cal_client_connect ( + source, E_CAL_CLIENT_SOURCE_TYPE_MEMOS, NULL, + client_connect_cb, g_strdup (old_uid)); g_object_unref (source); } @@ -227,23 +228,26 @@ struct DropData }; static void -client_opened_for_drop_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) +client_connect_for_drop_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { - ESource *source = E_SOURCE (source_object); struct DropData *dd = user_data; - EClient *client = NULL; + EClient *client; ECalClient *cal_client; GSList *iter; GError *error = NULL; g_return_if_fail (dd != NULL); - e_client_utils_open_new_finish (source, result, &client, &error); + client = e_cal_client_connect_finish (result, &error); + + /* Sanity check. */ + g_return_if_fail ( + ((client != NULL) && (error == NULL)) || + ((client == NULL) && (error != NULL))); if (error != NULL) { - g_warn_if_fail (client == NULL); g_warning ( "%s: Failed to open task list: %s", G_STRFUNC, error->message); @@ -251,8 +255,6 @@ client_opened_for_drop_cb (GObject *source_object, goto exit; } - g_return_if_fail (E_IS_CLIENT (client)); - cal_client = E_CAL_CLIENT (client); for (iter = dd->list; iter != NULL; iter = iter->next) { @@ -318,9 +320,9 @@ task_list_selector_data_dropped (ESourceSelector *selector, dd->action = action; dd->list = cal_comp_selection_get_string_list (selection_data); - e_client_utils_open_new ( - destination, E_CLIENT_SOURCE_TYPE_TASKS, TRUE, NULL, - client_opened_for_drop_cb, dd); + e_cal_client_connect ( + destination, E_CAL_CLIENT_SOURCE_TYPE_TASKS, NULL, + client_connect_for_drop_cb, dd); return TRUE; } |