Handle some more renaming

2003-11-07  JP Rosevear <jpr@ximian.com>

	* Handle some more renaming

svn path=/trunk/; revision=23213

5 files changed, 12 insertions, 8 deletions

diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index 7b340c9241..cc85293c28 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,5 +1,9 @@
 2003-11-07  JP Rosevear <jpr@ximian.com>
 
+	* Handle some more renaming
+	
+2003-11-07  JP Rosevear <jpr@ximian.com>
+
 	* Reflect renaming of ECalView to ECalendarView
 
 2003-11-04  Bolian Yin <bolian.yin@sun.com>
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index 0db3e91039..a03f9a1421 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -209,13 +209,13 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 	event = ea_calendar_helpers_get_cal_view_event_from (GNOME_CANVAS_ITEM(g_obj));
 
 	if (event && event->comp_data) {
-		if (cal_util_component_has_alarms (event->comp_data->icalcomp)) {
+		if (e_cal_util_component_has_alarms (event->comp_data->icalcomp)) {
 			tmp_name = new_name;
 			new_name = g_strconcat (new_name, "alarm ", NULL);
 			g_free (tmp_name);
 		}
 
-		if (cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
+		if (e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
 			tmp_name = new_name;
 			new_name = g_strconcat (new_name, "recurrence ", NULL);
 			g_free (tmp_name);
@@ -227,7 +227,7 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 			g_free (tmp_name);
 		}
 
-		if (cal_util_component_has_organizer (event->comp_data->icalcomp)) {
+		if (e_cal_util_component_has_organizer (event->comp_data->icalcomp)) {
 			tmp_name = new_name;
 			new_name = g_strconcat (new_name, "meeting ", NULL);
 			g_free (tmp_name);
diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c
index 970550a139..af8d704178 100644
--- a/a11y/calendar/ea-day-view-main-item.c
+++ b/a11y/calendar/ea-day-view-main-item.c
@@ -254,7 +254,7 @@ ea_day_view_main_item_new (GObject *obj)
 			  accessible);
 
 	/* listen for date changes of calendar */
-	gcal = e_cal_view_get_calendar (E_CAL_VIEW (main_item->day_view));
+	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (main_item->day_view));
 	if (gcal)
 		g_signal_connect (gcal, "dates_shown_changed",
 				  G_CALLBACK (ea_day_view_main_item_dates_change_cb),
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
index c4b1520916..f91583da24 100644
--- a/a11y/calendar/ea-day-view.c
+++ b/a11y/calendar/ea-day-view.c
@@ -135,7 +135,7 @@ ea_day_view_get_name (AtkObject *accessible)
 		return NULL;
 	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
 
-	gcal = e_cal_view_get_calendar (E_CAL_VIEW (day_view));
+	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
 	label_text = calendar_get_text_for_folder_bar_label (gcal);
 
 	n_events = atk_object_get_n_accessible_children (accessible);
@@ -173,7 +173,7 @@ ea_day_view_get_description (AtkObject *accessible)
 		GnomeCalendar *gcal;
 		GnomeCalendarViewType view_type;
 
-		gcal = e_cal_view_get_calendar (E_CAL_VIEW (day_view));
+		gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
 		view_type = gnome_calendar_get_view (gcal);
 
 		if (view_type == GNOME_CAL_WORK_WEEK_VIEW)
diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c
index f3ca38027e..995cc01434 100644
--- a/a11y/calendar/ea-week-view.c
+++ b/a11y/calendar/ea-week-view.c
@@ -138,7 +138,7 @@ ea_week_view_get_name (AtkObject *accessible)
 		return NULL;
 	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
 
-	gcal = e_cal_view_get_calendar (E_CAL_VIEW (week_view));
+	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
 	label_text = calendar_get_text_for_folder_bar_label (gcal);
 
 	n_events = atk_object_get_n_accessible_children (accessible);
@@ -179,7 +179,7 @@ ea_week_view_get_description (AtkObject *accessible)
 		GnomeCalendar *gcal;
 		GnomeCalendarViewType view_type;
 
-		gcal = e_cal_view_get_calendar (E_CAL_VIEW (week_view));
+		gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
 		view_type = gnome_calendar_get_view (gcal);
 
 		if (view_type == GNOME_CAL_MONTH_VIEW)