[evolution/account-mgmt: 46/49] Adapt save-calendar plugin to new ESource API.

[Matthew Barnes <mbarnes src gnome org>]

commit 31f17fd6a469a437955a14c7e0ad54d9949104a8
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Mar 28 10:46:22 2011 -0400

    Adapt save-calendar plugin to new ESource API.

 plugins/save-calendar/csv-format.c  |    4 ----
 plugins/save-calendar/ical-format.c |    2 --
 plugins/save-calendar/rdf-format.c  |    7 +++----
 3 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index d80ee25..f104f62 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -341,10 +341,6 @@ do_save_calendar_csv (FormatHandler *handler,
 
 	/* open source client */
 	source_client = e_cal_client_new (primary_source, type, &error);
-	if (source_client)
-		g_signal_connect (
-			source_client, "authenticate",
-			G_CALLBACK (e_client_utils_authenticate_handler), NULL);
 
 	if (!source_client || !e_client_open_sync (E_CLIENT (source_client), TRUE, NULL, &error)) {
 		display_error_message (
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index f323fed..ef07325 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -104,8 +104,6 @@ do_save_calendar_ical (FormatHandler *handler,
 
 	/* open source client */
 	source_client = e_cal_client_new (primary_source, type, &error);
-	if (source_client)
-		g_signal_connect (source_client, "authenticate", G_CALLBACK (e_client_utils_authenticate_handler), NULL);
 
 	if (!source_client || !e_client_open_sync (E_CLIENT (source_client), TRUE, NULL, &error)) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (selector)), error->message);
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index c93eb1f..44e766f 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -26,6 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <gconf/gconf-client.h>
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-client-utils.h>
 #include <libedataserverui/e-source-selector.h>
@@ -209,8 +210,6 @@ do_save_calendar_rdf (FormatHandler *handler,
 
 	/* open source client */
 	source_client = e_cal_client_new (primary_source, type, &error);
-	if (source_client)
-		g_signal_connect (source_client, "authenticate", G_CALLBACK (e_client_utils_authenticate_handler), NULL);
 
 	if (!source_client || !e_client_open_sync (E_CLIENT (source_client), TRUE, NULL, &error)) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (selector)), error);
@@ -251,9 +250,9 @@ do_save_calendar_rdf (FormatHandler *handler,
 
 		xmlNewChild (fnode, NULL, (const guchar *)"method", (const guchar *)"PUBLISH");
 
-		xmlNewChild (fnode, NULL, (const guchar *)"x-wr:relcalid", (guchar *)e_source_peek_uid (primary_source));
+		xmlNewChild (fnode, NULL, (const guchar *)"x-wr:relcalid", (guchar *)e_source_get_uid (primary_source));
 
-		xmlNewChild (fnode, NULL, (const guchar *)"x-wr:calname", (guchar *)e_source_peek_name (primary_source));
+		xmlNewChild (fnode, NULL, (const guchar *)"x-wr:calname", (guchar *)e_source_get_display_name (primary_source));
 
 		/* Version of this RDF-format */
 		xmlNewChild (fnode, NULL, (const guchar *)"version", (const guchar *)"2.0");