Various changes to merge in evolution-data-server reliance.

svn path=/trunk/; revision=23206

1 files changed, 15 insertions, 15 deletions

diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index 981fd2a12d..cf9dd37643 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -5,31 +5,31 @@
 #include <libical/ical.h>
 #include <string.h>
 #include <glib.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/cal-component.h>
+#include <libecal/e-cal.h>
+#include <libecal/e-cal-component.h>
 #include <e-util/e-account-list.h>
 
 typedef enum {
-	CAL_COMPONENT_METHOD_PUBLISH,
-	CAL_COMPONENT_METHOD_REQUEST,
-	CAL_COMPONENT_METHOD_REPLY,
-	CAL_COMPONENT_METHOD_ADD,
-	CAL_COMPONENT_METHOD_CANCEL,
-	CAL_COMPONENT_METHOD_REFRESH,
-	CAL_COMPONENT_METHOD_COUNTER,
-	CAL_COMPONENT_METHOD_DECLINECOUNTER
-} CalComponentItipMethod;
+	E_CAL_COMPONENT_METHOD_PUBLISH,
+	E_CAL_COMPONENT_METHOD_REQUEST,
+	E_CAL_COMPONENT_METHOD_REPLY,
+	E_CAL_COMPONENT_METHOD_ADD,
+	E_CAL_COMPONENT_METHOD_CANCEL,
+	E_CAL_COMPONENT_METHOD_REFRESH,
+	E_CAL_COMPONENT_METHOD_COUNTER,
+	E_CAL_COMPONENT_METHOD_DECLINECOUNTER
+} ECalComponentItipMethod;
 
 EAccountList *itip_addresses_get (void);
 EAccount *itip_addresses_get_default (void);
 
-gboolean itip_organizer_is_user (CalComponent *comp, CalClient *client);
-gboolean itip_sentby_is_user (CalComponent *comp);
+gboolean itip_organizer_is_user (ECalComponent *comp, ECal *client);
+gboolean itip_sentby_is_user (ECalComponent *comp);
 
 const gchar *itip_strip_mailto (const gchar *address);
 
-gboolean itip_send_comp (CalComponentItipMethod method, CalComponent *comp,
-			 CalClient *client, icalcomponent *zones);
+gboolean itip_send_comp (ECalComponentItipMethod method, ECalComponent *comp,
+			 ECal *client, icalcomponent *zones);
 
 
 #endif