[evolution-patches] Recurrence DnD and Make This Occurrence moveable fixes

[JP Rosevear <jpr novell com>]

Should fix 71679.

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2680.2.6
diff -u -r1.2680.2.6 ChangeLog
--- ChangeLog	15 Mar 2005 16:04:32 -0000	1.2680.2.6
+++ ChangeLog	15 Mar 2005 20:08:16 -0000
@@ -1,5 +1,13 @@
 2005-03-15  JP Rosevear  <jpr novell com>
 
+	* gui/e-calendar-view.c (on_unrecur_appointment): clear recur id
+	on the existing and new before updating, modify ALL for the master
+
+	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):
+	abort sequence to fix DnD in instance case
+
+2005-03-15  JP Rosevear  <jpr novell com>
+	
 	* gui/itip-utils.c (itip_send_comp): when publishing, the to_list
 	will always be null so don't error out then
 
Index: gui/e-calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.c,v
retrieving revision 1.76
diff -u -r1.76 e-calendar-view.c
--- gui/e-calendar-view.c	4 Feb 2005 12:18:51 -0000	1.76
+++ gui/e-calendar-view.c	15 Mar 2005 20:08:17 -0000
@@ -1289,6 +1289,7 @@
 
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
+	e_cal_component_set_recurid (comp, NULL);
 	cal_comp_util_add_exdate (comp, event->comp_data->instance_start, e_calendar_view_get_timezone (cal_view));
 	e_cal_component_commit_sequence (comp);
 
@@ -1300,6 +1301,7 @@
 	new_uid = e_cal_component_gen_uid ();
 	e_cal_component_set_uid (new_comp, new_uid);
 	g_free (new_uid);
+	e_cal_component_set_recurid (new_comp, NULL);
 	e_cal_component_set_rdate_list (new_comp, NULL);
 	e_cal_component_set_rrule_list (new_comp, NULL);
 	e_cal_component_set_exdate_list (new_comp, NULL);
@@ -1319,7 +1321,7 @@
 	/* Now update both ECalComponents. Note that we do this last since at
 	 * present the updates happen synchronously so our event may disappear.
 	 */
-	if (!e_cal_modify_object (client, e_cal_component_get_icalcomponent (comp), CALOBJ_MOD_THIS, NULL))
+	if (!e_cal_modify_object (client, e_cal_component_get_icalcomponent (comp), CALOBJ_MOD_ALL, NULL))
 		g_message ("on_unrecur_appointment(): Could not update the object!");
 
 	g_object_unref (comp);
Index: gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.268.2.1
diff -u -r1.268.2.1 e-day-view.c
--- gui/e-day-view.c	15 Mar 2005 02:33:55 -0000	1.268.2.1
+++ gui/e-day-view.c	15 Mar 2005 20:08:18 -0000
@@ -7317,6 +7317,7 @@
 			*date.value = icaltime_from_timet_with_zone (dt, FALSE,
 								     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 			e_cal_component_set_dtend (comp, &date);
+			e_cal_component_abort_sequence (comp);
 
 			gtk_drag_finish (context, TRUE, TRUE, time);