diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2015-03-01 00:49:08 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-03-01 00:49:08 +0000 |
| commit | 39aaf980a26fa22a6c5d7a23cca2e0d1b908b678 (patch) | |
| tree | 30ff9bb35c40b9a06fdfe8e7fdb29ce30fa053f9 | |
| parent | 595becf89dd3e604f0c1a79b92ee8e1286f19d90 (diff) | |
| parent | 90f2f52171c4bd9a2e0e7c00202bfa29ab056dad (diff) | |
| download | ayatana-indicator-datetime-39aaf980a26fa22a6c5d7a23cca2e0d1b908b678.tar.gz ayatana-indicator-datetime-39aaf980a26fa22a6c5d7a23cca2e0d1b908b678.tar.bz2 ayatana-indicator-datetime-39aaf980a26fa22a6c5d7a23cca2e0d1b908b678.zip | |
Work around glib's type initialization deadlock.
https://bugzilla.gnome.org/show_bug.cgi?id=674885 Fixes: #1425297
Approved by: PS Jenkins bot
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 85a414f..9aa502c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -118,9 +118,9 @@ namespace 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, ""); |