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

[Matthew Barnes <mbarnes src gnome org>]

commit 89fb09913d6beeb38f65641a0a8f64988bd9dbb5
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 |    7 ++++---
 plugins/itip-formatter/itip-view.c      |    4 ++--
 plugins/itip-formatter/itip-view.h      |    4 ----
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 0b0acd4..e46cd68 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
@@ -41,7 +43,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>
@@ -605,7 +606,6 @@ start_calendar_server (struct _itip_puri *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);
 }
 
@@ -2362,7 +2362,7 @@ extract_itip_data (struct _itip_puri *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;
 
@@ -3331,3 +3331,4 @@ itip_attachment_frame (EMFormat *emf,
 	camel_stream_close (stream, cancellable, NULL);
 }
 
+#endif /* ACCOUNT_MGMT */
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 2732384..7a8a549 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -34,7 +34,6 @@
 #include <gtkhtml/gtkhtml-embedded.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>
@@ -106,7 +105,6 @@ struct _ItipViewPrivate {
 	GtkWidget *selector_box;
 	GtkWidget *escb;
 	GtkWidget *escb_header;
-	ESourceList *source_list;
 
 	GtkWidget *rsvp_box;
 	GtkWidget *rsvp_check;
@@ -1939,6 +1937,7 @@ source_changed_cb (ESourceComboBox *escb,
 	g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
 }
 
+#if 0  /* ACCOUNT_MGMT */
 void
 itip_view_set_source_list (ItipView *view,
                            ESourceList *source_list)
@@ -2004,6 +2003,7 @@ itip_view_get_source_list (ItipView *view)
 
 	return priv->source_list;
 }
+#endif /* ACCOUNT_MGMT */
 
 void
 itip_view_set_source (ItipView *view,
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index 538306c..134eb89 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>
 
 G_BEGIN_DECLS
@@ -148,9 +147,6 @@ guint itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType
 void itip_view_remove_lower_info_item (ItipView *view, guint id);
 void itip_view_clear_lower_info_items (ItipView *view);
 
-void itip_view_set_source_list (ItipView *view, ESourceList *source_list);
-ESourceList *itip_view_get_source_list (ItipView *view);
-
 void itip_view_set_source (ItipView *view, ESource *source);
 ESource *itip_view_get_source (ItipView *view);