/*
- * Copyright (C) 2008 Collabora Ltd.
+ * Copyright (C) 2009 Collabora Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
- * Authors: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
+ * Authors: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
*/
#include "config.h"
+/* Needed for trunc */
+#define _ISOC9X_SOURCE 1
+#define _ISOC99_SOURCE 1
+#include <math.h>
#include <string.h>
#include <time.h>
#include <telepathy-glib/util.h>
-#if HAVE_GEOCLUE
#include <geoclue/geoclue-master.h>
#include <extensions/extensions.h>
#define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
#include "libempathy/empathy-debug.h"
+/* Seconds before updating the location */
+#define TIMEOUT 10
+static EmpathyLocationManager *location_manager = NULL;
+
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLocationManager)
typedef struct {
- gboolean is_setup;
- MissionControl *mc;
+ gboolean geoclue_is_setup;
+ /* Contains the location to be sent to accounts. Geoclue is used
+ * to populate it. This HashTable uses Telepathy's style (string,
+ * GValue). Keys are defined in empathy-location.h
+ */
GHashTable *location;
- gpointer token;
GeoclueResourceFlags resources;
GeoclueMasterClient *gc_client;
GeoclueAddress *gc_address;
gboolean reduce_accuracy;
- gdouble reduce_value;
EmpathyAccountManager *account_manager;
-} EmpathyLocationManagerPriv;
-static void location_manager_finalize (GObject *object);
-static void location_manager_get_property (GObject *object, guint param_id,
- GValue *value, GParamSpec *pspec);
-static void location_manager_set_property (GObject *object, guint param_id,
- const GValue *value, GParamSpec *pspec);
-static void position_changed_cb (GeocluePosition *position,
- GeocluePositionFields fields, int timestamp, double latitude,
- double longitude, double altitude, GeoclueAccuracy *accuracy,
- gpointer user_data);
-static void address_changed_cb (GeoclueAddress *address, int timestamp,
- GHashTable *details, GeoclueAccuracy *accuracy, gpointer user_data);
-static void setup_geoclue (EmpathyLocationManager *location_manager);
-static void publish_cb (EmpathyConf *conf, const gchar *key,
- gpointer user_data);
-static void update_resources (EmpathyLocationManager *location_manager);
-static void resource_cb (EmpathyConf *conf, const gchar *key,
- gpointer user_data);
-static void accuracy_cb (EmpathyConf *conf, const gchar *key,
- gpointer user_data);
-static void account_connection_changed_cb (EmpathyAccountManager *manager,
- McAccount *account, TpConnectionStatusReason reason,
- TpConnectionStatus current, TpConnectionStatus previous,
- gpointer *location_manager);
+ /* The idle id for publish_on_idle func */
+ guint timeout_id;
+} EmpathyLocationManagerPriv;
G_DEFINE_TYPE (EmpathyLocationManager, empathy_location_manager, G_TYPE_OBJECT);
-enum
+static GObject *
+location_manager_constructor (GType type,
+ guint n_construct_params,
+ GObjectConstructParam *construct_params)
+{
+ GObject *retval;
+
+ if (location_manager == NULL)
+ {
+ retval = G_OBJECT_CLASS (empathy_location_manager_parent_class)->constructor
+ (type, n_construct_params, construct_params);
+
+ location_manager = EMPATHY_LOCATION_MANAGER (retval);
+ g_object_add_weak_pointer (retval, (gpointer) &location_manager);
+ }
+ else
+ {
+ retval = g_object_ref (location_manager);
+ }
+
+ return retval;
+}
+
+static void
+location_manager_dispose (GObject *object)
+{
+ EmpathyLocationManagerPriv *priv = GET_PRIV (object);
+
+ if (priv->account_manager != NULL)
+ {
+ g_object_unref (priv->account_manager);
+ priv->account_manager = NULL;
+ }
+
+ if (priv->gc_client != NULL)
+ {
+ g_object_unref (priv->gc_client);
+ priv->gc_client = NULL;
+ }
+
+ if (priv->gc_position != NULL)
+ {
+ g_object_unref (priv->gc_position);
+ priv->gc_position = NULL;
+ }
+
+ if (priv->gc_address != NULL)
+ {
+ g_object_unref (priv->gc_address);
+ priv->gc_address = NULL;
+ }
+
+ if (priv->location != NULL)
+ {
+ g_hash_table_unref (priv->location);
+ priv->location = NULL;
+ }
+
+ G_OBJECT_CLASS (empathy_location_manager_parent_class)->finalize (object);
+}
+
+static void
+location_manager_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- PROP_0,
-};
+ /*EmpathyLocationManagerPriv *priv = GET_PRIV (object); */
+
+ switch (param_id)
+ {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ };
+}
+
+static void
+location_manager_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ /* EmpathyLocationManagerPriv *priv = GET_PRIV (object); */
+
+ switch (param_id)
+ {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ };
+}
static void
empathy_location_manager_class_init (EmpathyLocationManagerClass *class)
object_class = G_OBJECT_CLASS (class);
- object_class->finalize = location_manager_finalize;
+ object_class->constructor = location_manager_constructor;
+ object_class->dispose = location_manager_dispose;
object_class->get_property = location_manager_get_property;
object_class->set_property = location_manager_set_property;
static void
publish_location (EmpathyLocationManager *location_manager,
- McAccount *account,
- gboolean force_publication)
+ TpConnection *conn,
+ gboolean force_publication)
{
- EmpathyLocationManagerPriv *priv;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
guint connection_status = -1;
gboolean can_publish;
EmpathyConf *conf = empathy_conf_get ();
- TpConnection *conn;
EmpathyTpContactFactory *factory;
- priv = GET_PRIV (location_manager);
-
- conn = mission_control_get_tpconnection (priv->mc, account, NULL);
- factory = empathy_tp_contact_factory_dup_singleton (conn);
+ if (!conn)
+ return;
- if (force_publication == FALSE)
+ if (!force_publication)
{
if (!empathy_conf_get_bool (conf, EMPATHY_PREFS_LOCATION_PUBLISH,
&can_publish))
return;
- if (can_publish == FALSE)
+ if (!can_publish)
return;
}
- connection_status = mission_control_get_connection_status (priv->mc,
- account, NULL);
+ connection_status = tp_connection_get_status (conn, NULL);
if (connection_status != TP_CONNECTION_STATUS_CONNECTED)
return;
- DEBUG ("Publishing location to account %s",
- mc_account_get_display_name (account));
+ DEBUG ("Publishing %s location to connection %p",
+ (g_hash_table_size (priv->location) == 0 ? "empty" : ""),
+ conn);
+ factory = empathy_tp_contact_factory_dup_singleton (conn);
empathy_tp_contact_factory_set_location (factory, priv->location);
g_object_unref (factory);
}
static void
-publish_location_to_all_accounts (EmpathyLocationManager *location_manager,
- gboolean force_publication)
+publish_to_all_connections (EmpathyLocationManager *location_manager,
+ gboolean force_publication)
{
- GList *accounts = NULL, *l;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
+ GList *connections = NULL, *l;
- accounts = mc_accounts_list_by_enabled (TRUE);
- for (l = accounts; l; l = l->next)
+ connections = empathy_account_manager_dup_connections (priv->account_manager);
+ for (l = connections; l; l = l->next)
{
publish_location (location_manager, l->data, force_publication);
+ g_object_unref (l->data);
}
+ g_list_free (connections);
- mc_accounts_list_free (accounts);
}
-static void
-account_connection_changed_cb (EmpathyAccountManager *manager,
- McAccount *account,
- TpConnectionStatusReason reason,
- TpConnectionStatus current,
- TpConnectionStatus previous,
- gpointer *location_manager)
+static gboolean
+publish_on_idle (gpointer user_data)
{
- DEBUG ("Account %s changed status from %d to %d", mc_account_get_display_name (account),
- previous, current);
+ EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
- if (account && current == TP_CONNECTION_STATUS_CONNECTED)
- publish_location (EMPATHY_LOCATION_MANAGER (location_manager), account,
- FALSE);
+ priv->timeout_id = 0;
+ publish_to_all_connections (manager, TRUE);
+ return FALSE;
}
static void
-empathy_location_manager_init (EmpathyLocationManager *location_manager)
+new_connection_cb (EmpathyAccountManager *manager,
+ TpConnection *conn,
+ gpointer *location_manager)
{
- EmpathyConf *conf;
- EmpathyLocationManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (location_manager,
- EMPATHY_TYPE_LOCATION_MANAGER, EmpathyLocationManagerPriv);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
+ DEBUG ("New connection %p", conn);
- location_manager->priv = priv;
- priv->is_setup = FALSE;
- priv->mc = empathy_mission_control_dup_singleton ();
- priv->location = g_hash_table_new_full (g_direct_hash, g_direct_equal,
- g_free, (GDestroyNotify) tp_g_value_slice_free);
-
- // Setup settings status callbacks
- conf = empathy_conf_get ();
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_PUBLISH, publish_cb,
- location_manager);
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK,
- resource_cb, location_manager);
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_RESOURCE_CELL,
- resource_cb, location_manager);
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_RESOURCE_GPS,
- resource_cb, location_manager);
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY,
- accuracy_cb, location_manager);
-
- resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK, location_manager);
- resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_CELL, location_manager);
- resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_GPS, location_manager);
- accuracy_cb (conf, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY, location_manager);
- publish_cb (conf, EMPATHY_PREFS_LOCATION_PUBLISH, location_manager);
-
- // Setup account status callbacks
- priv->account_manager = empathy_account_manager_dup_singleton ();
- g_signal_connect (priv->account_manager,
- "account-connection-changed",
- G_CALLBACK (account_connection_changed_cb), location_manager);
+ /* Don't publish if it is already planned (ie startup) */
+ if (priv->timeout_id == 0)
+ {
+ publish_location (EMPATHY_LOCATION_MANAGER (location_manager), conn,
+ FALSE);
+ }
}
-
static void
-location_manager_finalize (GObject *object)
+update_timestamp (EmpathyLocationManager *location_manager)
{
- EmpathyLocationManagerPriv *priv;
-
- priv = GET_PRIV (object);
-
- DEBUG ("finalize: %p", object);
- g_object_unref (priv->account_manager);
+ EmpathyLocationManagerPriv *priv= GET_PRIV (location_manager);
+ GValue *new_value;
+ gint64 stamp64;
+ time_t timestamp;
- G_OBJECT_CLASS (empathy_location_manager_parent_class)->finalize (object);
+ timestamp = time (NULL);
+ stamp64 = (gint64) timestamp;
+ new_value = tp_g_value_slice_new_int64 (stamp64);
+ g_hash_table_insert (priv->location, g_strdup (EMPATHY_LOCATION_TIMESTAMP),
+ new_value);
+ DEBUG ("\t - Timestamp: %" G_GINT64_FORMAT, stamp64);
}
-
static void
-location_manager_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec)
+address_changed_cb (GeoclueAddress *address,
+ int timestamp,
+ GHashTable *details,
+ GeoclueAccuracy *accuracy,
+ gpointer location_manager)
{
- EmpathyLocationManagerPriv *priv;
-
- priv = GET_PRIV (object);
-
- switch (param_id)
- {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
- break;
- };
-}
-
+ GeoclueAccuracyLevel level;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
+ GHashTableIter iter;
+ gpointer key, value;
-static void
-location_manager_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- EmpathyLocationManagerPriv *priv;
+ geoclue_accuracy_get_details (accuracy, &level, NULL, NULL);
+ DEBUG ("New address (accuracy level %d):", level);
+ /* FIXME: Publish accuracy level also considering the position's */
- priv = GET_PRIV (object);
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_STREET);
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_AREA);
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_REGION);
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_COUNTRY);
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_COUNTRY_CODE);
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_POSTAL_CODE);
- switch (param_id)
+ if (g_hash_table_size (details) == 0)
{
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
- break;
- };
-}
+ DEBUG ("\t - (Empty)");
+ return;
+ }
+ g_hash_table_iter_init (&iter, details);
+ while (g_hash_table_iter_next (&iter, &key, &value))
+ {
+ GValue *new_value;
+ /* Discard street information if reduced accuracy is on */
+ if (priv->reduce_accuracy &&
+ !tp_strdiff (key, EMPATHY_LOCATION_STREET))
+ continue;
-EmpathyLocationManager *
-empathy_location_manager_get_default (void)
-{
- static EmpathyLocationManager *singleton = NULL;
- if (singleton == NULL)
- singleton = g_object_new (EMPATHY_TYPE_LOCATION_MANAGER, NULL);
- return singleton;
-}
+ new_value = tp_g_value_slice_new_string (value);
+ g_hash_table_insert (priv->location, g_strdup (key), new_value);
-static void
-update_timestamp (EmpathyLocationManager *location_manager,
- int timestamp)
-{
- EmpathyLocationManagerPriv *priv;
- priv = GET_PRIV (location_manager);
- GValue *new_value;
- gint64 stamp64 = (gint64) timestamp;
+ DEBUG ("\t - %s: %s", (gchar *) key, (gchar *) value);
+ }
- new_value = tp_g_value_slice_new (G_TYPE_INT64);
- g_value_set_int64 (new_value, stamp64);
- g_hash_table_insert (priv->location, g_strdup (EMPATHY_LOCATION_TIMESTAMP),
- new_value);
- DEBUG ("\t - Timestamp: %" G_GINT64_FORMAT, stamp64);
+ update_timestamp (location_manager);
+ if (priv->timeout_id == 0)
+ priv->timeout_id = g_timeout_add_seconds (TIMEOUT, publish_on_idle, location_manager);
}
static void
-initial_position_cb (GeocluePosition *position,
- GeocluePositionFields fields,
- int timestamp,
- double latitude,
- double longitude,
- double altitude,
- GeoclueAccuracy *accuracy,
- GError *error,
- gpointer location_manager)
+initial_address_cb (GeoclueAddress *address,
+ int timestamp,
+ GHashTable *details,
+ GeoclueAccuracy *accuracy,
+ GError *error,
+ gpointer location_manager)
{
if (error)
{
g_error_free (error);
}
else
- position_changed_cb (position, fields, timestamp, latitude, longitude,
- altitude, accuracy, location_manager);
+ {
+ address_changed_cb (address, timestamp, details, accuracy, location_manager);
+ }
}
static void
GeoclueAccuracy *accuracy,
gpointer location_manager)
{
- EmpathyLocationManagerPriv *priv;
- priv = GET_PRIV (location_manager);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
GeoclueAccuracyLevel level;
gdouble mean, horizontal, vertical;
GValue *new_value;
+
geoclue_accuracy_get_details (accuracy, &level, &horizontal, &vertical);
DEBUG ("New position (accuracy level %d)", level);
if (level == GEOCLUE_ACCURACY_LEVEL_NONE)
if (fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)
{
- longitude += priv->reduce_value;
- new_value = tp_g_value_slice_new (G_TYPE_DOUBLE);
- g_value_set_double (new_value, longitude);
+
+ if (priv->reduce_accuracy)
+ /* Truncate at 1 decimal place */
+ longitude = trunc (longitude * 10.0) / 10.0;
+
+ new_value = tp_g_value_slice_new_double (longitude);
g_hash_table_insert (priv->location, g_strdup (EMPATHY_LOCATION_LON),
new_value);
DEBUG ("\t - Longitude: %f", longitude);
}
+ else
+ {
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_LON);
+ }
+
if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE)
{
- latitude += priv->reduce_value;
- new_value = tp_g_value_slice_new (G_TYPE_DOUBLE);
- g_value_set_double (new_value, latitude);
- g_hash_table_insert (priv->location, g_strdup (EMPATHY_LOCATION_LAT),
+ if (priv->reduce_accuracy)
+ /* Truncate at 1 decimal place */
+ latitude = trunc (latitude * 10.0) / 10.0;
+
+ new_value = tp_g_value_slice_new_double (latitude);
+ g_hash_table_replace (priv->location, g_strdup (EMPATHY_LOCATION_LAT),
new_value);
DEBUG ("\t - Latitude: %f", latitude);
}
+ else
+ {
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_LAT);
+ }
+
if (fields & GEOCLUE_POSITION_FIELDS_ALTITUDE)
{
- new_value = tp_g_value_slice_new (G_TYPE_DOUBLE);
- g_value_set_double (new_value, altitude);
- g_hash_table_insert (priv->location, g_strdup (EMPATHY_LOCATION_ALT),
+ new_value = tp_g_value_slice_new_double (altitude);
+ g_hash_table_replace (priv->location, g_strdup (EMPATHY_LOCATION_ALT),
new_value);
DEBUG ("\t - Altitude: %f", altitude);
}
+ else
+ {
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_ALT);
+ }
if (level == GEOCLUE_ACCURACY_LEVEL_DETAILED)
{
mean = (horizontal + vertical) / 2.0;
- new_value = tp_g_value_slice_new (G_TYPE_DOUBLE);
- g_value_set_double (new_value, mean);
- g_hash_table_insert (priv->location,
+ new_value = tp_g_value_slice_new_double (mean);
+ g_hash_table_replace (priv->location,
g_strdup (EMPATHY_LOCATION_ACCURACY), new_value);
DEBUG ("\t - Accuracy: %f", mean);
}
+ else
+ {
+ g_hash_table_remove (priv->location, EMPATHY_LOCATION_ACCURACY);
+ }
- update_timestamp (location_manager, timestamp);
- publish_location_to_all_accounts (EMPATHY_LOCATION_MANAGER (location_manager),
- FALSE);
-}
-
-
-static void
-address_foreach_cb (gpointer key,
- gpointer value,
- gpointer location_manager)
-{
- if (location_manager == NULL)
- return;
-
- EmpathyLocationManagerPriv *priv;
- priv = GET_PRIV (location_manager);
-
- // Discard street information if reduced accuracy is on
- if (priv->reduce_accuracy && strcmp (key, EMPATHY_LOCATION_STREET) == 0)
- return;
-
- GValue *new_value = tp_g_value_slice_new (G_TYPE_STRING);
- g_value_set_string (new_value, value);
-
- g_hash_table_insert (priv->location, g_strdup (key), new_value);
- DEBUG ("\t - %s: %s", (char*) key, (char*) value);
+ update_timestamp (location_manager);
+ if (priv->timeout_id == 0)
+ priv->timeout_id = g_timeout_add_seconds (TIMEOUT, publish_on_idle, location_manager);
}
static void
-initial_address_cb (GeoclueAddress *address,
- int timestamp,
- GHashTable *details,
- GeoclueAccuracy *accuracy,
- GError *error,
- gpointer location_manager)
+initial_position_cb (GeocluePosition *position,
+ GeocluePositionFields fields,
+ int timestamp,
+ double latitude,
+ double longitude,
+ double altitude,
+ GeoclueAccuracy *accuracy,
+ GError *error,
+ gpointer location_manager)
{
if (error)
{
g_error_free (error);
}
else
- address_changed_cb (address, timestamp, details, accuracy, location_manager);
-}
-
-static void
-address_changed_cb (GeoclueAddress *address,
- int timestamp,
- GHashTable *details,
- GeoclueAccuracy *accuracy,
- gpointer location_manager)
-{
- GeoclueAccuracyLevel level;
- geoclue_accuracy_get_details (accuracy, &level, NULL, NULL);
- EmpathyLocationManagerPriv *priv;
-
- DEBUG ("New address (accuracy level %d):", level);
-
- priv = GET_PRIV (location_manager);
- g_hash_table_remove_all (priv->location);
-
- g_hash_table_foreach (details, address_foreach_cb, (gpointer)location_manager);
-
- update_timestamp (location_manager, timestamp);
- publish_location_to_all_accounts (EMPATHY_LOCATION_MANAGER (location_manager),
- FALSE);
+ {
+ position_changed_cb (position, fields, timestamp, latitude, longitude,
+ altitude, accuracy, location_manager);
+ }
}
-
static void
update_resources (EmpathyLocationManager *location_manager)
{
- EmpathyLocationManagerPriv *priv;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
- priv = GET_PRIV (location_manager);
+ DEBUG ("Updating resources %d", priv->resources);
- DEBUG ("Updating resources");
+ if (!priv->geoclue_is_setup)
+ return;
+ /* As per Geoclue bug #15126, using NONE results in no address
+ * being found as geoclue-manual report an empty address with
+ * accuracy = NONE */
if (!geoclue_master_client_set_requirements (priv->gc_client,
- GEOCLUE_ACCURACY_LEVEL_LOCALITY, 0, TRUE, priv->resources,
+ GEOCLUE_ACCURACY_LEVEL_COUNTRY, 0, TRUE, priv->resources,
NULL))
{
- g_printerr ("set_requirements failed");
+ DEBUG ("set_requirements failed");
return;
}
- if (!priv->is_setup)
- return;
-
geoclue_address_get_address_async (priv->gc_address,
initial_address_cb, location_manager);
geoclue_position_get_position_async (priv->gc_position,
initial_position_cb, location_manager);
-
}
-
static void
setup_geoclue (EmpathyLocationManager *location_manager)
{
- EmpathyLocationManagerPriv *priv;
-
- priv = GET_PRIV (location_manager);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
GeoclueMaster *master;
GError *error = NULL;
DEBUG ("Setting up Geoclue");
master = geoclue_master_get_default ();
- priv->gc_client = geoclue_master_create_client (master, NULL, NULL);
+ priv->gc_client = geoclue_master_create_client (master, NULL, &error);
g_object_unref (master);
+ if (priv->gc_client == NULL)
+ {
+ DEBUG ("Failed to GeoclueMasterClient: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
update_resources (location_manager);
/* Get updated when the position is changes */
priv->gc_client, &error);
if (priv->gc_position == NULL)
{
- g_printerr ("Failed to create GeocluePosition: %s", error->message);
+ DEBUG ("Failed to create GeocluePosition: %s", error->message);
g_error_free (error);
return;
}
priv->gc_client, &error);
if (priv->gc_address == NULL)
{
- g_printerr ("Failed to create GeoclueAddress: %s", error->message);
+ DEBUG ("Failed to create GeoclueAddress: %s", error->message);
g_error_free (error);
return;
}
g_signal_connect (G_OBJECT (priv->gc_address), "address-changed",
G_CALLBACK (address_changed_cb), location_manager);
- priv->is_setup = TRUE;
+ priv->geoclue_is_setup = TRUE;
}
static void
gpointer user_data)
{
EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
- EmpathyLocationManagerPriv *priv;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
gboolean can_publish;
DEBUG ("Publish Conf changed");
- priv = GET_PRIV (manager);
+
+
if (!empathy_conf_get_bool (conf, key, &can_publish))
return;
if (can_publish)
{
- if (!priv->is_setup)
+ if (!priv->geoclue_is_setup)
setup_geoclue (manager);
+ /* if still not setup than the init failed */
+ if (!priv->geoclue_is_setup)
+ return;
+
geoclue_address_get_address_async (priv->gc_address,
initial_address_cb, manager);
geoclue_position_get_position_async (priv->gc_position,
initial_position_cb, manager);
- publish_location_to_all_accounts (manager, FALSE);
}
else
{
* location from the servers
*/
g_hash_table_remove_all (priv->location);
- publish_location_to_all_accounts (manager, TRUE);
+ publish_to_all_connections (manager, TRUE);
}
}
+static void
+resource_cb (EmpathyConf *conf,
+ const gchar *key,
+ gpointer user_data)
+{
+ EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
+ GeoclueResourceFlags resource = 0;
+ gboolean resource_enabled;
+
+ DEBUG ("%s changed", key);
+
+ if (!empathy_conf_get_bool (conf, key, &resource_enabled))
+ return;
+
+ if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK))
+ resource = GEOCLUE_RESOURCE_NETWORK;
+ if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_CELL))
+ resource = GEOCLUE_RESOURCE_CELL;
+ if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_GPS))
+ resource = GEOCLUE_RESOURCE_GPS;
+
+ if (resource_enabled)
+ priv->resources |= resource;
+ else
+ priv->resources &= ~resource;
+
+ if (priv->geoclue_is_setup)
+ update_resources (manager);
+}
static void
accuracy_cb (EmpathyConf *conf,
gpointer user_data)
{
EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
- EmpathyLocationManagerPriv *priv;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
gboolean enabled;
- priv = GET_PRIV (manager);
DEBUG ("%s changed", key);
if (!empathy_conf_get_bool (conf, key, &enabled))
return;
priv->reduce_accuracy = enabled;
- if (enabled)
- {
- GRand *rand = g_rand_new_with_seed (time (NULL));
- priv->reduce_value = g_rand_double_range (rand, -0.25, 0.25);
- g_rand_free (rand);
- }
- else
- priv->reduce_value = 0.0;
-
- if (!priv->is_setup)
+ if (!priv->geoclue_is_setup)
return;
geoclue_address_get_address_async (priv->gc_address,
}
static void
-resource_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data)
+empathy_location_manager_init (EmpathyLocationManager *location_manager)
{
- EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
- EmpathyLocationManagerPriv *priv;
- GeoclueResourceFlags resource = 0;
- gboolean resource_enabled;
-
- priv = GET_PRIV (manager);
- DEBUG ("%s changed", key);
+ EmpathyConf *conf;
+ EmpathyLocationManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (location_manager,
+ EMPATHY_TYPE_LOCATION_MANAGER, EmpathyLocationManagerPriv);
- if (!empathy_conf_get_bool (conf, key, &resource_enabled))
- return;
+ location_manager->priv = priv;
+ priv->geoclue_is_setup = FALSE;
+ priv->location = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+ g_free, (GDestroyNotify) tp_g_value_slice_free);
- if (strcmp (key, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK) == 0)
- resource = GEOCLUE_RESOURCE_NETWORK;
- if (strcmp (key, EMPATHY_PREFS_LOCATION_RESOURCE_CELL) == 0)
- resource = GEOCLUE_RESOURCE_CELL;
- if (strcmp (key, EMPATHY_PREFS_LOCATION_RESOURCE_GPS) == 0)
- resource = GEOCLUE_RESOURCE_GPS;
+ /* Setup account status callbacks */
+ priv->account_manager = empathy_account_manager_dup_singleton ();
+ g_signal_connect (priv->account_manager,
+ "new-connection",
+ G_CALLBACK (new_connection_cb), location_manager);
- if (resource_enabled)
- priv->resources |= resource;
- else
- priv->resources &= ~resource;
+ /* Setup settings status callbacks */
+ conf = empathy_conf_get ();
+ empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_PUBLISH, publish_cb,
+ location_manager);
+ empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK,
+ resource_cb, location_manager);
+ empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_RESOURCE_CELL,
+ resource_cb, location_manager);
+ empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_RESOURCE_GPS,
+ resource_cb, location_manager);
+ empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY,
+ accuracy_cb, location_manager);
- if (priv->is_setup)
- update_resources (manager);
+ resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK, location_manager);
+ resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_CELL, location_manager);
+ resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_GPS, location_manager);
+ accuracy_cb (conf, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY, location_manager);
+ publish_cb (conf, EMPATHY_PREFS_LOCATION_PUBLISH, location_manager);
}
-#endif
+EmpathyLocationManager *
+empathy_location_manager_dup_singleton (void)
+{
+ return EMPATHY_LOCATION_MANAGER (g_object_new (EMPATHY_TYPE_LOCATION_MANAGER,
+ NULL));
+}
projects / empathy.git / blobdiff