[evolution-data-server/gnome-3-26] Extend workaround for bug 674885 (type initialisation deadlock in GObject)

[Milan Crha <mcrha src gnome org>]

commit ba3e7610abfe5787f9681499504b7b52249de7ab
Author: Milan Crha <mcrha redhat com>
Date:   Mon Nov 13 15:57:56 2017 +0100

    Extend workaround for bug 674885 (type initialisation deadlock in GObject)

 .../evolution-addressbook-factory-subprocess.c     |    2 ++
 .../evolution-calendar-factory-subprocess.c        |    2 ++
 src/libedataserver/e-source-registry.c             |    2 ++
 .../evolution-addressbook-factory.c                |    2 ++
 .../evolution-calendar-factory.c                   |    2 ++
 .../evolution-source-registry.c                    |    2 ++
 .../evolution-user-prompter.c                      |    2 ++
 7 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/src/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c 
b/src/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
index bea222f..5cba2b6 100644
--- a/src/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
+++ b/src/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
@@ -166,6 +166,8 @@ main (gint argc,
 
        /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
        g_type_ensure (G_TYPE_DBUS_CONNECTION);
+       g_type_ensure (G_TYPE_DBUS_PROXY);
+       g_type_ensure (G_BUS_TYPE_SESSION);
 
 #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
        if (g_getenv ("EDS_TESTING") == NULL)
diff --git a/src/calendar/libedata-cal/evolution-calendar-factory-subprocess.c 
b/src/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
index 1777964..f59a76c 100644
--- a/src/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
+++ b/src/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
@@ -166,6 +166,8 @@ main (gint argc,
 
        /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
        g_type_ensure (G_TYPE_DBUS_CONNECTION);
+       g_type_ensure (G_TYPE_DBUS_PROXY);
+       g_type_ensure (G_BUS_TYPE_SESSION);
 
 #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
        if (g_getenv ("EDS_TESTING") == NULL)
diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
index b7997ce..b03a6ab 100644
--- a/src/libedataserver/e-source-registry.c
+++ b/src/libedataserver/e-source-registry.c
@@ -1761,6 +1761,8 @@ e_source_registry_new_sync (GCancellable *cancellable,
         *     until GObject's type initialization deadlock issue is fixed.
         *     Apparently only the synchronous instantiation is affected. */
        g_type_ensure (G_TYPE_DBUS_CONNECTION);
+       g_type_ensure (G_TYPE_DBUS_PROXY);
+       g_type_ensure (G_BUS_TYPE_SESSION);
 
        registry = source_registry_dup_uninitialized_singleton ();
 
diff --git a/src/services/evolution-addressbook-factory/evolution-addressbook-factory.c 
b/src/services/evolution-addressbook-factory/evolution-addressbook-factory.c
index 4e8bb02..ad66d8f 100644
--- a/src/services/evolution-addressbook-factory/evolution-addressbook-factory.c
+++ b/src/services/evolution-addressbook-factory/evolution-addressbook-factory.c
@@ -59,6 +59,8 @@ main (gint argc,
 
        /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
        g_type_ensure (G_TYPE_DBUS_CONNECTION);
+       g_type_ensure (G_TYPE_DBUS_PROXY);
+       g_type_ensure (G_BUS_TYPE_SESSION);
 
 #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
        if (g_getenv ("EDS_TESTING") == NULL)
diff --git a/src/services/evolution-calendar-factory/evolution-calendar-factory.c 
b/src/services/evolution-calendar-factory/evolution-calendar-factory.c
index ee4ce1c..55d093a 100644
--- a/src/services/evolution-calendar-factory/evolution-calendar-factory.c
+++ b/src/services/evolution-calendar-factory/evolution-calendar-factory.c
@@ -61,6 +61,8 @@ main (gint argc,
 
        /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
        g_type_ensure (G_TYPE_DBUS_CONNECTION);
+       g_type_ensure (G_TYPE_DBUS_PROXY);
+       g_type_ensure (G_BUS_TYPE_SESSION);
 
 #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
        if (g_getenv ("EDS_TESTING") == NULL)
diff --git a/src/services/evolution-source-registry/evolution-source-registry.c 
b/src/services/evolution-source-registry/evolution-source-registry.c
index 2dced10..49c02c3 100644
--- a/src/services/evolution-source-registry/evolution-source-registry.c
+++ b/src/services/evolution-source-registry/evolution-source-registry.c
@@ -157,6 +157,8 @@ main (gint argc,
 
        /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
        g_type_ensure (G_TYPE_DBUS_CONNECTION);
+       g_type_ensure (G_TYPE_DBUS_PROXY);
+       g_type_ensure (G_BUS_TYPE_SESSION);
 
 #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
        if (g_getenv ("EDS_TESTING") == NULL)
diff --git a/src/services/evolution-user-prompter/evolution-user-prompter.c 
b/src/services/evolution-user-prompter/evolution-user-prompter.c
index 8dc7c26..9f52d11 100644
--- a/src/services/evolution-user-prompter/evolution-user-prompter.c
+++ b/src/services/evolution-user-prompter/evolution-user-prompter.c
@@ -53,6 +53,8 @@ main (gint argc,
 
        /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
        g_type_ensure (G_TYPE_DBUS_CONNECTION);
+       g_type_ensure (G_TYPE_DBUS_PROXY);
+       g_type_ensure (G_BUS_TYPE_SESSION);
 
        prompt_user_init (&argc, &argv);