aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/datetime-prefs.c1
-rw-r--r--src/datetime-service.c4
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);