diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | src/main.cpp | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 51268ce..69be302 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +indicator-datetime (13.10.0+15.04.20150301-0ubuntu1) vivid; urgency=medium + + [ CI Train Bot ] + * New rebuild forced. + + [ Charles Kerr ] + * Work around glib's type initialization deadlock. (LP: #1425297) + + -- CI Train Bot <ci-train-bot@canonical.com> Sun, 01 Mar 2015 00:49:12 +0000 + indicator-datetime (13.10.0+15.04.20150213.1-0ubuntu1) vivid; urgency=medium [ Charles Kerr ] 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, ""); |