From 9711dd4402d902b81ee4890acd51807c2a21ed49 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Thu, 17 Oct 2013 08:36:09 -0400
Subject: Work around glib's type initialization deadlock

---
 src/main.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 45c5394..6452ac0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,6 +43,12 @@ main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
   GMainLoop * loop;
   IndicatorSessionService * service;
 
+  /* 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);
+
   /* boilerplate i18n */
   setlocale (LC_ALL, "");
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-- 
cgit v1.2.3