GNOME.org
 

[evolution-patches] seek review for bug #47563 about calendar and summary

Hi NotZed and Rodrigo!

Thanks for your suggestion, I made a new patch.   I believe this patch is better, please review it .

Thanks
jack

Not Zed wrote:
As per roderigo's suggestion, the key name is wrong (which is an
exsiting issue), so i guess if that is fixed this default fallback might
not be needed, otherwise it looks ok.

On Thu, 2003-08-14 at 04:03, jack.jia wrote:
  
Hi Not Zed:
This  patch is very important to  the SUN, Please review it ASAP

Thanks
jack

-------- Original Message -------- 
                          Subject: 
Re: [evolution-patches] seek review
for bug #47563
                             Date: 
Wed, 13 Aug 2003 13:24:42 +0800
                             From: 
"jack.jia" <jack jia sun com>
                               To: 
"jack.jia" <jack jia sun com>
                               CC: 
Not Zed <notzed ximian com>,
evolution-patches
<evolution-patches ximian com>
                       References: 
<3F38C088 2030503 sun com>
<1060699726 3872 77 camel lostzed mmc com au> <3F39A2C7 6000400 sun com>

Sorry!  The previous patch has some problem,  I feel the new one is
better.  Not Zed : please review it.

Thanks
jack

jack.jia wrote:
    
Hi Not Zed
According to your suggestion, I made  a new patch.  I feel it is
better than the previous.
I want to commit it to both trunk and 1-4-branch.

Not Zed wrote:
      
FWIW there's no need to add the local variables, and please use the
correct indentation style (else case should be on a separate line).

On Tue, 2003-08-12 at 06: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.

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);
    
          
_______________________________________________
Evolution-patches mailing list
Evolution-patches lists ximian com
http://lists.ximian.com/mailman/listinfo/evolution-patches
  
        
____________________________________________________________________
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	13 Aug 2003 02:04:13 -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	13 Aug 2003 02:04:13 -0000
@@ -486,8 +486,13 @@
 	
 	tasks->due_today_colour = gconf_client_get_string (tasks->gconf_client,
 							   "/apps/evolution/calendar/tasks/colors/TasksDueToday", NULL);
+	if (!tasks->due_today_colour)
+		tasks->due_today_colour = "blue";
+
 	tasks->overdue_colour = gconf_client_get_string (tasks->gconf_client,
 							 "/apps/evolution/calendar/tasks/colors/TasksOverdue", NULL);
+	if (!tasks->overdue_colour)
+		tasks->overdue_colour = "red";
 
 	tasks->default_uri = gconf_client_get_string (tasks->gconf_client,
 						      "/apps/evolution/shell/default_folders/tasks_path", NULL);
  
      

______________________________________________________________________
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	13 Aug 2003 04:59:39 -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	13 Aug 2003 04:59:40 -0000
@@ -486,8 +486,13 @@
 	
 	tasks->due_today_colour = gconf_client_get_string (tasks->gconf_client,
 							   "/apps/evolution/calendar/tasks/colors/TasksDueToday", 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);
+	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);

    

_______________________________________________
Evolution-patches mailing list
Evolution-patches lists ximian com
http://lists.ximian.com/mailman/listinfo/evolution-patches
  

Index: my-evolution/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/ChangeLog,v
retrieving revision 1.296
diff -u -r1.296 ChangeLog
--- my-evolution/ChangeLog	11 Aug 2003 15:52:49 -0000	1.296
+++ my-evolution/ChangeLog	15 Aug 2003 02:08:02 -0000
@@ -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>
Index: my-evolution/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
--- my-evolution/e-summary-tasks.c	27 May 2003 19:39:44 -0000	1.44
+++ my-evolution/e-summary-tasks.c	15 Aug 2003 02:08:03 -0000
@@ -485,9 +485,14 @@
 	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);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]