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

---
 configure.ac         | 1 -
 src/datetime-prefs.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 144672f..eb5b973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,6 @@ PKG_CHECK_MODULES(SERVICE, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 
 PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1)
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 6f78eb0a87443fecc63a295f28261c90c9ca78ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Thu, 6 Oct 2011 04:25:34 +0100
Subject: Remove use of window icon

Its not showed by default anyway

Fixes https://bugs.launchpad.net/indicator-datetime/+bug/746176
---
 data/datetime-dialog.ui | 1 -
 1 file changed, 1 deletion(-)

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>
-- 
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(-)

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


From ba87e5cb673992cee0fcb0bb3c90523974836a30 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 13 Oct 2011 13:27:13 -0500
Subject: 0.3.1

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index eb5b973..07f52d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([indicator-datetime],
-        [0.3.0],
+        [0.3.1],
         [http://bugs.launchpad.net/indicator-datetime],
         [indicator-datetime],
         [http://launchpad.net/indicator-datetime])
-- 
cgit v1.2.3