datetime panel: don't try to add empty location names

Otherwise NULL is passed into g_utf8_collate_key().

Approved by Charles Kerr, PS Jenkins bot.

2 files changed, 9 insertions, 1 deletions

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);
diff --git a/src/main.c b/src/main.c
index dc08419..022df00 100644
--- a/src/main.c
+++ b/src/main.c
@@ -50,6 +50,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);