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

svn path=/trunk/; revision=23206

1 files changed, 7 insertions, 7 deletions

diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index e9efe92d99..3e9d76dead 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -40,20 +40,20 @@
  * Return value: TRUE if the user clicked Yes, FALSE otherwise.
  **/
 gboolean
-cancel_component_dialog (GtkWindow *parent, CalClient *client, CalComponent *comp, gboolean deleting)
+cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean deleting)
 {
 	GtkWidget *dialog;
-	CalComponentVType vtype;
+	ECalComponentVType vtype;
 	char *str;
 	gint response;
 
-	if (deleting && cal_client_get_save_schedules (client))
+	if (deleting && e_cal_get_save_schedules (client))
 		return TRUE;
 
-	vtype = cal_component_get_vtype (comp);
+	vtype = e_cal_component_get_vtype (comp);
 
 	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
+	case E_CAL_COMPONENT_EVENT:
 		if (deleting)
 			str = g_strdup_printf (_("The event being deleted is a meeting, "
 						 "would you like to send a cancellation notice?"));
@@ -62,7 +62,7 @@ cancel_component_dialog (GtkWindow *parent, CalClient *client, CalComponent *com
 						 "and delete this meeting?"));
 		break;
 
-	case CAL_COMPONENT_TODO:
+	case E_CAL_COMPONENT_TODO:
 		if (deleting)
 			str = g_strdup_printf (_("The task being deleted is assigned, "
 						 "would you like to send a cancellation notice?"));
@@ -71,7 +71,7 @@ cancel_component_dialog (GtkWindow *parent, CalClient *client, CalComponent *com
 						 "and delete this task?"));
 		break;
 
-	case CAL_COMPONENT_JOURNAL:
+	case E_CAL_COMPONENT_JOURNAL:
 		if (deleting)
 			str = g_strdup_printf (_("The journal entry being deleted is published, "
 						 "would you like to send a cancellation notice?"));