diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-10-13 16:52:18 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-10-13 16:52:18 -0400 |
| commit | 986322550a98630e6675177be1ee8cab6d67bd77 (patch) | |
| tree | ddce86552721deb5885879077e2413a6e55f03ac /src | |
| parent | b2d902127e0597f924ba0ae8955c8c550d3077b5 (diff) | |
| parent | 9f5bd6e87a8c6ea411a2326e44814b686a501a55 (diff) | |
| download | ayatana-indicator-datetime-986322550a98630e6675177be1ee8cab6d67bd77.tar.gz ayatana-indicator-datetime-986322550a98630e6675177be1ee8cab6d67bd77.tar.bz2 ayatana-indicator-datetime-986322550a98630e6675177be1ee8cab6d67bd77.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
* debian/control: Drop libunique requirements, it was unused
Diffstat (limited to 'src')
| -rw-r--r-- | src/datetime-prefs.c | 1 | ||||
| -rw-r--r-- | src/datetime-service.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c index 5ace8c4..1b7ddd2 100644 --- a/src/datetime-prefs.c +++ b/src/datetime-prefs.c @@ -32,7 +32,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <glib/gi18n-lib.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <unique/unique.h> #include <polkit/polkit.h> #include <libgnome-control-center/cc-panel.h> 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); |