Commit e5c6735c authored by Bastien Nocera's avatar Bastien Nocera
Browse files

plugins: Work-around startup deadlock

A number of the plugins/daemons fail to startup because of a deadlock in
initialising GDBus-related GObject types.

See https://bugzilla.gnome.org/show_bug.cgi?id=674885

https://bugzilla.gnome.org/show_bug.cgi?id=774813
parent a62d5305
......@@ -172,6 +172,10 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
/* Work around https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
g_type_ensure (G_TYPE_DBUS_CONNECTION);
g_type_ensure (G_TYPE_DBUS_PROXY);
gdk_set_allowed_backends ("x11");
error = NULL;
......
......@@ -174,6 +174,10 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
/* Work around https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
g_type_ensure (G_TYPE_DBUS_CONNECTION);
g_type_ensure (G_TYPE_DBUS_PROXY);
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
if (!g_option_context_parse (context, &argc, &argv, &error)) {
......
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