diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 3455b168df..66e6d26b81 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2004-02-05 JP Rosevear <jpr@ximian.com> + + * gui/dialogs/cal-prefs-dialog.c (set_color_picker): make failure + not so draconian - make the color black + + Fixes #53547 + 2004-02-05 Kidd Wang <kidd.wang@sun.com> * gui/goto-dialog.glade: add a mnemonic for the 'Go to Today' button @@ -9,7 +16,6 @@ * gui/e-itip-control.c (get_next): added a check for NULL - 2004-02-04 JP Rosevear <jpr@ximian.com> * importers/icalendar-importer.c (gnome_calendar_import_data_fn): diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 635c665cc1..a821bdc70f 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -528,12 +528,8 @@ set_color_picker (GtkWidget *picker, const char *spec) { GdkColor color; - g_assert (spec != NULL); - - if (!gdk_color_parse (spec, &color)) { + if (!spec || !gdk_color_parse (spec, &color)) color.red = color.green = color.blue = 0; - return; - } gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker), color.red, |