[Fwd: [evolution-patches] Fix for http://bugzilla.gnome.org/show_bug.cgi?id=303702]

[Veerapuram Varadhan <vvaradhan novell com>]

Can I assume the patch attached to my-attached-original mail is ok to
commit?

Thanks,

V. Varadhan

--- Begin Message ---

• From: Veerapuram Varadhan <vvaradhan novell com>
• To: evolution-patches lists ximian com
• Cc: jpr novell com
• Subject: [evolution-patches] Fix for http://bugzilla.gnome.org/show_bug.cgi?id=303702
• Date: Mon, 13 Jun 2005 18:38:13 +0530

Hi,

Attached below the patch to fix
http://bugzilla.gnome.org/show_bug.cgi?id=303702 (based on David's
patch).

Kindly let me know your comments.

Thanks,

V. Varadhan

? exchange-plugin-build-fixes.patch
? patch-fix-273577.diff
? addressbook/addressbook.error
? calendar/calendar.error
? calendar/gui/apps_evolution_calendar-2.4.schemas
? composer/mail-composer.error
? e-util/e-system.error
? filter/filter.error
? help/C/evolution-2.4-C.omf
? help/C/evolution-2.4.xml
? mail/.cvsignore
? mail/Evolution-Mail-common.c
? mail/Evolution-Mail-skels.c
? mail/Evolution-Mail-stubs.c
? mail/Evolution-Mail.h
? mail/evolution-mail-2.4.schemas
? mail/mail.error
? mail/default/zh_CN/Makefile
? mail/default/zh_CN/Makefile.in
? plugins/addressbook-file/Makefile
? plugins/addressbook-file/Makefile.in
? plugins/addressbook-file/org-gnome-addressbook-file.eplug
? plugins/addressbook-groupwise/Makefile
? plugins/addressbook-groupwise/Makefile.in
? plugins/addressbook-groupwise/org-gnome-addressbook-groupwise.eplug
? plugins/default-source/Makefile
? plugins/default-source/Makefile.in
? plugins/default-source/org-gnome-default-source.eplug
? plugins/exchange-account-setup/Makefile
? plugins/exchange-account-setup/Makefile.in
? plugins/exchange-account-setup/exchange-account.c
? plugins/exchange-account-setup/exchange-account.h
? plugins/exchange-account-setup/exchange-account.loT
? plugins/exchange-account-setup/exchange-change-password.c
? plugins/exchange-account-setup/exchange-change-password.glade
? plugins/exchange-account-setup/exchange-change-password.h
? plugins/exchange-account-setup/exchange-offline-listener.c
? plugins/exchange-account-setup/exchange-offline-listener.h
? plugins/exchange-account-setup/exchange-permissions-dialog.c
? plugins/exchange-account-setup/exchange-permissions-dialog.glade
? plugins/exchange-account-setup/exchange-permissions-dialog.h
? plugins/exchange-account-setup/exchange-permissions-dialog.loT
? plugins/exchange-account-setup/org-gnome-exchange-account-setup.eplug
? plugins/exchange-account-setup/org-gnome-exchange-folder-permissions.eplug
? plugins/exchange-account-setup/org-gnome-exchange-folder-permissions.eplug.in
? plugins/groupwise-account-setup/Makefile
? plugins/groupwise-account-setup/Makefile.in
? plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug
? plugins/groupwise-features/Makefile
? plugins/groupwise-features/Makefile.in
? plugins/groupwise-features/org-gnome-groupwise-features.eplug
? plugins/groupwise-send-options/Makefile
? plugins/groupwise-send-options/Makefile.in
? plugins/groupwise-send-options/org-gnome-compose-send-options.eplug
? plugins/groupwise-status-tracking/Makefile
? plugins/groupwise-status-tracking/Makefile.in
? plugins/groupwise-status-tracking/org-gnome-status-track.eplug
? plugins/itip-formatter/org-gnome-itip-formatter.error
? plugins/mail-remote/Makefile
? plugins/mail-remote/Makefile.in
? plugins/mailing-list-actions/org-gnome-mailing-list-actions.error
? plugins/mark-all-read/Makefile
? plugins/mark-all-read/Makefile.in
? plugins/mark-all-read/org-gnome-mark-all-read.eplug
? plugins/mono/Makefile
? plugins/mono/Makefile.in
? plugins/new-mail-notify/Makefile
? plugins/new-mail-notify/Makefile.in
? plugins/print-message/Makefile
? plugins/print-message/Makefile.in
? plugins/print-message/org-gnome-print-message.eplug
? plugins/profiler/Makefile
? plugins/profiler/Makefile.in
? plugins/send-options/Makefile
? plugins/send-options/Makefile.in
? plugins/send-options/org-gnome-send-options.eplug
? plugins/shared-folder/Makefile
? plugins/shared-folder/Makefile.in
? plugins/shared-folder/org-gnome-shared-folder.eplug
? shell/shell.error
Index: calendar/conduits/calendar/calendar-conduit.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/conduits/calendar/calendar-conduit.c,v
retrieving revision 1.126
diff -u -p -r1.126 calendar-conduit.c
--- calendar/conduits/calendar/calendar-conduit.c	21 Dec 2004 18:35:10 -0000	1.126
+++ calendar/conduits/calendar/calendar-conduit.c	13 Jun 2005 12:20:22 -0000
@@ -616,6 +616,7 @@ process_multi_day (ECalConduitContext *c
  	old_end_value = dt_end.value;
 	while (!last) {
 		ECalComponent *clone = e_cal_component_clone (ccc->comp);
+		icalcomponent *ical_comp = NULL;
 		char *new_uid = e_cal_component_gen_uid ();
 		struct icaltimetype start_value, end_value;
 		ECalChange *c = g_new0 (ECalChange, 1);
@@ -635,8 +636,16 @@ process_multi_day (ECalConduitContext *c
 		dt_end.value = &end_value;
 		e_cal_component_set_dtend (clone, &dt_end);
 
+		e_cal_component_commit_sequence (clone);
+		
 		/* FIXME Error handling */
-		e_cal_create_object (ctxt->client, e_cal_component_get_icalcomponent (clone), NULL, NULL);
+		ical_comp = e_cal_component_get_icalcomponent (clone);
+		if (!ical_comp) {
+			ret = FALSE;
+			goto cleanup;
+		}
+
+		e_cal_create_object (ctxt->client, ical_comp, NULL, NULL);
 
 		c->comp = clone;
 		c->type = E_CAL_CHANGE_ADDED;
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2745
diff -u -p -r1.2745 ChangeLog
--- calendar/ChangeLog	13 Jun 2005 08:30:30 -0000	1.2745
+++ calendar/ChangeLog	13 Jun 2005 13:05:46 -0000
@@ -1,3 +1,12 @@
+2005-06-13  Veerapuram Varadhan <vvaradhan novell com>
+
+	Fixes #303702
+	
+	* conduits/calendar/calendar-conduit.c (process_multi_day):
+	call e_cal_component_commit_sequence () to ensure that the
+	component's sequence number is consistent with the state of the
+	object.
+
 2005-06-13  Jedy Wang  <jedy wang sun com>
 
 	We need compare backend for long events too.

_______________________________________________
evolution-patches mailing list
evolution-patches lists ximian com
http://lists.ximian.com/mailman/listinfo/evolution-patches

--- End Message ---