From f1fe817863e7f167fdb4f98ebd9e5fed33d659b3 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 17 Oct 2013 08:23:13 -0400 Subject: Work around glib's type initialization deadlock --- src/main.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/main.c b/src/main.c index f791683..cd7a6a5 100644 --- a/src/main.c +++ b/src/main.c @@ -60,6 +60,12 @@ main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED) IndicatorDatetimeService * service; GMainLoop * loop; + /* 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); + /* boilerplate i18n */ setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); -- cgit v1.2.3 From 378c70c707550cb66f5c6b138fb5f3b7ff737bc2 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Sat, 26 Oct 2013 16:37:14 -0400 Subject: datetime panel: don't try to add empty location names Otherwise NULL is passed into g_utf8_collate_key(). --- src/datetime-prefs-locations.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/datetime-prefs-locations.c b/src/datetime-prefs-locations.c index ca3d9b5..f953ec7 100644 --- a/src/datetime-prefs-locations.c +++ b/src/datetime-prefs-locations.c @@ -96,7 +96,9 @@ time_location_array_new_from_model (GtkTreeModel * model) COL_ZONE, &zone, COL_VISIBLE_NAME, &name, -1); - list = g_slist_prepend (list, time_location_new (zone, name, pos++, now)); + + if (zone && name) + list = g_slist_prepend (list, time_location_new (zone, name, pos++, now)); g_free (name); g_free (zone); -- cgit v1.2.3