diff options
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/cal-util/calobj.c | 6 | ||||
| -rw-r--r-- | calendar/calobj.c | 6 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/pcs/calobj.c | 6 |
6 files changed, 19 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 22c4a8eb9f..81c9707025 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +1998-08-21 Miguel de Icaza <miguel@nuclecu.unam.mx> + + * calobj.c (ical_object_create_from_vobject): If mail alarm or + program alarm are missing the action, then set an empty default. + 1998-08-18 Federico Mena Quintero <federico@nuclecu.unam.mx> * gnome-month-item.c (gnome_month_item_day2index): New public diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 87225447f6..fb241739ee 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -20,6 +20,7 @@ gnomecal_SOURCES = \ calobj.h \ eventedit.c \ eventedit.h \ + getdate.y \ gncal-day-panel.c \ gncal-day-panel.h \ gncal-day-view.c \ @@ -34,7 +35,6 @@ gnomecal_SOURCES = \ gncal-year-view.h \ gnome-month-item.c \ gnome-month-item.h \ - getdate.y \ gnome-cal.c \ gnome-cal.h \ goto.c \ diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c index d8ca3fe5db..33aff8cda8 100644 --- a/calendar/cal-util/calobj.c +++ b/calendar/cal-util/calobj.c @@ -676,7 +676,8 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) if ((a = is_a_prop_of (vo, VCProcedureNameProp))){ ical->palarm.data = g_strdup (str_val (a)); free (the_str); - } + } else + ical->palarm.data = g_strdup (""); } } @@ -692,7 +693,8 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) if ((a = is_a_prop_of (vo, VCEmailAddressProp))){ ical->malarm.data = g_strdup (str_val (a)); free (the_str); - } + } else + ical->malarm.data = g_strdup (""); } } diff --git a/calendar/calobj.c b/calendar/calobj.c index d8ca3fe5db..33aff8cda8 100644 --- a/calendar/calobj.c +++ b/calendar/calobj.c @@ -676,7 +676,8 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) if ((a = is_a_prop_of (vo, VCProcedureNameProp))){ ical->palarm.data = g_strdup (str_val (a)); free (the_str); - } + } else + ical->palarm.data = g_strdup (""); } } @@ -692,7 +693,8 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) if ((a = is_a_prop_of (vo, VCEmailAddressProp))){ ical->malarm.data = g_strdup (str_val (a)); free (the_str); - } + } else + ical->malarm.data = g_strdup (""); } } diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 87225447f6..fb241739ee 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -20,6 +20,7 @@ gnomecal_SOURCES = \ calobj.h \ eventedit.c \ eventedit.h \ + getdate.y \ gncal-day-panel.c \ gncal-day-panel.h \ gncal-day-view.c \ @@ -34,7 +35,6 @@ gnomecal_SOURCES = \ gncal-year-view.h \ gnome-month-item.c \ gnome-month-item.h \ - getdate.y \ gnome-cal.c \ gnome-cal.h \ goto.c \ diff --git a/calendar/pcs/calobj.c b/calendar/pcs/calobj.c index d8ca3fe5db..33aff8cda8 100644 --- a/calendar/pcs/calobj.c +++ b/calendar/pcs/calobj.c @@ -676,7 +676,8 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) if ((a = is_a_prop_of (vo, VCProcedureNameProp))){ ical->palarm.data = g_strdup (str_val (a)); free (the_str); - } + } else + ical->palarm.data = g_strdup (""); } } @@ -692,7 +693,8 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) if ((a = is_a_prop_of (vo, VCEmailAddressProp))){ ical->malarm.data = g_strdup (str_val (a)); free (the_str); - } + } else + ical->malarm.data = g_strdup (""); } } |