aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-10-17 08:36:09 -0400
committerLars Uebernickel <lars.uebernickel@canonical.com>2013-10-17 08:36:09 -0400
commit9711dd4402d902b81ee4890acd51807c2a21ed49 (patch)
tree9b9c33b4e917e11cb8180e744e93779fa5240cff
parentc25594a78a1b60d3186f646d1fb7a156f9161498 (diff)
downloadayatana-indicator-session-9711dd4402d902b81ee4890acd51807c2a21ed49.tar.gz
ayatana-indicator-session-9711dd4402d902b81ee4890acd51807c2a21ed49.tar.bz2
ayatana-indicator-session-9711dd4402d902b81ee4890acd51807c2a21ed49.zip
Work around glib's type initialization deadlock
-rw-r--r--src/main.c6
1 files changed, 6 insertions, 0 deletions
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);