diff options
| -rw-r--r-- | data/datetime-dialog.ui | 1 | ||||
| -rw-r--r-- | src/datetime-service.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui index 59d6753..f3110ec 100644 --- a/data/datetime-dialog.ui +++ b/data/datetime-dialog.ui @@ -13,7 +13,6 @@ <property name="default_width">300</property> <property name="default_height">200</property> <property name="destroy_with_parent">True</property> - <property name="icon_name">time-admin</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> diff --git a/src/datetime-service.c b/src/datetime-service.c index 25572ee..ed8c8e3 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -581,8 +581,8 @@ update_timezone_menu_items(gpointer user_data) { offset = dbusmenu_menuitem_get_position (current_location, root)+1; for (i = 0; i < len; i++) { // Iterate over configured places and add any which aren't already listed - if (g_strcmp0(locations[i], current_timezone) != 0 && - g_strcmp0(locations[i], geo_timezone) != 0) { + if ((current_timezone == NULL || !g_str_has_prefix(locations[i], current_timezone)) && + (geo_timezone == NULL || !g_str_has_prefix(locations[i], geo_timezone))) { g_debug("Adding timezone in update_timezones %s", locations[i]); item = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TYPE, TIMEZONE_MENUITEM_TYPE); |