aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--debian/control5
-rw-r--r--src/datetime-service.c3
3 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index c5410c5..e6613e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-datetime (0.1.92-0ubuntu2) natty; urgency=low
+
+ * debian/control
+ - Depend on geoclue-ubuntu-geoip | geoclue-provider (LP: #714763)
+ * src/datetime-service.c
+ - Don't crash if we can get a geoclue provider (LP: #714763)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 11:02:31 -0500
+
indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 49a3ca8..d56e2a9 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,9 @@ Homepage: https://launchpad.net/indicator-datetime
Package: indicator-datetime
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
-Recommends: indicator-applet | indicator-renderer, geoclue-ubuntu-geoip
+ ${misc:Depends},
+ geoclue-ubuntu-geoip | geoclue-provider
+Recommends: indicator-applet | indicator-renderer
Description: A very, very simple clock
A simple clock appearing in the indicator bar
diff --git a/src/datetime-service.c b/src/datetime-service.c
index 9f795d1..7d35a38 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -512,6 +512,9 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar *
g_debug("Created Geoclue client at: %s", path);
geo_master = client;
+
+ g_return_if_fail(geo_master != NULL);
+
g_object_ref(G_OBJECT(geo_master));
/* New client, make sure we don't have an address hanging on */