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

svn path=/trunk/; revision=23206

1 files changed, 5 insertions, 5 deletions

diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index 8b988f085f..474cf7b1a4 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -199,7 +199,7 @@ e_meeting_attendee_new (void)
 }
 
 GObject *
-e_meeting_attendee_new_from_cal_component_attendee (CalComponentAttendee *ca)
+e_meeting_attendee_new_from_e_cal_component_attendee (ECalComponentAttendee *ca)
 {
 	EMeetingAttendee *ia;
 	
@@ -220,15 +220,15 @@ e_meeting_attendee_new_from_cal_component_attendee (CalComponentAttendee *ca)
 	return G_OBJECT (ia);
 }
 
-CalComponentAttendee *
-e_meeting_attendee_as_cal_component_attendee (EMeetingAttendee *ia)
+ECalComponentAttendee *
+e_meeting_attendee_as_e_cal_component_attendee (EMeetingAttendee *ia)
 {
 	EMeetingAttendeePrivate *priv;
-	CalComponentAttendee *ca;
+	ECalComponentAttendee *ca;
 
 	priv = ia->priv;
 	
-	ca = g_new0 (CalComponentAttendee, 1);
+	ca = g_new0 (ECalComponentAttendee, 1);
 
 	ca->value = priv->address;
 	ca->member = string_is_set (priv->member) ? priv->member : NULL;