[evolution-ews] Move the recurrence element creation to a proper place when creating a new calendar item or when mod
- From: Or Goshen <ogosh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] Move the recurrence element creation to a proper place when creating a new calendar item or when mod
- Date: Thu, 7 Jul 2011 09:36:38 +0000 (UTC)
commit 5a5505dc3659ea08205da66b260fe13562b1a0ad
Author: Or Goshen <orx goshen intel com>
Date: Thu Jul 7 12:45:04 2011 +0300
Move the recurrence element creation to a proper place when creating a new calendar item or when modifying one
src/calendar/e-cal-backend-ews.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 185190e..c35128f 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -1054,12 +1054,6 @@ convert_vevent_calcomp_to_xml(ESoapMessage *msg, gpointer user_data)
/* location */
e_ews_message_write_string_parameter(msg, "Location", NULL, icalcomponent_get_location(icalcomp));
-
- /* Recurrence */
- prop = icalcomponent_get_first_property(icalcomp, ICAL_RRULE_PROPERTY);
- if (prop != NULL) {
- ewscal_set_reccurence(msg, prop, &dtstart);
- }
/* collect attendees */
e_ews_collect_attendees(icalcomp, &required, &optional, &resource);
@@ -1078,6 +1072,12 @@ convert_vevent_calcomp_to_xml(ESoapMessage *msg, gpointer user_data)
}
/* end of attendees */
+ /* Recurrence */
+ prop = icalcomponent_get_first_property(icalcomp, ICAL_RRULE_PROPERTY);
+ if (prop != NULL) {
+ ewscal_set_reccurence(msg, prop, &dtstart);
+ }
+
/* TODO:attachments */
if (0 /* Exchange 2010 detected */ && dtstart.zone != dtend.zone) {
@@ -1632,12 +1632,6 @@ convert_vevent_component_to_updatexml(ESoapMessage *msg, gpointer user_data)
convert_property_to_updatexml (msg, "Location", icalcomponent_get_location(icalcomp), "calendar", NULL, NULL);
- /* Recurrence */
- prop = icalcomponent_get_first_property(icalcomp, ICAL_RRULE_PROPERTY);
- if (prop != NULL) {
- ewscal_set_reccurence(msg, prop, &dtstart);
- }
-
e_ews_collect_attendees(icalcomp, &required, &optional, &resource);
if (required != NULL) {
e_ews_message_start_set_item_field (msg, "RequiredAttendees", "calendar");
@@ -1664,6 +1658,12 @@ convert_vevent_component_to_updatexml(ESoapMessage *msg, gpointer user_data)
e_ews_message_end_set_item_field (msg);
}
+ /* Recurrence */
+ prop = icalcomponent_get_first_property(icalcomp, ICAL_RRULE_PROPERTY);
+ if (prop != NULL) {
+ ewscal_set_reccurence(msg, prop, &dtstart);
+ }
+
if (0 /* Exchange 2010 detected */ && dtstart.zone != dtend.zone) {
if (dtstart.zone) {
e_ews_message_start_set_item_field (msg, "StartTimeZone", "calendar");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]