diff options
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/calendar-model.c | 12 | ||||
| -rw-r--r-- | calendar/gui/goto-dialog.glade | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 213a363f83..5fa5d4f17c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2001-08-07 Federico Mena Quintero <federico@ximian.com> + + * gui/calendar-model.c (calendar_model_free_value): Only unref the + FIELD_COMPONENT if it is non-NULL. We return a NULL for that + field from ::initialize_value(), after all. Fixes bug #6098. + 2001-08-07 JP Rosevear <jpr@ximian.com> * gui/itip-utils.c (itip_send_comp): Make calendar.ics the diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c index f61b76cd88..b7aca002ce 100644 --- a/calendar/gui/calendar-model.c +++ b/calendar/gui/calendar-model.c @@ -1445,7 +1445,8 @@ calendar_model_free_value (ETableModel *etm, int col, void *value) switch (col) { case CAL_COMPONENT_FIELD_CATEGORIES: - g_free (value); + if (value) + g_free (value); break; case CAL_COMPONENT_FIELD_CLASSIFICATION: @@ -1460,14 +1461,16 @@ calendar_model_free_value (ETableModel *etm, int col, void *value) case CAL_COMPONENT_FIELD_PRIORITY: case CAL_COMPONENT_FIELD_SUMMARY: case CAL_COMPONENT_FIELD_STATUS: - g_free (value); + if (value) + g_free (value); break; case CAL_COMPONENT_FIELD_TRANSPARENCY: break; case CAL_COMPONENT_FIELD_URL: - g_free (value); + if (value) + g_free (value); break; case CAL_COMPONENT_FIELD_HAS_ALARMS: @@ -1479,7 +1482,8 @@ calendar_model_free_value (ETableModel *etm, int col, void *value) break; case CAL_COMPONENT_FIELD_COMPONENT: - gtk_object_unref (GTK_OBJECT (value)); + if (value) + gtk_object_unref (GTK_OBJECT (value)); break; default: diff --git a/calendar/gui/goto-dialog.glade b/calendar/gui/goto-dialog.glade index af5ceb4b1f..8fc438982e 100644 --- a/calendar/gui/goto-dialog.glade +++ b/calendar/gui/goto-dialog.glade @@ -60,7 +60,7 @@ <name>button4</name> <can_default>True</can_default> <can_focus>True</can_focus> - <label>_Go To Today</label> + <label>_Go to Today</label> <stock_pixmap>GNOME_STOCK_PIXMAP_JUMP_TO</stock_pixmap> </widget> |