← Back to branch summary

~indicator-applet-developers/indicator-datetime/trunk.15.04

« back to all changes in this revision

Viewing changes to src/main.cpp

Work around glib's type initialization deadlock.

https://bugzilla.gnome.org/show_bug.cgi?id=674885 Fixes: #1425297
Approved by: PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.cpp
118
118
int
119
119
main(int /*argc*/, char** /*argv*/)
120
120
{
121
 
    // Work around a deadlock in glib's type initialization.
122
 
    // It can be removed when https://bugzilla.gnome.org/show_bug.cgi?id=674885 is fixed.
123
 
    g_type_ensure(G_TYPE_DBUS_CONNECTION);
 
121
    // These can be removed when https://bugzilla.gnome.org/show_bug.cgi?id=674885 is fixed
 
122
    g_type_ensure(G_TYPE_DBUS_CONNECTION); // http://pad.lv/1239710
 
123
    g_type_ensure(G_TYPE_DBUS_PROXY);      // http://pad.lv/1425297
124
124
 
125
125
    // boilerplate i18n
126
126
    setlocale(LC_ALL, "");