aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-07-29 02:03:32 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-07-29 02:03:32 +0800
commit6f4d4af9f1b87ba95424542f606b044468d65651 (patch)
tree8753aabcdddf80f5550637bf34dc265dc15c3b85
parent4250dadf6071e4754f27f6aec66a1c3d768899c6 (diff)
downloadgsoc2013-evolution-6f4d4af9f1b87ba95424542f606b044468d65651.tar
gsoc2013-evolution-6f4d4af9f1b87ba95424542f606b044468d65651.tar.gz
gsoc2013-evolution-6f4d4af9f1b87ba95424542f606b044468d65651.tar.bz2
gsoc2013-evolution-6f4d4af9f1b87ba95424542f606b044468d65651.tar.lz
gsoc2013-evolution-6f4d4af9f1b87ba95424542f606b044468d65651.tar.xz
gsoc2013-evolution-6f4d4af9f1b87ba95424542f606b044468d65651.tar.zst
gsoc2013-evolution-6f4d4af9f1b87ba95424542f606b044468d65651.zip
Fixes #62006
2004-07-27 JP Rosevear <jpr@novell.com> Fixes #62006 * gui/e-cal-model.c (add_new_client): don't load the events if we are already doing the query svn path=/trunk/; revision=26760
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-cal-model.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 5c3a3703bb..e5e85fd19d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-27 JP Rosevear <jpr@novell.com>
+
+ Fixes #62006
+
+ * gui/e-cal-model.c (add_new_client): don't load the events if we
+ are already doing the query
+
2004-07-25 JP Rosevear <jpr@ximian.com>
Fixes #61058
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 56d48e41fa..e5f0f8c418 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1467,7 +1467,9 @@ add_new_client (ECalModel *model, ECal *client, gboolean do_query)
/* Look to see if we already have this client */
client_data = find_client_data (model, client);
if (client_data) {
- if (!client_data->do_query)
+ if (client_data->do_query)
+ return client_data;
+ else
client_data->do_query = do_query;
goto load;