diff options
| author | Ted Gould <ted@gould.cx> | 2011-10-13 13:37:19 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-10-13 13:37:19 -0500 |
| commit | 4a0a5d5f44ff6815dc11da9d49f34d076c4879eb (patch) | |
| tree | 6b4078580769f6837bbf864d836297fa0316d41b /src/datetime-service.c | |
| parent | e569f3e9744146d5e9d3bfee21092def7350043b (diff) | |
| parent | 09dcfec3e1305ed9ad26df78a9ff6c755ed08ece (diff) | |
| download | ayatana-indicator-datetime-4a0a5d5f44ff6815dc11da9d49f34d076c4879eb.tar.gz ayatana-indicator-datetime-4a0a5d5f44ff6815dc11da9d49f34d076c4879eb.tar.bz2 ayatana-indicator-datetime-4a0a5d5f44ff6815dc11da9d49f34d076c4879eb.zip | |
* New upstream release.
* Drop an unused icon (LP: #746176)
* Fix showing a timezone that we're currently set to (LP: #833337)
* Remove check for libunique as it's unused
Diffstat (limited to 'src/datetime-service.c')
| -rw-r--r-- | src/datetime-service.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |