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

svn path=/trunk/; revision=23206

1 files changed, 3 insertions, 3 deletions

diff --git a/calendar/gui/e-meeting-model.h b/calendar/gui/e-meeting-model.h
index 50fba6c7a6..e709cd3aa4 100644
--- a/calendar/gui/e-meeting-model.h
+++ b/calendar/gui/e-meeting-model.h
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <gal/e-table/e-table-scrolled.h>
 #include <gal/e-table/e-table-model.h>
-#include <cal-client/cal-client.h>
+#include <libecal/e-cal.h>
 #include "e-meeting-attendee.h"
 
 G_BEGIN_DECLS
@@ -72,8 +72,8 @@ typedef void	(* EMeetingModelRefreshCallback) (gpointer data);
 GtkType    e_meeting_model_get_type (void);
 GtkObject *e_meeting_model_new      (void);
 
-CalClient *e_meeting_model_get_cal_client (EMeetingModel *im);
-void e_meeting_model_set_cal_client (EMeetingModel *im, CalClient *client);
+ECal *e_meeting_model_get_e_cal (EMeetingModel *im);
+void e_meeting_model_set_e_cal (EMeetingModel *im, ECal *client);
 
 icaltimezone *e_meeting_model_get_zone (EMeetingModel *im);
 void e_meeting_model_set_zone (EMeetingModel *im, icaltimezone *zone);