[evolution-patches] patch for exchange recurrences changes

[Rodrigo Moya <rodrigo novell com>]

This fixes evolution-exchange to build with the new changes in e-d-s
(after the recurrences-work branch merge)
-- 
Rodrigo Moya <rodrigo novell com>

? depcomp
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.204
diff -u -p -r1.204 ChangeLog
--- ChangeLog	15 Dec 2004 15:14:26 -0000	1.204
+++ ChangeLog	15 Dec 2004 18:51:59 -0000
@@ -1,3 +1,12 @@
+2004-12-15  Rodrigo Moya <rodrigo novell com>
+
+	* addressbook/e-book-backend-exchange.c: use libedataserver's e-sexp.h.
+
+	* calendar/e-cal-backend-exchange.c (receive_objects, book_resource):
+	pass correct number of arguments to e_cal_backend_notify_object_removed.
+
+	* storage/Makefile.am: removed exchange-offline-utils.[ch] from build.
+
 2004-12-15  Sarfraaz Ahmed <asarfraaz novell com>
 
 	* calendar/e-cal-backend-exchange.c : Fixed some memory leaks.
Index: addressbook/e-book-backend-exchange.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/addressbook/e-book-backend-exchange.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-book-backend-exchange.c
--- addressbook/e-book-backend-exchange.c	14 Dec 2004 10:42:20 -0000	1.15
+++ addressbook/e-book-backend-exchange.c	15 Dec 2004 18:51:59 -0000
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <e-util/e-sexp.h>
+#include <libedataserver/e-sexp.h>
 #include <e-util/e-uid.h>
 #include <gal/util/e-util.h>
 #include <libebook/e-address-western.h>
Index: calendar/e-cal-backend-exchange-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/calendar/e-cal-backend-exchange-calendar.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-cal-backend-exchange-calendar.c
--- calendar/e-cal-backend-exchange-calendar.c	15 Dec 2004 15:14:26 -0000	1.21
+++ calendar/e-cal-backend-exchange-calendar.c	15 Dec 2004 18:52:00 -0000
@@ -1096,7 +1096,7 @@ receive_objects (ECalBackendSync *backen
 		case ICAL_METHOD_CANCEL:
 			calobj = (char *) icalcomponent_as_ical_string (subcomp);
 			status = remove_object (backend, cal, uid, rid, CALOBJ_MOD_THIS, &calobj);
-			e_cal_backend_notify_object_removed (E_CAL_BACKEND (backend), uid, calobj);
+			e_cal_backend_notify_object_removed (E_CAL_BACKEND (backend), uid, calobj, NULL);
 			break;
 		default:
 			status = GNOME_Evolution_Calendar_UnsupportedMethod;
@@ -1248,7 +1248,7 @@ book_resource (ECalBackendExchange *cbex
 		calobj = (char *) e_cal_component_get_as_string (comp);
 		rid = (char *) e_cal_component_get_recurid_as_string (comp);
 		status = remove_object (E_CAL_BACKEND_SYNC (cbex), cal, uid, rid, CALOBJ_MOD_THIS, &calobj);
-		e_cal_backend_notify_object_removed (E_CAL_BACKEND (cbex), uid, calobj);
+		e_cal_backend_notify_object_removed (E_CAL_BACKEND (cbex), uid, calobj, NULL);
 
 	} else {
 		/* Check that the new appointment doesn't conflict with any
Index: storage/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/Makefile.am,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.am
--- storage/Makefile.am	14 Dec 2004 13:12:26 -0000	1.14
+++ storage/Makefile.am	15 Dec 2004 18:52:00 -0000
@@ -65,8 +65,6 @@ evolution_exchange_storage_SOURCES =				
 	exchange-offline-handler.h				\
 	exchange-offline-listener.c				\
 	exchange-offline-listener.h				\
-	exchange-offline-utils.c				\
-	exchange-offline-utils.h				\
 	exchange-oof.c						\
 	exchange-oof.h						\
 	exchange-permissions-dialog.c				\