set the active radio button here. Oops - it wasn't a Bonobo problem after

2000-05-02  Damon Chaplin  <damon@helixcode.com>

        * gui/calendar-commands.c (calendar_control_activate): set the active
        radio button here. Oops - it wasn't a Bonobo problem after all.

        * gui/popup-menu.c (popup_menu): added call to
        e_auto_kill_popup_menu_on_hide() to destroy the menu.

        * gui/e-week-view.c (e_week_view_show_popup_menu):
        * gui/e-day-view.c (e_day_view_on_event_right_click): ico->user_data
        isn't useful any more, since the event editor keeps its own iCalObject.
        So for now we make the menu commands available even when the event is
        being edited in the event editor.
        Also corrected misspellings of 'occurance' -> 'occurrence'.

        * gui/eventedit.c (event_editor_destroy): destroy the iCalObject.
        The event editor now uses its own independent iCalObject.

        * gui/e-week-view.c (e_week_view_on_unrecur_appointment):
        * gui/e-day-view.c (e_day_view_on_unrecur_appointment): create a new
        uid for the new single instance. I'm not sure what we should do about
        the creation/last modification times of the objects.

        * gui/e-week-view.c (e_week_view_on_edit_appointment):
        * gui/e-day-view.c (e_day_view_on_edit_appointment): duplicate the
        iCalObject before passing it to the event editor, since it will change
        the fields. If we don't duplicate it we won't know what has changed
        when we get the "update_event" callback.

        * gui/e-week-view.c (e_week_view_key_press):
        * gui/e-day-view.c (e_day_view_key_press): set the created and last_mod
        times of the new iCalObject. We may want to set the default alarm as
        well.

        * cal-util/calobj.c (ical_gen_uid): made this function public so we
        can generate new uids if necessary.

svn path=/trunk/; revision=2759

2 files changed, 10 insertions, 7 deletions

diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c
index 1634ec084e..f185c31952 100644
--- a/calendar/cal-util/calobj.c
+++ b/calendar/cal-util/calobj.c
@@ -25,7 +25,7 @@ static gint compare_exdates (gconstpointer a, gconstpointer b);
 
 
 
-static char *
+char *
 ical_gen_uid (void)
 {
 	static char *hostname;
@@ -541,7 +541,9 @@ setup_alarm_at (iCalObject *ico, CalendarAlarm *alarm, char *iso_time, VObject *
 }
 
 /*
- * Duplicates an iCalObject.  Implementation is a grand hack
+ * Duplicates an iCalObject.  Implementation is a grand hack.
+ * If you need the new ICalObject to have a new uid, free the current one,
+ * and call ical_gen_uid() to generate a new one.
  */
 iCalObject *
 ical_object_duplicate (iCalObject *o)
@@ -549,8 +551,6 @@ ical_object_duplicate (iCalObject *o)
 	VObject *vo;
 	iCalObject *new;
 
-	/* FIXME!!!!!  The UID needs to change!!! */
-
 	vo = ical_object_to_vobject (o);
 	switch (o->type){
 	case ICAL_EVENT:
diff --git a/calendar/cal-util/calobj.h b/calendar/cal-util/calobj.h
index 0fa82ee36e..25954b8098 100644
--- a/calendar/cal-util/calobj.h
+++ b/calendar/cal-util/calobj.h
@@ -247,13 +247,13 @@ typedef enum {
 
 CalObjFindStatus ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico);
 
-char *ical_object_to_string (iCalObject *ico);
+char       *ical_object_to_string (iCalObject *ico);
 
 
 /* Returns the first toggled day in a weekday mask -- we do this because we do not support multiple
  * days on a monthly-by-pos recurrence.  If no days are toggled, it returns -1.
  */
-int ical_object_get_first_weekday (int weekday_mask);
+int	    ical_object_get_first_weekday (int weekday_mask);
 
 /* Returns the number of seconds configured to trigger the alarm in advance to an event */
 int         alarm_compute_offset (CalendarAlarm *a);
@@ -261,7 +261,10 @@ int         alarm_compute_offset (CalendarAlarm *a);
 
 /* Returns TRUE if the dates of both objects match, including any recurrence
    rules. */
-gboolean ical_object_compare_dates (iCalObject *ico1, iCalObject *ico2);
+gboolean    ical_object_compare_dates (iCalObject *ico1, iCalObject *ico2);
+
+/* Generates a new uid for a calendar object. Should be g_free'd eventually. */
+char	   *ical_gen_uid (void);
 
 END_GNOME_DECLS