Use e_cal_client_connect().

Instead of e_client_utils_open_new() or e_cal_client_new().

1 files changed, 26 insertions, 24 deletions

diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c
index 366d41e702..74ca1d1b64 100644
--- a/calendar/gui/e-memo-list-selector.c
+++ b/calendar/gui/e-memo-list-selector.c
@@ -118,21 +118,24 @@ memo_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 memo list: %s",
 			G_STRFUNC, error->message);
@@ -140,8 +143,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,
@@ -205,9 +206,9 @@ memo_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);
 	}
 
@@ -225,23 +226,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 memo list: %s",
 			G_STRFUNC, error->message);
@@ -249,8 +253,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) {
@@ -316,9 +318,9 @@ memo_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_MEMOS, TRUE, NULL,
-		client_opened_for_drop_cb, dd);
+	e_cal_client_connect (
+		destination, E_CAL_CLIENT_SOURCE_TYPE_MEMOS, NULL,
+		client_connect_for_drop_cb, dd);
 
 	return TRUE;
 }