Implemented. (gnome_calendar_add_object): Removed function, since it was

2000-06-02  Federico Mena Quintero  <federico@helixcode.com>

	* gui/gnome-cal.c (save_ical_object_cb): Implemented.
	(gnome_calendar_add_object): Removed function, since it was
	identical to gnome_calendar_update_object().  Modified the rest
	of the code to use only the latter.
	(gnome_calendar_remove_object): Be more paranoid about the UID.
	(gnome_calendar_update_object): Ditto.  Also, renamed this
	function from gnome_calendar_object_changed(), for consistency
	with the lower-level CalClient interface.

	* gui/event-editor.c (event_editor_class_init): New
	"save_ical_object" signal to ask that our parent store the
	calendar object to the backend.
	(save_ical_object): New function to save the calendar object,
	actually if just emits the signal.
	(file_save_cb): Implemented.
	(dialog_to_ical_object): We want priv->
	alarm_program_run_program_entry (i.e. the entry inside the
	GnomeFileEntry), not the file entry itself.
	(dialog_to_ical_object): Only insert the recurrence ending date if
	the event is recurrent!

svn path=/trunk/; revision=3380

1 files changed, 9 insertions, 18 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index f80562fb12..66fd908afd 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -2346,7 +2346,7 @@ e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
 	ico = ical_object_duplicate (event->ico);
 
 	ical_object_add_exdate (ico, event->start);
-	gnome_calendar_object_changed (day_view->calendar, ico);
+	gnome_calendar_update_object (day_view->calendar, ico);
 	ical_object_unref (ico);
 }
 
@@ -2401,10 +2401,10 @@ e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
 	/* Now update both iCalObjects. Note that we do this last since at
 	   present the updates happen synchronously so our event may disappear.
 	*/
-	gnome_calendar_object_changed (day_view->calendar, ico);
+	gnome_calendar_update_object (day_view->calendar, ico);
 	ical_object_unref (ico);
 
-	gnome_calendar_add_object (day_view->calendar, new_ico);
+	gnome_calendar_update_object (day_view->calendar, new_ico);
 	ical_object_unref (new_ico);
 }
 
@@ -2899,8 +2899,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 
 	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
 
-	/* Notify calendar of change */
-	gnome_calendar_object_changed (day_view->calendar, &ico);
+	gnome_calendar_update_object (day_view->calendar, &ico);
 }
 
 
@@ -2940,8 +2939,7 @@ e_day_view_finish_resize (EDayView *day_view)
 
 	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
 
-	/* Notify calendar of change */
-	gnome_calendar_object_changed (day_view->calendar, &ico);
+	gnome_calendar_update_object (day_view->calendar, &ico);
 }
 
 
@@ -3890,8 +3888,7 @@ e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
 		g_warning ("Couldn't find event to start editing.\n");
 	}
 
-	gnome_calendar_add_object (day_view->calendar, ico);
-
+	gnome_calendar_update_object (day_view->calendar, ico);
 	ical_object_unref (ico);
 
 	return TRUE;
@@ -4141,9 +4138,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 
 	event->ico->summary = text;
 
-	/* Notify calendar of change. This will result in a call to update,
-	   which will reset the event label as appropriate. */
-	gnome_calendar_object_changed (day_view->calendar, event->ico);
+	gnome_calendar_update_object (day_view->calendar, event->ico);
 }
 
 
@@ -5094,9 +5089,7 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 			if (event->canvas_item)
 				gnome_canvas_item_show (event->canvas_item);
 
-			/* Notify calendar of change */
-			gnome_calendar_object_changed (day_view->calendar, &ico);
-
+			gnome_calendar_update_object (day_view->calendar, &ico);
 			return;
 		}
 	}
@@ -5172,9 +5165,7 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 			if (event->canvas_item)
 				gnome_canvas_item_show (event->canvas_item);
 
-			/* Notify calendar of change */
-			gnome_calendar_object_changed (day_view->calendar, &ico);
-
+			gnome_calendar_update_object (day_view->calendar, &ico);
 			return;
 		}
 	}