diff options
| -rw-r--r-- | my-evolution/ChangeLog | 11 | ||||
| -rw-r--r-- | my-evolution/e-summary-tasks.c | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 5f3f61f662..34abbc9916 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,14 @@ +2003-08-12 Jack Jia <jack.jia@sun.com> + + [Fixed bug #47563] + + * e-summary-tasks.c (setup_task_folder) : set a default value for the + tasks->due_today_colour and tasks->overdue_colour, if the key in gconf + is NULL. and change the key name from TasksDueTodayi to due_today, from + TasksOverdue to overdue, in order to coincide with the key in + e-summary-tasks.c(setup_task_folder).In this way, it can avoid crash + on solaris. + 2003-08-11 Ettore Perazzoli <ettore@ximian.com> Patch from Lorenzo Gil Sanchez <lgs@sicem.biz> diff --git a/my-evolution/e-summary-tasks.c b/my-evolution/e-summary-tasks.c index 87697349d5..e5f61cc343 100644 --- a/my-evolution/e-summary-tasks.c +++ b/my-evolution/e-summary-tasks.c @@ -485,9 +485,14 @@ setup_task_folder (ESummary *summary) g_free (tasks->default_uri); tasks->due_today_colour = gconf_client_get_string (tasks->gconf_client, - "/apps/evolution/calendar/tasks/colors/TasksDueToday", NULL); + "/apps/evolution/calendar/tasks/colors/due_today", NULL); + if (!tasks->due_today_colour) + tasks->due_today_colour = g_strdup ("blue"); + tasks->overdue_colour = gconf_client_get_string (tasks->gconf_client, - "/apps/evolution/calendar/tasks/colors/TasksOverdue", NULL); + "/apps/evolution/calendar/tasks/colors/overdue", NULL); + if (!tasks->overdue_colour) + tasks->overdue_colour = g_strdup ("red"); tasks->default_uri = gconf_client_get_string (tasks->gconf_client, "/apps/evolution/shell/default_folders/tasks_path", NULL); |