Merge lp:~larsu/indicator-datetime/glib-deadlock-workaround into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

Proposed by Lars Karlitski on 2013-10-17
Status: Merged
Approved by: Ted Gould on 2013-10-17
Approved revision: 278
Merged at revision: 278
Proposed branch: lp:~larsu/indicator-datetime/glib-deadlock-workaround
Merge into: lp:~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 16 lines (+6/-0)
1 file modified
src/main.c (+6/-0)
To merge this branch: bzr merge lp:~larsu/indicator-datetime/glib-deadlock-workaround
Reviewer Review Type Date Requested Status
Ted Gould (community) 2013-10-17 Approve on 2013-10-17
PS Jenkins bot (community) continuous-integration Approve on 2013-10-17
Review via email: mp+191622@code.launchpad.net

Description of the change

Work around glib's type initialization deadlock.

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/main.c'
2--- src/main.c 2013-10-16 22:14:11 +0000
3+++ src/main.c 2013-10-17 12:45:20 +0000
4@@ -60,6 +60,12 @@
5 IndicatorDatetimeService * service;
6 GMainLoop * loop;
7
8+ /* Work around a deadlock in glib's type initialization. It can be
9+ * removed when https://bugzilla.gnome.org/show_bug.cgi?id=674885 is
10+ * fixed.
11+ */
12+ g_type_ensure (G_TYPE_DBUS_CONNECTION);
13+
14 /* boilerplate i18n */
15 setlocale (LC_ALL, "");
16 bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);

Subscribers

People subscribed via source and target branches