From f4029062299a0f1c5f68c213bf65569e35ff44a0 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Wed, 27 May 2009 12:49:37 -0400 Subject: Don't call geoclue functions if the init failed --- libempathy-gtk/empathy-location-manager.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'libempathy-gtk/empathy-location-manager.c') diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index 9da3964ec..040bc619d 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -531,13 +531,19 @@ publish_cb (EmpathyConf *conf, DEBUG ("Publish Conf changed"); priv = GET_PRIV (manager); - if (!empathy_conf_get_bool (conf, key, &can_publish)) + + + if (empathy_conf_get_bool (conf, key, &can_publish) == FALSE) return; - if (can_publish) + if (can_publish == TRUE) { - if (!priv->is_setup) + if (priv->is_setup == FALSE) setup_geoclue (manager); + /* if still not setup than the init failed */ + if (priv->is_setup == FALSE) + return; + geoclue_address_get_address_async (priv->gc_address, initial_address_cb, manager); geoclue_position_get_position_async (priv->gc_position, -- cgit v1.2.3