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

svn path=/trunk/; revision=23206

4 files changed, 46 insertions, 46 deletions

diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index 80122375c3..0db3e91039 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -134,7 +134,7 @@ ea_cal_view_event_new (GObject *obj)
 {
 	AtkObject *atk_obj = NULL;
 	GObject *target_obj;
-	ECalView *cal_view;
+	ECalendarView *cal_view;
 
 	g_return_val_if_fail (E_IS_TEXT (obj), NULL);
 	cal_view = ea_calendar_helpers_get_cal_view_from (GNOME_CANVAS_ITEM (obj));
@@ -194,7 +194,7 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
-	ECalViewEvent *event;
+	ECalendarViewEvent *event;
 	gchar *tmp_name;
 	gchar *new_name = g_strdup ("");
         const char *summary;
@@ -273,7 +273,7 @@ ea_cal_view_event_get_parent (AtkObject *accessible)
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
 	GnomeCanvasItem *canvas_item;
-	ECalView *cal_view;
+	ECalendarView *cal_view;
 
 	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
@@ -297,8 +297,8 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
 {
 	GObject *g_obj;
 	GnomeCanvasItem *canvas_item;
-	ECalView *cal_view;
-	ECalViewEvent *cal_view_event;
+	ECalendarView *cal_view;
+	ECalendarViewEvent *cal_view_event;
 
 	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), -1);
 	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
@@ -325,7 +325,7 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
 		     --event_num) {
 			day_view_event = &g_array_index (day_view->long_events,
 							 EDayViewEvent, event_num);
-			if (cal_view_event == (ECalViewEvent*)day_view_event)
+			if (cal_view_event == (ECalendarViewEvent*)day_view_event)
 				return event_num;
 
 		}
@@ -336,7 +336,7 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
 			     --event_num) {
 				day_view_event = &g_array_index (day_view->events[day],
 							EDayViewEvent, event_num);
-				if (cal_view_event == (ECalViewEvent*)day_view_event)
+				if (cal_view_event == (ECalendarViewEvent*)day_view_event)
 					return num_before + event_num;
 			}
 			num_before += day_view->events[day]->len;
@@ -350,7 +350,7 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
 		for (index = week_view->events->len - 1; index >= 0; --index) {
 			week_view_event = &g_array_index (week_view->events,
 							  EWeekViewEvent, index);
-			if (cal_view_event == (ECalViewEvent*)week_view_event)
+			if (cal_view_event == (ECalendarViewEvent*)week_view_event)
 				return index;
 		}
 	}
@@ -383,7 +383,7 @@ ea_cal_view_get_extents (AtkComponent   *component,
 	GnomeCanvasItem *canvas_item;
 	gint x_window, y_window;
 	gint scroll_x, scroll_y;
-	ECalView *cal_view;
+	ECalendarView *cal_view;
 	gint item_x, item_y, item_w, item_h;
 	GtkWidget *canvas = NULL;
 
diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c
index fe3c3de1cf..9b68d24f9f 100644
--- a/a11y/calendar/ea-cal-view.c
+++ b/a11y/calendar/ea-cal-view.c
@@ -36,10 +36,10 @@ static void ea_cal_view_class_init (EaCalViewClass *klass);
 static AtkObject* ea_cal_view_get_parent (AtkObject *accessible);
 static void ea_cal_view_real_initialize (AtkObject *accessible, gpointer data);
 
-static void ea_cal_view_event_changed_cb (ECalView *cal_view,
-                                          ECalViewEvent *event, gpointer data);
-static void ea_cal_view_event_added_cb (ECalView *cal_view,
-                                        ECalViewEvent *event, gpointer data);
+static void ea_cal_view_event_changed_cb (ECalendarView *cal_view,
+                                          ECalendarViewEvent *event, gpointer data);
+static void ea_cal_view_event_added_cb (ECalendarView *cal_view,
+                                        ECalendarViewEvent *event, gpointer data);
 
 static gboolean idle_dates_changed (gpointer data);
 static void ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data);
@@ -123,7 +123,7 @@ ea_cal_view_new (GtkWidget *widget)
 	GObject *object;
 	AtkObject *accessible;
 
-	g_return_val_if_fail (E_IS_CAL_VIEW (widget), NULL);
+	g_return_val_if_fail (E_IS_CALENDAR_VIEW (widget), NULL);
 
 	object = g_object_new (EA_TYPE_CAL_VIEW, NULL);
 
@@ -136,18 +136,18 @@ ea_cal_view_new (GtkWidget *widget)
 static void
 ea_cal_view_real_initialize (AtkObject *accessible, gpointer data)
 {
-	ECalView *cal_view;
+	ECalendarView *cal_view;
 	GnomeCalendar *gcal;
 	static AtkRole role = ATK_ROLE_INVALID;
 
 	g_return_if_fail (EA_IS_CAL_VIEW (accessible));
-	g_return_if_fail (E_IS_CAL_VIEW (data));
+	g_return_if_fail (E_IS_CALENDAR_VIEW (data));
 
         ATK_OBJECT_CLASS (parent_class)->initialize (accessible, data);
 	if (role == ATK_ROLE_INVALID)
 		role = atk_role_register ("Calendar View");
 	accessible->role = role;
-	cal_view = E_CAL_VIEW (data);
+	cal_view = E_CALENDAR_VIEW (data);
 
 	/* add listener for event_changed, event_added
 	 * we don't need to listen on event_removed. When the e_text
@@ -160,7 +160,7 @@ ea_cal_view_real_initialize (AtkObject *accessible, gpointer data)
 			  G_CALLBACK (ea_cal_view_event_added_cb), NULL);
 
 	/* listen for date changes of calendar */
-	gcal = e_cal_view_get_calendar (cal_view);
+	gcal = e_calendar_view_get_calendar (cal_view);
 
 	if (gcal)
 		g_signal_connect (gcal, "dates_shown_changed",
@@ -171,29 +171,29 @@ ea_cal_view_real_initialize (AtkObject *accessible, gpointer data)
 static AtkObject* 
 ea_cal_view_get_parent (AtkObject *accessible)
 {
-	ECalView *cal_view;
+	ECalendarView *cal_view;
 	GnomeCalendar *gnomeCalendar;
 
 	g_return_val_if_fail (EA_IS_CAL_VIEW (accessible), NULL);
 
 	if (!GTK_ACCESSIBLE (accessible)->widget)
 		return NULL;
-	cal_view = E_CAL_VIEW (GTK_ACCESSIBLE (accessible)->widget);
+	cal_view = E_CALENDAR_VIEW (GTK_ACCESSIBLE (accessible)->widget);
 
-	gnomeCalendar = e_cal_view_get_calendar (cal_view);
+	gnomeCalendar = e_calendar_view_get_calendar (cal_view);
 
 	return gtk_widget_get_accessible (GTK_WIDGET(gnomeCalendar));
 }
 
 static void
-ea_cal_view_event_changed_cb (ECalView *cal_view, ECalViewEvent *event,
+ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
                               gpointer data)
 {
 	AtkObject *atk_obj;
 	EaCalView *ea_cal_view;
 	AtkObject *event_atk_obj = NULL;
 
-	g_return_if_fail (E_IS_CAL_VIEW (cal_view));
+	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 
 	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
 	if (!EA_IS_CAL_VIEW (atk_obj))
@@ -225,7 +225,7 @@ ea_cal_view_event_changed_cb (ECalView *cal_view, ECalViewEvent *event,
 }
 
 static void
-ea_cal_view_event_added_cb (ECalView *cal_view, ECalViewEvent *event,
+ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
                             gpointer data)
 {
 	AtkObject *atk_obj;
@@ -233,7 +233,7 @@ ea_cal_view_event_added_cb (ECalView *cal_view, ECalViewEvent *event,
 	AtkObject *event_atk_obj = NULL;
 	gint index;
 
-	g_return_if_fail (E_IS_CAL_VIEW (cal_view));
+	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 
 	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
 	if (!EA_IS_CAL_VIEW (atk_obj))
@@ -327,7 +327,7 @@ action_interface_do_action (AtkAction *action, gint index)
 	GtkWidget *widget;
 	gboolean return_value = TRUE;
 	time_t dtstart, dtend;
-	ECalView *cal_view;
+	ECalendarView *cal_view;
 
 	widget = GTK_ACCESSIBLE (action)->widget;
 	if (widget == NULL)
@@ -339,33 +339,33 @@ action_interface_do_action (AtkAction *action, gint index)
 	if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
 		return FALSE;
 
-	cal_view = E_CAL_VIEW (widget);
+	cal_view = E_CALENDAR_VIEW (widget);
 	 switch (index) {
 	 case 0:
 		 /* New Appointment */
-		 e_cal_view_new_appointment (cal_view);
+		 e_calendar_view_new_appointment (cal_view);
 		 break;
 	 case 1:
 		 /* New Event */
-		 e_cal_view_get_selected_time_range (cal_view,
+		 e_calendar_view_get_selected_time_range (cal_view,
 						     &dtstart, &dtend);
-		 e_cal_view_new_appointment_for (cal_view,
+		 e_calendar_view_new_appointment_for (cal_view,
 						 dtstart, dtend, TRUE, FALSE);
 		 break;
 	 case 2:
 		 /* New Meeting */
-		 e_cal_view_get_selected_time_range (cal_view,
+		 e_calendar_view_get_selected_time_range (cal_view,
 						     &dtstart, &dtend);
-		 e_cal_view_new_appointment_for (cal_view,
+		 e_calendar_view_new_appointment_for (cal_view,
 						 dtstart, dtend, FALSE, TRUE);
 		 break;
 	 case 3:
 		 /* Go to today */
 		 break;
-		 calendar_goto_today (e_cal_view_get_calendar (cal_view));
+		 calendar_goto_today (e_calendar_view_get_calendar (cal_view));
 	 case 4:
 		 /* Go to date */
-		 goto_dialog (e_cal_view_get_calendar (cal_view));
+		 goto_dialog (e_calendar_view_get_calendar (cal_view));
 		 break;
 	 default:
 		 return_value = FALSE;
diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c
index e8b0d3aa9c..535265ebeb 100644
--- a/a11y/calendar/ea-calendar-helpers.c
+++ b/a11y/calendar/ea-calendar-helpers.c
@@ -63,7 +63,7 @@ ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item)
  * Get the cal view widget contains the canvas_item.
  * 
  **/
-ECalView *
+ECalendarView *
 ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item)
 {
 	GnomeCanvas *canvas;
@@ -77,25 +77,25 @@ ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item)
 	/* parent of canvas_item->canvas is the EDayView or EWeekView widget */
 	canvas = canvas_item->canvas;
 	view_widget = gtk_widget_get_parent (GTK_WIDGET(canvas));
-	if (!view_widget || !E_IS_CAL_VIEW (view_widget))
+	if (!view_widget || !E_IS_CALENDAR_VIEW (view_widget))
 		return NULL;
-	return E_CAL_VIEW (view_widget);
+	return E_CALENDAR_VIEW (view_widget);
 }
 
 /**
  * ea_calendar_helpers_get_cal_view_event_from
  * @canvas_item: the cavas_item (e_text) for the event
- * @returns: the ECalViewEvent
+ * @returns: the ECalendarViewEvent
  *
- * Get the ECalViewEvent for the canvas_item.
+ * Get the ECalendarViewEvent for the canvas_item.
  *
  **/
-ECalViewEvent *
+ECalendarViewEvent *
 ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item)
 {
-	ECalView *cal_view;
+	ECalendarView *cal_view;
 	gboolean event_found;
-	ECalViewEvent *cal_view_event;
+	ECalendarViewEvent *cal_view_event;
 
 	g_return_val_if_fail (E_IS_TEXT (canvas_item), NULL);
 
@@ -122,7 +122,7 @@ ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item)
 			day_view_event = &g_array_index (day_view->events[event_day],
 							 EDayViewEvent, event_num);
 		}
-		cal_view_event = (ECalViewEvent *) day_view_event;
+		cal_view_event = (ECalendarViewEvent *) day_view_event;
 	}
 	else if (E_IS_WEEK_VIEW (cal_view)) {
 		gint event_num, span_num;
@@ -138,7 +138,7 @@ ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item)
 		week_view_event = &g_array_index (week_view->events, EWeekViewEvent,
 						  event_num);
 
-		cal_view_event = (ECalViewEvent *)week_view_event;
+		cal_view_event = (ECalendarViewEvent *)week_view_event;
 	}
 	else {
 		g_assert_not_reached ();
diff --git a/a11y/calendar/ea-calendar-helpers.h b/a11y/calendar/ea-calendar-helpers.h
index 3b7417a4c0..50d997d91d 100644
--- a/a11y/calendar/ea-calendar-helpers.h
+++ b/a11y/calendar/ea-calendar-helpers.h
@@ -34,10 +34,10 @@
 AtkObject *
 ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item);
 
-ECalView *
+ECalendarView *
 ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item);
 
-ECalViewEvent *
+ECalendarViewEvent *
 ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item);
 
 #endif /* _EA_CALENDAR_HELPERS_H__ */