ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-datetime/bug714763 into lp:indicator-datetime.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)
Related bugs:
  #714763 indicator-datetime-service crashed with SIGSEGV in geoclue_master_client_set_requirements_async()
  https://bugs.launchpad.net/bugs/714763

For more details, see:
https://code.launchpad.net/~ted/indicator-datetime/bug714763/+merge/48837

Handle the case where we can't get a client.  Deserves a messy message, but we can continue.
-- 
https://code.launchpad.net/~ted/indicator-datetime/bug714763/+merge/48837
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.

=== modified file 'configure.ac'
--- configure.ac	2011-01-27 22:34:24 +0000
+++ configure.ac	2011-02-07 20:39:54 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-datetime, 0.1.91, ted@xxxxxxxxxxxxx)
+AC_INIT(indicator-datetime, 0.1.92, ted@xxxxxxxxxxxxx)
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-datetime, 0.1.91)
+AM_INIT_AUTOMAKE(indicator-datetime, 0.1.92)
 
 AM_MAINTAINER_MODE
 

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-02-01 15:52:10 +0000
+++ src/datetime-service.c	2011-02-07 20:39:54 +0000
@@ -512,6 +512,9 @@
 	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 */