aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/gui/e-cal-model.c9
2 files changed, 11 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 81c9802f0b..723e941b45 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-23 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-23 pchenthill <pchenthill@novell.com>
* Retracting the commit made below for #59983 as it has
@@ -11,7 +18,7 @@
status of the attendee and display the menu for selecting the
calendar.
-2004-07-16 Larry Ewing <lewing@ximian.com>
+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
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index c9b9c7086c..56d48e41fa 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1464,12 +1464,9 @@ add_new_client (ECalModel *model, ECal *client, gboolean do_query)
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;