diff options
| -rw-r--r-- | data/com.canonical.indicator.datetime | 3 | ||||
| -rw-r--r-- | panel/datetime-prefs-locations.c | 4 | ||||
| -rw-r--r-- | src/main.c | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/data/com.canonical.indicator.datetime b/data/com.canonical.indicator.datetime index b26b5ec..7fa1e34 100644 --- a/data/com.canonical.indicator.datetime +++ b/data/com.canonical.indicator.datetime @@ -12,3 +12,6 @@ ObjectPath=/com/canonical/indicator/datetime/desktop_greeter [phone] ObjectPath=/com/canonical/indicator/datetime/phone +[phone_greeter] +ObjectPath=/com/canonical/indicator/datetime/desktop_greeter + diff --git a/panel/datetime-prefs-locations.c b/panel/datetime-prefs-locations.c index 7f459f5..54ab8f4 100644 --- a/panel/datetime-prefs-locations.c +++ b/panel/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); @@ -48,6 +48,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); |