Merge lp:~larsu/indicator-session/glib-deadlock-workaround into lp:indicator-session/13.10

[Lars Karlitski]

Work around glib's type initialization deadlock.

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:416
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/41/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-session-ci/103/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/main.c'
--- src/main.c	2013-07-02 01:55:54 +0000
+++ src/main.c	2013-10-17 12:45:16 +0000
@@ -43,6 +43,12 @@
   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);