[evolution-data-server/gnome-3-6] Disable runtime check in source_registry_initable_init().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/gnome-3-6] Disable runtime check in source_registry_initable_init().
- Date: Wed, 7 Nov 2012 12:56:15 +0000 (UTC)
commit c9a2cbd7dfd0c11dcccbedb4f0235af8e1570015
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Nov 7 07:53:56 2012 -0500
Disable runtime check in source_registry_initable_init().
Rationale explained in the source code.
(cherry picked from commit fab2ee606fad729edafc9a22379a26c01b1f0eb5)
libedataserver/e-source-registry.c | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index 3933712..cdcb60b 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -1022,8 +1022,24 @@ source_registry_initable_init (GInitable *initable,
return FALSE;
}
- /* The registry should now be populated with sources. */
- g_warn_if_fail (g_hash_table_size (registry->priv->sources) > 0);
+ /* The registry should now be populated with sources.
+ *
+ * XXX Actually, not necessarily if the registry service was
+ * just now activated. There may yet be a small window
+ * while the registry service starts up before it exports
+ * any sources, even built-in sources. This COULD create
+ * problems if any logic that depends on those built-in
+ * sources executes during this time window, but so far
+ * we haven't seen any cases of that.
+ *
+ * Attempts in the past to stop and wait for sources to
+ * show up have proven problematic. See for example:
+ * https://bugzilla.gnome.org/678378
+ *
+ * Leave the runtime check disabled for the moment.
+ * I have a feeling I'll be revisiting this again.
+ */
+ /*g_warn_if_fail (g_hash_table_size (registry->priv->sources) > 0);*/
/* The EDBusSourceManagerProxy is just another D-Bus interface
* that resides at the same object path. It's unrelated to the
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]