[evolution-ews: 2/4] Merge with temporary fix of recieve objects

[Pavel Ocheretny <pocheretny src gnome org>]

commit 67f7ad09c3f2b1245db22296e9a5510f7bc99a1c
Merge: 4c4b29b 4e5c0af
Author: Pavel Ocheretny <pocheretny git gnome org>
Date:   Tue May 24 15:07:18 2011 +0300

    Merge with temporary fix of recieve objects

 src/calendar/e-cal-backend-ews.c |    1 +
 src/camel/camel-ews-folder.c     |    4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --cc src/calendar/e-cal-backend-ews.c
index 3244473,49660f2..cdf21e0
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@@ -1499,12 -1508,13 +1499,13 @@@ e_cal_backend_ews_receive_objects (ECal
  
  		switch (method) {
  			case ICAL_METHOD_REQUEST:
 -				result = e_cal_backend_send_accept_item(backend, subcomp);
 -				e_data_cal_notify_objects_received (cal,context,error);
 -				/* Temporary compile fix until error handling here gets cleaned up... */
 -				(void) result;
 +				result = e_cal_backend_send_accept_item (backend, subcomp, &error);
 +				if (!result && error) {
 +					error->code = OtherError;
 +				}
++
  				break;
  			case ICAL_METHOD_CANCEL:
 -			case ICAL_METHOD_REPLY:
  			default:
  				break;
  		}