diff options
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/cal-util/calobj.c | 10 | ||||
| -rw-r--r-- | calendar/calobj.c | 10 | ||||
| -rw-r--r-- | calendar/gncal-full-day.c | 2 | ||||
| -rw-r--r-- | calendar/gui/gncal-full-day.c | 2 | ||||
| -rw-r--r-- | calendar/pcs/calobj.c | 10 |
6 files changed, 41 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 6b432cb781..5ff0a9cd10 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +1999-02-23 Miguel de Icaza <miguel@nuclecu.unam.mx> + + * calobj.c (ical_object_to_vobject): Save the owner/organizer of + the event. + (ical_object_create_from_vobject): Load the owner/organizer of the event. + + * gncal-full-day.c (delete_occurance): Assign child to data (fixes + crash on "delete this occurrance"). + 1999-02-22 Timur Bakeyev <mc@bat.ru> * calendar.c: According to configured values, use either tm.tm_zone diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c index a615c0e313..6ed9db187a 100644 --- a/calendar/cal-util/calobj.c +++ b/calendar/cal-util/calobj.c @@ -623,6 +623,12 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) free (the_str); } + /* Organizer */ + if (has (o, VCOrgNameProp)){ + ical->organizer = g_strdup (str_val (vo)); + free (the_str); + } + /* related */ if (has (o, VCRelatedToProp)){ ical->related = set_list (str_val (vo)); @@ -899,6 +905,10 @@ ical_object_to_vobject (iCalObject *ical) /* transparency */ addPropValue (o, VCTranspProp, to_str (ical->transp)); + /* Owenr/organizer */ + if (ical->organizer) + addPropValue (o, VCOrgNameProp, ical->organizer); + /* related */ if (ical->related) store_list (o, VCRelatedToProp, ical->related); diff --git a/calendar/calobj.c b/calendar/calobj.c index a615c0e313..6ed9db187a 100644 --- a/calendar/calobj.c +++ b/calendar/calobj.c @@ -623,6 +623,12 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) free (the_str); } + /* Organizer */ + if (has (o, VCOrgNameProp)){ + ical->organizer = g_strdup (str_val (vo)); + free (the_str); + } + /* related */ if (has (o, VCRelatedToProp)){ ical->related = set_list (str_val (vo)); @@ -899,6 +905,10 @@ ical_object_to_vobject (iCalObject *ical) /* transparency */ addPropValue (o, VCTranspProp, to_str (ical->transp)); + /* Owenr/organizer */ + if (ical->organizer) + addPropValue (o, VCOrgNameProp, ical->organizer); + /* related */ if (ical->related) store_list (o, VCRelatedToProp, ical->related); diff --git a/calendar/gncal-full-day.c b/calendar/gncal-full-day.c index f813f1598c..cef08c7fa0 100644 --- a/calendar/gncal-full-day.c +++ b/calendar/gncal-full-day.c @@ -428,7 +428,7 @@ edit_appointment (GtkWidget *widget, gpointer data) static void delete_occurance (GtkWidget *widget, gpointer data) { - Child *child; + Child *child = data; iCalObject *ical; time_t *t; GnomeCalendar *gcal = GNCAL_FULL_DAY (child->widget->parent)->calendar; diff --git a/calendar/gui/gncal-full-day.c b/calendar/gui/gncal-full-day.c index f813f1598c..cef08c7fa0 100644 --- a/calendar/gui/gncal-full-day.c +++ b/calendar/gui/gncal-full-day.c @@ -428,7 +428,7 @@ edit_appointment (GtkWidget *widget, gpointer data) static void delete_occurance (GtkWidget *widget, gpointer data) { - Child *child; + Child *child = data; iCalObject *ical; time_t *t; GnomeCalendar *gcal = GNCAL_FULL_DAY (child->widget->parent)->calendar; diff --git a/calendar/pcs/calobj.c b/calendar/pcs/calobj.c index a615c0e313..6ed9db187a 100644 --- a/calendar/pcs/calobj.c +++ b/calendar/pcs/calobj.c @@ -623,6 +623,12 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) free (the_str); } + /* Organizer */ + if (has (o, VCOrgNameProp)){ + ical->organizer = g_strdup (str_val (vo)); + free (the_str); + } + /* related */ if (has (o, VCRelatedToProp)){ ical->related = set_list (str_val (vo)); @@ -899,6 +905,10 @@ ical_object_to_vobject (iCalObject *ical) /* transparency */ addPropValue (o, VCTranspProp, to_str (ical->transp)); + /* Owenr/organizer */ + if (ical->organizer) + addPropValue (o, VCOrgNameProp, ical->organizer); + /* related */ if (ical->related) store_list (o, VCRelatedToProp, ical->related); |