diff options
| author | Milan Crha <mcrha@redhat.com> | 2015-05-05 16:56:16 +0200 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2015-05-05 16:56:16 +0200 |
| commit | fe7affe900a6d8158306f6741efb81e64661fe0f (patch) | |
| tree | bb2c58c261e1f78194aacba8665a4fa01d06ab18 /services | |
| parent | 8b21c884ee50c13d398a77945962b6710f243995 (diff) | |
| download | evolution-data-server-fe7affe900a6d8158306f6741efb81e64661fe0f.tar.gz | |
Add a workaround for bug 674885 (Type initialisation deadlock in GObject)
Diffstat (limited to 'services')
4 files changed, 19 insertions, 7 deletions
diff --git a/services/evolution-addressbook-factory/evolution-addressbook-factory.c b/services/evolution-addressbook-factory/evolution-addressbook-factory.c index 057804c60..3d9cdb6f6 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 f565baf53..50ae308bc 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 3b2208b7c..ef05287fd 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 0f1c96d21..b97778e3a 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); |