From 28cacfecb73ee7714ccb628b1226b4a9b1c01879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Wed, 5 Oct 2011 13:01:55 +0100
Subject: Remove libunique dependency as Its not needed anymore

---
 src/datetime-prefs.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

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>
 
-- 
cgit v1.2.3


From 14bd650eea1a31843b49bac5f12f8798fccfe303 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 12 Oct 2011 23:30:40 -0500
Subject: Check to see if we're in the same timezone as default

---
 src/datetime-service.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3