[evolution-data-server] Add a workaround for bug 674885 (Type initialisation deadlock in GObject)

[Milan Crha <mcrha src gnome org>]

commit fe7affe900a6d8158306f6741efb81e64661fe0f
Author: Milan Crha <mcrha redhat com>
Date:   Tue May 5 16:56:16 2015 +0200

    Add a workaround for bug 674885 (Type initialisation deadlock in GObject)

 .../evolution-addressbook-factory-subprocess.c     |    3 +++
 .../evolution-calendar-factory-subprocess.c        |    3 +++
 .../evolution-addressbook-factory.c                |    3 +++
 .../evolution-calendar-factory.c                   |    3 +++
 .../evolution-source-registry.c                    |   17 ++++++++++-------
 .../evolution-user-prompter.c                      |    3 +++
 6 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c 
b/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
index 2f20dcd..f54ae65 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
diff --git a/calendar/libedata-cal/evolution-calendar-factory-subprocess.c 
b/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
index 64c55d5..51858d3 100644
--- a/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
+++ b/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
@@ -194,6 +194,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
diff --git a/services/evolution-addressbook-factory/evolution-addressbook-factory.c 
b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
index 057804c..3d9cdb6 100644
--- a/services/evolution-addressbook-factory/evolution-addressbook-factory.c
+++ b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
@@ -55,6 +55,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
diff --git a/services/evolution-calendar-factory/evolution-calendar-factory.c 
b/services/evolution-calendar-factory/evolution-calendar-factory.c
index f565baf..50ae308 100644
--- a/services/evolution-calendar-factory/evolution-calendar-factory.c
+++ b/services/evolution-calendar-factory/evolution-calendar-factory.c
@@ -59,6 +59,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
diff --git a/services/evolution-source-registry/evolution-source-registry.c 
b/services/evolution-source-registry/evolution-source-registry.c
index 3b2208b..ef05287 100644
--- a/services/evolution-source-registry/evolution-source-registry.c
+++ b/services/evolution-source-registry/evolution-source-registry.c
@@ -156,6 +156,16 @@ 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
+                * bug-buddy's gnomesegvhandler, if possible */
+               gtk_init_check (&argc, &argv);
+#endif
+
        context = g_option_context_new (NULL);
        g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
        g_option_context_parse (context, &argc, &argv, &error);
@@ -166,13 +176,6 @@ main (gint argc,
                exit (EXIT_FAILURE);
        }
 
-#if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
-       if (g_getenv ("EDS_TESTING") == NULL)
-               /* This is only to load gtk-modules, like
-                * bug-buddy's gnomesegvhandler, if possible */
-               gtk_init_check (&argc, &argv);
-#endif
-
        e_gdbus_templates_init_main_thread ();
 
 reload:
diff --git a/services/evolution-user-prompter/evolution-user-prompter.c 
b/services/evolution-user-prompter/evolution-user-prompter.c
index 0f1c96d..b97778e 100644
--- a/services/evolution-user-prompter/evolution-user-prompter.c
+++ b/services/evolution-user-prompter/evolution-user-prompter.c
@@ -49,6 +49,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);
+
        prompt_user_init (&argc, &argv);
 
        context = g_option_context_new (NULL);