[Fwd: [evolution-patches] [calendar] On Solaris, Calendar and Task acts oddly when adding Free/Busy URL]

[Irene <Irene Huang Sun COM>]

Hi, Harish

	FYI

--- Begin Message ---

• From: Irene <Irene Huang sun com>
• To: evolution-patches gnome org
• Subject: [evolution-patches] [calendar] On Solaris, Calendar and Task acts oddly when adding Free/Busy URL
• Date: Thu, 10 Nov 2005 13:46:43 +0800

Hi, Harish

        I chose Edit->preferences to launch Evolution settings dlg, then
choose
"Calendar and Tasks" click "Add URL" button, then close (or click cancel
button) Free/Busy Publishing settings. Everytime I did this, an empty
entry will be created. When I tried to remove by clicking the "Remove"
button, evolution crashes. This can be reproduced both on trunk and
gnome-2-12  branch.

        I created a patch for this bug, please review. 

Thanks 

--Irene

Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2838
diff -u -r1.2838 ChangeLog
--- calendar/ChangeLog	9 Nov 2005 11:49:36 -0000	1.2838
+++ calendar/ChangeLog	10 Nov 2005 05:43:00 -0000
@@ -1,3 +1,12 @@
+2005-11-10  Irene Huang <Irene Huang sun com>
+
+       * gui/dialogs/cal-prefs-dialog.c:
+       (cal_prefs_dialog_url_add_clicked): Use strcmp instead of !=.
+       (cal_prefs_dialog_url_remove_clicked):
+         When new a dialog of confirm, set parent to
+       PREFS_WINDOW (dialog_data->page)
+         instead of using PREFS_WINDOW (dialog_data).
+
 2005-11-09  Veerapuram Varadhan <vvaradhan novell com>
 
 	Committing for Nathan Owens <pianocomp81 yahoo com>	
Index: calendar/gui/dialogs/cal-prefs-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cal-prefs-dialog.c,v
retrieving revision 1.43
diff -u -r1.43 cal-prefs-dialog.c
--- calendar/gui/dialogs/cal-prefs-dialog.c	30 Sep 2005 10:21:19 -0000	1.43
+++ calendar/gui/dialogs/cal-prefs-dialog.c	10 Nov 2005 05:43:00 -0000
@@ -90,7 +90,7 @@
 
 GtkWidget *cal_prefs_dialog_create_time_edit (void);
 
-#define PREFS_WINDOW(dialog_data) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (dialog_data), GTK_TYPE_WINDOW))
+#define PREFS_WINDOW(dialog_data) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (dialog_data->page), GTK_TYPE_WINDOW))
 
 /**
  * cal_prefs_dialog_new:
@@ -634,7 +634,7 @@
 		dialog_data->url_editor = url_editor_dialog_new (dialog_data, 
 								 url);
 		
-		if (url->location != "") {
+		if (strcmp (url->location, "")) {
 			gtk_list_store_append(GTK_LIST_STORE (model), &iter);
 			gtk_list_store_set (GTK_LIST_STORE(model), &iter, 
 					   URL_LIST_ENABLED_COLUMN, 

--- End Message ---