[evolution/account-mgmt: 46/55] Adapt itip-formatter plugin to the new ESource API.

[Matthew Barnes <mbarnes src gnome org>]

commit 49374c68f7cfed657f81917d480c8c7852ff30d7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Sep 24 09:48:52 2011 -0400

    Adapt itip-formatter plugin to the new ESource API.

 plugins/itip-formatter/itip-formatter.c |    8 +++++---
 plugins/itip-formatter/itip-view.c      |   11 ++++++-----
 plugins/itip-formatter/itip-view.h      |    3 ++-
 3 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index b59b6f7..263ba47 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -20,6 +20,8 @@
  *
  */
 
+#if 0  /* ACCOUNT_MGMT */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -40,7 +42,6 @@
 #include <shell/e-shell.h>
 #include <shell/e-shell-utils.h>
 
-#include <libemail-utils/e-account-utils.h>
 #include <libemail-utils/mail-mt.h>
 
 #include <libemail-engine/mail-folder-cache.h>
@@ -603,7 +604,6 @@ start_calendar_server (ItipPURI *pitip,
 		type == E_CAL_CLIENT_SOURCE_TYPE_MEMOS ? E_CLIENT_SOURCE_TYPE_MEMOS :
 		type == E_CAL_CLIENT_SOURCE_TYPE_TASKS ? E_CLIENT_SOURCE_TYPE_TASKS : E_CLIENT_SOURCE_TYPE_LAST,
 		TRUE, pitip->cancellable,
-		e_client_utils_authenticate_handler, NULL,
 		func, data);
 }
 
@@ -2421,7 +2421,7 @@ extract_itip_data (ItipPURI *pitip,
 		prop = NULL;
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (pitip->ical_comp));
-		my_address = itip_get_comp_attendee (comp, NULL);
+		my_address = itip_get_comp_attendee (registry, comp, NULL);
 		g_object_unref (comp);
 		comp = NULL;
 
@@ -3478,3 +3478,5 @@ itip_formatter_page_factory (EPlugin *ep,
 
 	return page;
 }
+
+#endif /* ACCOUNT_MGMT */
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 53bba25..1767ae6 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -33,7 +33,6 @@
 #include <libecal/e-cal-time-util.h>
 #include <mail/em-format-hook.h>
 #include <mail/em-format-html.h>
-#include <libedataserver/e-account-list.h>
 #include <e-util/e-util.h>
 #include <e-util/e-unicode.h>
 #include <calendar/gui/itip-utils.h>
@@ -93,8 +92,6 @@ struct _ItipViewPrivate {
 
 	gchar *description;
 
-	ESourceList *source_list;
-
 	gint buttons_sensitive : 1;
 
         gboolean is_recur_set;
@@ -2154,6 +2151,7 @@ itip_view_clear_lower_info_items (ItipView *view)
 	priv->lower_info_items = NULL;
 }
 
+#if 0  /* ACCOUNT_MGMT */
 static void
 source_list_changed_cb (ESourceList *source_list,
                         ItipView *view)
@@ -2260,6 +2258,7 @@ itip_view_get_source_list (ItipView *view)
 
 	return view->priv->source_list;
 }
+#endif /* ACCOUNT_MGMT */
 
 void
 itip_view_set_source (ItipView *view,
@@ -2312,7 +2311,7 @@ itip_view_set_source (ItipView *view,
 		option = WEBKIT_DOM_HTML_OPTION_ELEMENT (node);
 
 		value = webkit_dom_html_option_element_get_value (option);
-		if (g_strcmp0 (value, e_source_peek_uid (source)) == 0) {
+		if (g_strcmp0 (value, e_source_get_uid (source)) == 0) {
 			webkit_dom_html_option_element_set_selected (
 				option, TRUE);
 
@@ -2349,8 +2348,11 @@ itip_view_get_source (ItipView *view)
 	uid = webkit_dom_html_select_element_get_value (
 		WEBKIT_DOM_HTML_SELECT_ELEMENT (select));
 
+#if 0  /* ACCOUNT_MGMT */
 	source = e_source_list_peek_source_by_uid (
 		view->priv->source_list, uid);
+#endif /* ACCOUNT_MGMT */
+	source = NULL;  /* ACCOUNT_MGMT */
 	g_free (uid);
 
 	if (disable) {
@@ -2896,4 +2898,3 @@ itip_view_set_error (ItipView *view,
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 }
-
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index 5ae8d9c..b6d4067 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.h
@@ -27,7 +27,6 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <gtk/gtk.h>
-#include <libedataserver/e-source-list.h>
 #include <libecal/e-cal-client.h>
 #include <webkit/webkitdom.h>
 
@@ -201,9 +200,11 @@ void            itip_view_remove_lower_info_item
 void            itip_view_clear_lower_info_items
                                                 (ItipView *view);
 
+#if 0  /* ACCOUNT_MGMT */
 void            itip_view_set_source_list       (ItipView *view,
                                                  ESourceList *source_list);
 ESourceList *    itip_view_get_source_list       (ItipView *view);
+#endif /* ACCOUNT_MGMT */
 
 void            itip_view_set_source            (ItipView *view,
                                                  ESource *source);