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

[Charles Kerr]

Work around glib's type initialization deadlock.

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

=== Change Discussion

Upstream bug https://bugzilla.gnome.org/show_bug.cgi?id=674885 is biting us when GDBusProxy's type is initialized. We've had a sibling bug for GDBusConnection (bug #1239710) in the past; this patch applies the same workaround.

=== Checklist

> Are there any related MPs required for this MP to build/function as expected? Please list.

No

> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)

Yes

> Did the code build without warnings?

Yes

> Did the tests run successfully?

Yes

> Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

> What device (or emulator) has your component test plan been executed successfully on?

mako vivid 116

> What manual tests are relevant for this MP?

N/A

> Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?

https://wiki.ubuntu.com/Process/Merges/TestPlan/indicator-datetime

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:400
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/298/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/298/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Looks good, tested and works fine.

review: Approve

=== modified file 'src/main.cpp'
--- src/main.cpp	2015-01-22 05:53:14 +0000
+++ src/main.cpp	2015-02-28 18:49:38 +0000
@@ -118,9 +118,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, "");