aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-11-05 16:16:06 +0000
committerTarmac <Unknown>2013-11-05 16:16:06 +0000
commit4af45b95b38c9fee98ddcfdf616fb8cda3e31823 (patch)
tree2edbe2350c75af280874e66b97eedab1666c384d
parenteb291a003c77b0ecb1c4a18077142db3bc5006a6 (diff)
parenta308b072dbc8025ae9ef7a7790f602e42e3db550 (diff)
downloadayatana-indicator-session-4af45b95b38c9fee98ddcfdf616fb8cda3e31823.tar.gz
ayatana-indicator-session-4af45b95b38c9fee98ddcfdf616fb8cda3e31823.tar.bz2
ayatana-indicator-session-4af45b95b38c9fee98ddcfdf616fb8cda3e31823.zip
Work around glib's type initialization deadlock.
Approved by Ted Gould, PS Jenkins bot.
-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);