[evolution/gnome-3-26] Workaround bug 674885 (type initialisation deadlock in GObject)

[Milan Crha <mcrha src gnome org>]

commit 02e65d58b875511b99a64c22e462e2bb461e9ee3
Author: Milan Crha <mcrha redhat com>
Date:   Mon Nov 13 16:19:17 2017 +0100

    Workaround bug 674885 (type initialisation deadlock in GObject)

 src/calendar/alarm-notify/notify-main.c |    5 +++++
 src/shell/main.c                        |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/src/calendar/alarm-notify/notify-main.c b/src/calendar/alarm-notify/notify-main.c
index 84b20cd..493dbc4 100644
--- a/src/calendar/alarm-notify/notify-main.c
+++ b/src/calendar/alarm-notify/notify-main.c
@@ -64,6 +64,11 @@ main (gint argc,
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 
+       /* 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);
+
        gtk_init (&argc, &argv);
 
        e_xml_initialize_in_main ();
diff --git a/src/shell/main.c b/src/shell/main.c
index f7171fc..365fb75 100644
--- a/src/shell/main.c
+++ b/src/shell/main.c
@@ -456,6 +456,11 @@ main (gint argc,
        /* Initialize timezone specific global variables */
        tzset ();
 
+       /* 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);
+
        /* The contact maps feature uses clutter-gtk. */
 #ifdef ENABLE_CONTACT_MAPS
        success = gtk_clutter_init_with_args (