summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-12-12 23:28:14 +0100
committerMilan Crha <mcrha@redhat.com>2012-12-12 23:28:14 +0100
commit4250cb962167ee0797ee86dbe03b4a835a819a46 (patch)
tree36ee8b171dc89ff430665af4e4bf53bd7f0f33d5
parent15d42f1133549a5523f630616a608b6a93286f6b (diff)
downloadevolution-data-server-4250cb962167ee0797ee86dbe03b4a835a819a46.tar.gz
Workaround file description leak from e_source_registry_authenticate_sync()
This workarounds a file descriptor leak (a GMainContext leak) partly caused by GDBusConnection. See bug #690126 for more details: https://bugzilla.gnome.org/show_bug.cgi?id=690126
-rw-r--r--libedataserver/e-source-registry.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index 3b18a0936..681754b6c 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -1730,6 +1730,12 @@ e_source_registry_authenticate_sync (ESourceRegistry *registry,
exit:
g_main_context_pop_thread_default (main_context);
+
+ /* Make sure the main_context doesn't have pending operations;
+ workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
+ while (g_main_context_pending (main_context))
+ g_main_context_iteration (main_context, FALSE);
+
g_main_context_unref (main_context);
return success;