Fixes #60289

2004-07-09  Rodrigo Moya <rodrigo@novell.com>

	Fixes #60289

	* gui/dialogs/select-source-dialog.c (select_source_dialog): set the
	absolute URI on the selected source, so that the ESource we keep
	around has a valid URI.

	* gui/e-calendar-view.c (transfer_item_to): when copying appointments,
	change the UID.
	(transfer_selected_items): don't pass hardcoded values to transfer_item_to.

svn path=/trunk/; revision=26608

1 files changed, 15 insertions, 2 deletions

diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 46d8722fda..2150ca0993 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1113,12 +1113,25 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_
 		if (!e_cal_modify_object (dest_client, event->comp_data->icalcomp, CALOBJ_MOD_ALL, NULL))
 			return;
 	} else {
+		orig_icalcomp = icalcomponent_new_clone (event->comp_data->icalcomp);
+
+		if (!remove_item) {
+			/* change the UID to avoid problems with duplicated UIDs */
+			new_uid = e_cal_component_gen_uid ();
+			icalcomponent_set_uid (orig_icalcomp, new_uid);
+
+			g_free (new_uid);
+		}
+
 		new_uid = NULL;
-		if (!e_cal_create_object (dest_client, event->comp_data->icalcomp, &new_uid, NULL))
+		if (!e_cal_create_object (dest_client, orig_icalcomp, &new_uid, NULL)) {
+			icalcomponent_free (orig_icalcomp);
 			return;
+		}
 
 		if (new_uid)
 			g_free (new_uid);
+		icalcomponent_free (orig_icalcomp);
 	}
 
 	/* remove the item from the source calendar */
@@ -1158,7 +1171,7 @@ transfer_selected_items (ECalendarView *cal_view, gboolean remove_item)
 		e_calendar_view_set_status_message (cal_view, _("Copying items"));
 
 	for (l = selected; l != NULL; l = l->next)
-		transfer_item_to ((ECalendarViewEvent *) l->data, dest_client, TRUE);
+		transfer_item_to ((ECalendarViewEvent *) l->data, dest_client, remove_item);
 
 	e_calendar_view_set_status_message (cal_view, NULL);