summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorP Chenthill <pchenthill@novell.com>2008-01-07 05:35:29 +0000
committerSrinivasa Ragavan <sragavan@src.gnome.org>2008-01-07 05:35:29 +0000
commitace378ecbad797fd3651c38f9b95e0499dd9f19c (patch)
treecb38119b361c6d4f0dd9153eaea698d1b7812acb
parentd39337fe045584b0f0a73891661689e17455ef2f (diff)
downloadevolution-data-server-ace378ecbad797fd3651c38f9b95e0499dd9f19c.tar.gz
** Fix for bug #503574
2008-01-07 P Chenthill <pchenthill@novell.com> ** Fix for bug #503574 * backends/groupwise/e-cal-backend-groupwise.c: (get_deltas): Dont spawn many threads. Use locks to avoid them. svn path=/branches/gnome-2-20/; revision=8339
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/backends/groupwise/e-cal-backend-groupwise.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f86857208..b7f65f648 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-07 P Chenthill <pchenthill@novell.com>
+
+ ** Fix for bug #503574
+
+ * backends/groupwise/e-cal-backend-groupwise.c: (get_deltas): Dont spawn
+ many threads. Use locks to avoid them.
+
2007-11-28 Milan Crha <mcrha@redhat.com>
** Fix for bug #415817
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index 21bbc0e39..548039541 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -345,7 +345,8 @@ get_deltas (gpointer handle)
attempts = e_cal_backend_cache_get_key_value (cache, key);
- g_static_mutex_lock (&connecting);
+ if (!g_static_mutex_trylock (&connecting))
+ return TRUE;
serv_time = e_cal_backend_cache_get_server_utc_time (cache);
if (serv_time) {