Merge lp:~charlesk/indicator-datetime/lp-1425297-prevent-gdbusproxy-type-init-deadlock-rtm-14.09 into lp:indicator-datetime/rtm-14.09

[Charles Kerr]

Work around glib's type initialization deadlock.

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

rtm-14.09 MP of GDBusProxy deadlock fix.

Diff and change description are identical to the trunk MP at https://code.launchpad.net/~charlesk/indicator-datetime/lp-1425297-prevent-gdbusproxy-type-init-deadlock-trunk-15.04/+merge/251371

[Ted Gould (ted)]

review: Approve

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-12-08 02:52:50 +0000
+++ src/main.cpp	2015-02-28 18:58:35 +0000
@@ -117,9 +117,9 @@
 int
 main(int /*argc*/, char** /*argv*/)
 {
-    // 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);
+    // These can be removed when https://bugzilla.gnome.org/show_bug.cgi?id=674885 is fixed
+    g_type_ensure(G_TYPE_DBUS_CONNECTION); // http://pad.lv/1239710
+    g_type_ensure(G_TYPE_DBUS_PROXY);      // http://pad.lv/1425297
 
     // boilerplate i18n
     setlocale(LC_ALL, "");