diff options
| author | JP Rosevear <jpr@helixcode.com> | 2000-08-26 04:46:08 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2000-08-26 04:46:08 +0800 |
| commit | 10e6501b5dca0bd5375d5d4f4ece5cdb1bbee9d4 (patch) | |
| tree | 72e631f1c354a3b2c94fe927250fcdbbfac8b901 /calendar/gui/calendar-model.c | |
| parent | c1f3e5432aab231b1e565e9a79e065abf622d4a7 (diff) | |
| download | gsoc2013-evolution-10e6501b5dca0bd5375d5d4f4ece5cdb1bbee9d4.tar gsoc2013-evolution-10e6501b5dca0bd5375d5d4f4ece5cdb1bbee9d4.tar.gz gsoc2013-evolution-10e6501b5dca0bd5375d5d4f4ece5cdb1bbee9d4.tar.bz2 gsoc2013-evolution-10e6501b5dca0bd5375d5d4f4ece5cdb1bbee9d4.tar.lz gsoc2013-evolution-10e6501b5dca0bd5375d5d4f4ece5cdb1bbee9d4.tar.xz gsoc2013-evolution-10e6501b5dca0bd5375d5d4f4ece5cdb1bbee9d4.tar.zst gsoc2013-evolution-10e6501b5dca0bd5375d5d4f4ece5cdb1bbee9d4.zip | |
Don't attempt to free this if its null (calendar_model_duplicate_value):
2000-08-25 JP Rosevear <jpr@helixcode.com>
* gui/calendar-model.c (get_is_complete): Don't attempt to
free this if its null
(calendar_model_duplicate_value): Implement for summary field
value
(calendar_model_initialize_value): Remove debug code
* gui/e-calendar-table.c: Correct etable init xml
(create_column): Pass the id to e_table_header_add_column
rather than a hard coded one
(e_calendar_table_init): Make sure summary column isn't
added twice. Add an alarms column, else etable won't
work with columns who have an ID higher than that
svn path=/trunk/; revision=5040
Diffstat (limited to 'calendar/gui/calendar-model.c')
| -rw-r--r-- | calendar/gui/calendar-model.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c index e9f1a8884b..aac20d2b7c 100644 --- a/calendar/gui/calendar-model.c +++ b/calendar/gui/calendar-model.c @@ -553,7 +553,9 @@ get_is_complete (CalComponent *comp) cal_component_get_completed (comp, &t); retval = (t != NULL); - cal_component_free_icaltimetype (t); + if (retval) + cal_component_free_icaltimetype (t); + return retval; } @@ -1239,6 +1241,7 @@ calendar_model_duplicate_value (ETableModel *etm, int col, const void *value) case CAL_COMPONENT_FIELD_GEO: case CAL_COMPONENT_FIELD_PERCENT: case CAL_COMPONENT_FIELD_PRIORITY: + case CAL_COMPONENT_FIELD_SUMMARY: return dup_string (value); case CAL_COMPONENT_FIELD_TRANSPARENCY: @@ -1331,10 +1334,8 @@ calendar_model_initialize_value (ETableModel *etm, int col) case CAL_COMPONENT_FIELD_GEO: case CAL_COMPONENT_FIELD_PERCENT: case CAL_COMPONENT_FIELD_PRIORITY: - return init_string (); - case CAL_COMPONENT_FIELD_SUMMARY: - return g_strdup ("Hello"); + return init_string (); case CAL_COMPONENT_FIELD_TRANSPARENCY: return NULL; |