[evolution-patches] 61760 crash switching to calendar

[JP Rosevear <jpr novell com>]

Turns out this is because there were two ESources with the same uri.
removed the uri specific check and just compared client pointers since
the gnome-cal.c code ensures only one client per esource.

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2455
diff -u -r1.2455 ChangeLog
--- ChangeLog	22 Jul 2004 18:11:24 -0000	1.2455
+++ ChangeLog	23 Jul 2004 03:59:01 -0000
@@ -1,4 +1,11 @@
-2004-07-16  Larry Ewing  <lewing ximian com>
+2004-07-22  JP Rosevear  <jpr novell com>
+
+	Fixes #61760
+	
+	* gui/e-cal-model.c (add_new_client): don't check against the URI,
+	just against the client
+
+2004-07-22  Larry Ewing  <lewing ximian com>
 
 	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
 	fix the row heights and tweek the offsets so that things come out
Index: gui/e-cal-model.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model.c,v
retrieving revision 1.39
diff -u -r1.39 e-cal-model.c
--- gui/e-cal-model.c	22 Jul 2004 03:02:08 -0000	1.39
+++ gui/e-cal-model.c	23 Jul 2004 03:59:03 -0000
@@ -1464,12 +1464,9 @@
 	
 	priv = model->priv;
 
-	/* Look for an existing client with the same URI */
-	existing_client = e_cal_model_get_client_for_uri (model, e_cal_get_uri (client));
-	if (existing_client) {
-		client_data = find_client_data (model, client);
-		g_assert (client_data);
-
+	/* Look to see if we already have this client */
+	client_data = find_client_data (model, client);	
+	if (client_data) {
 		if (!client_data->do_query)
 			client_data->do_query = do_query;