Commit e21ef11a authored by Milan Crha's avatar Milan Crha

Workaround bug 674885 (type initialisation deadlock in GObject)

parent a748edaa
......@@ -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 ();
......
......@@ -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 (
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment