From 90f2f52171c4bd9a2e0e7c00202bfa29ab056dad Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 28 Feb 2015 12:37:07 -0600 Subject: prevent deadlocking when registering G_TYPE_DBUS_PROXY --- src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 85a414f..9aa502c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -118,9 +118,9 @@ namespace int main(int /*argc*/, char** /*argv*/) { - // Work around a deadlock in glib's type initialization. - // It can be removed when https://bugzilla.gnome.org/show_bug.cgi?id=674885 is fixed. - g_type_ensure(G_TYPE_DBUS_CONNECTION); + // These can be removed when https://bugzilla.gnome.org/show_bug.cgi?id=674885 is fixed + g_type_ensure(G_TYPE_DBUS_CONNECTION); // http://pad.lv/1239710 + g_type_ensure(G_TYPE_DBUS_PROXY); // http://pad.lv/1425297 // boilerplate i18n setlocale(LC_ALL, ""); -- cgit v1.2.3