summaryrefslogtreecommitdiff
path: root/addressbook
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2015-05-05 16:56:16 +0200
committerMilan Crha <mcrha@redhat.com>2015-05-05 16:56:16 +0200
commitfe7affe900a6d8158306f6741efb81e64661fe0f (patch)
treebb2c58c261e1f78194aacba8665a4fa01d06ab18 /addressbook
parent8b21c884ee50c13d398a77945962b6710f243995 (diff)
downloadevolution-data-server-fe7affe900a6d8158306f6741efb81e64661fe0f.tar.gz
Add a workaround for bug 674885 (Type initialisation deadlock in GObject)
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/libedata-book/evolution-addressbook-factory-subprocess.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c b/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
index 2f20dcd23..f54ae65d9 100644
--- a/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
+++ b/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
@@ -197,6 +197,9 @@ main (gint argc,
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
+ g_type_ensure (G_TYPE_DBUS_CONNECTION);
+
#if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
if (g_getenv ("EDS_TESTING") == NULL)
/* This is only to load gtk-modules, like