Re: [evolution-patches] seek review for bug #47563

[Rodrigo Moya <rodrigo ximian com>]

On Tue, 2003-08-12 at 12:25, jack.jia wrote:
> Hi ettore:
> 
> I meet a crash on my solaris.  This patch is very important for sun. 
> Please review it ASAP and give me some suggestion.
> 
looks ok to me

cheers

> Thanks
> jack
> 
> ______________________________________________________________________
> 
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/my-evolution/ChangeLog,v
> retrieving revision 1.294.2.1
> diff -u -r1.294.2.1 ChangeLog
> --- ChangeLog	11 Aug 2003 15:51:26 -0000	1.294.2.1
> +++ ChangeLog	12 Aug 2003 09:42:03 -0000
> @@ -1,3 +1,11 @@
> +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. 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>
> Index: e-summary-tasks.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/my-evolution/e-summary-tasks.c,v
> retrieving revision 1.44
> diff -u -r1.44 e-summary-tasks.c
> --- e-summary-tasks.c	27 May 2003 19:39:44 -0000	1.44
> +++ e-summary-tasks.c	12 Aug 2003 09:42:04 -0000
> @@ -469,6 +469,8 @@
>  setup_task_folder (ESummary *summary)
>  {
>  	ESummaryTasks *tasks;
> +	char *due_today_colour;
> +	char *overdue_colour;
>  
>  	tasks = summary->tasks;
>  	g_assert (tasks != NULL);
> @@ -484,10 +486,17 @@
>  	g_free (tasks->overdue_colour);
>  	g_free (tasks->default_uri);
>  	
> -	tasks->due_today_colour = gconf_client_get_string (tasks->gconf_client,
> -							   "/apps/evolution/calendar/tasks/colors/TasksDueToday", NULL);
> -	tasks->overdue_colour = gconf_client_get_string (tasks->gconf_client,
> -							 "/apps/evolution/calendar/tasks/colors/TasksOverdue", NULL);
> +	due_today_colour = gconf_client_get_string (tasks->gconf_client,
> +						    "/apps/evolution/calendar/tasks/colors/TasksDueToday", NULL);
> +	if (due_today_colour)
> +		tasks->due_today_colour = due_today_colour;
> +	else	tasks->due_today_colour = "blue";
> +
> +	overdue_colour = gconf_client_get_string (tasks->gconf_client,
> +						  "/apps/evolution/calendar/tasks/colors/TasksOverdue", NULL);
> +	if (overdue_colour)
> +		tasks->overdue_colour = overdue_colour;
> +	else	tasks->overdue_colour = "red";
>  
>  	tasks->default_uri = gconf_client_get_string (tasks->gconf_client,
>  						      "/apps/evolution/shell/default_folders/tasks_path", NULL);