Merging in U. Desktop changes

3 files changed, 37 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 94d8e7c..b18e132 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,15 @@ indicator-datetime (0.1.92-0ubuntu5~ppa1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Tue, 08 Feb 2011 22:25:24 -0600
 
+indicator-datetime (0.1.92-0ubuntu4+r41) UNRELEASED; urgency=low
+
+  * New upstream snapshot
+  * debian/control
+    - New build deps for eds integration, libecal1.2-dev, libical-dev, 
+      libgtk2.0-dev, libcairo2-dev, libedataserver1.2-dev
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 09 Feb 2011 12:11:45 -0500
+
 indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low
 
   * debian/source/format
@@ -51,24 +60,6 @@ indicator-datetime (0.1.91-0ubuntu1~ppa1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 27 Jan 2011 16:48:48 -0600
 
-indicator-datetime (0.1.90-0ubuntu2) natty; urgency=low
-
-  * debian/control
-    - Bump build depends for libdbusmenu-* to >= 0.3.90
-
- -- Ken VanDine <ken.vandine@canonical.com>  Thu, 09 Dec 2010 11:46:00 -0500
-
-indicator-datetime (0.1.90-0ubuntu1) natty; urgency=low
-
-  * New upstream release.
-    * Generate the format string at init
-    * Add in Geoclue support for setting proper timezone
-    * Add support for building GTK2 and GTK3 versions
-  * debian/control: Add recommends for geoclue-ubuntu-geoip
-  * debian/control: Adding dependencies on Geoclue and OOBS
-
- -- Ted Gould <ted@ubuntu.com>  Fri, 03 Dec 2010 13:46:32 -0600
-
 indicator-datetime (0.1.90.is.0.0.6-0ubuntu2) natty; urgency=low
 
   * Merged gdbus and dbusmenu-glib-0.4 port
@@ -87,6 +78,24 @@ indicator-datetime (0.1.90.is.0.0.6-0ubuntu1) natty; urgency=low
 
  -- Ken VanDine <ken.vandine@canonical.com>  Mon, 13 Dec 2010 11:30:25 -0500
 
+indicator-datetime (0.1.90-0ubuntu2) natty; urgency=low
+
+  * debian/control
+    - Bump build depends for libdbusmenu-* to >= 0.3.90
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 09 Dec 2010 11:46:00 -0500
+
+indicator-datetime (0.1.90-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * Generate the format string at init
+    * Add in Geoclue support for setting proper timezone
+    * Add support for building GTK2 and GTK3 versions
+  * debian/control: Add recommends for geoclue-ubuntu-geoip
+  * debian/control: Adding dependencies on Geoclue and OOBS
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 03 Dec 2010 13:46:32 -0600
+
 indicator-datetime (0.0.6-0ubuntu3) maverick; urgency=low
 
   * Cherry-picked from upstream:
diff --git a/debian/control b/debian/control
index b02380d..06e1ec6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,12 @@ Build-Depends: cdbs,
                libglib2.0-dev (>= 2.25.0),
                libido-0.1-dev (>= 0.1.10),
                libgeoclue-dev (>= 0.12.0),
-               liboobs-1-dev (>= 2.31.0)
+               liboobs-1-dev (>= 2.31.0),
+               libecal1.2-dev (>= 2.30),
+               libical-dev (>= 0.44),
+               libgtk2.0-dev (>= 2.22),
+               libcairo2-dev (>= 1.10),
+               libedataserver1.2-dev (>= 2.30)
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/indicator-datetime
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu
diff --git a/src/datetime-service.c b/src/datetime-service.c
index 9f4943c..e373ae8 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -807,7 +807,10 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar *
 
 	geo_master = client;
 
-	g_return_if_fail(geo_master != NULL);
+	if (geo_master != NULL) {
+		g_warning(_("Unable to get a GeoClue client!  Geolocation based timezone support will not be available."));
+		return;
+	}
 
 	g_object_ref(G_OBJECT(geo_master));