Merge lp:~larsu/indicator-datetime/glib-deadlock-workaround into lp:~indicator-applet-developers/indicator-datetime/trunk.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:278
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/72/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-datetime-ci/117/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/main.c'
--- src/main.c	2013-10-16 22:14:11 +0000
+++ src/main.c	2013-10-17 12:45:20 +0000
@@ -60,6 +60,12 @@
   IndicatorDatetimeService * service;
   GMainLoop * loop;
 
+  /* 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);