*/
#include "config.h"
-
-#include <string.h>
-#include <time.h>
-
-#include <glib/gi18n.h>
-
-#include <telepathy-glib/util.h>
-
-#include <geoclue/geoclue-master.h>
-
-#include <extensions/extensions.h>
-
#include "empathy-location-manager.h"
-#include "empathy-conf.h"
-#include "libempathy/empathy-account-manager.h"
-#include "libempathy/empathy-enum-types.h"
-#include "libempathy/empathy-location.h"
-#include "libempathy/empathy-tp-contact-factory.h"
-#include "libempathy/empathy-utils.h"
+#include <tp-account-widgets/tpaw-time.h>
+
+#include "empathy-gsettings.h"
+#include "empathy-location.h"
+#include "empathy-geoclue-helper.h"
#define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
-#include "libempathy/empathy-debug.h"
+#include "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 geoclue_is_setup;
+typedef enum
+{
+ GEOCLUE_NONE = 0,
+ GEOCLUE_STARTING,
+ GEOCLUE_STARTED,
+ GEOCLUE_FAILED,
+} GeoclueStatus;
+
+struct _EmpathyLocationManagerPrivate {
+ GeoclueStatus geoclue_status;
/* 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;
- GeoclueResourceFlags resources;
- GeoclueMasterClient *gc_client;
- GeocluePosition *gc_position;
- GeoclueAddress *gc_address;
+ GSettings *gsettings_loc;
gboolean reduce_accuracy;
- EmpathyAccountManager *account_manager;
+ TpAccountManager *account_manager;
+ EmpathyGeoclueHelper *geoclue;
/* The idle id for publish_on_idle func */
guint timeout_id;
-} EmpathyLocationManagerPriv;
+};
G_DEFINE_TYPE (EmpathyLocationManager, empathy_location_manager, G_TYPE_OBJECT);
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)
-{
- /*EmpathyLocationManagerPriv *priv = GET_PRIV (object); */
-
- switch (param_id)
- {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
- break;
- };
-}
+ EmpathyLocationManager *self = (EmpathyLocationManager *) object;
+ void (*dispose) (GObject *) =
+ G_OBJECT_CLASS (empathy_location_manager_parent_class)->dispose;
-static void
-location_manager_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- /* EmpathyLocationManagerPriv *priv = GET_PRIV (object); */
+ tp_clear_object (&self->priv->account_manager);
+ tp_clear_object (&self->priv->gsettings_loc);
+ tp_clear_pointer (&self->priv->location, g_hash_table_unref);
- switch (param_id)
- {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
- break;
- };
+ if (dispose != NULL)
+ dispose (object);
}
static void
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;
- g_type_class_add_private (object_class, sizeof (EmpathyLocationManagerPriv));
+ g_type_class_add_private (object_class, sizeof (EmpathyLocationManagerPrivate));
+}
+
+static void
+publish_location_cb (TpConnection *connection,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ if (error != NULL)
+ DEBUG ("Error setting location: %s", error->message);
}
static void
TpConnection *conn,
gboolean force_publication)
{
- EmpathyLocationManagerPriv *priv = GET_PRIV (self);
guint connection_status = -1;
- gboolean can_publish;
- EmpathyConf *conf = empathy_conf_get ();
- EmpathyTpContactFactory *factory;
if (!conn)
return;
if (!force_publication)
{
- if (!empathy_conf_get_bool (conf, EMPATHY_PREFS_LOCATION_PUBLISH,
- &can_publish))
- return;
-
- if (!can_publish)
+ if (!g_settings_get_boolean (self->priv->gsettings_loc,
+ EMPATHY_PREFS_LOCATION_PUBLISH))
return;
}
return;
DEBUG ("Publishing %s location to connection %p",
- (g_hash_table_size (priv->location) == 0 ? "empty" : ""),
+ (g_hash_table_size (self->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);
+ tp_cli_connection_interface_location_call_set_location (conn, -1,
+ self->priv->location, publish_location_cb, NULL, NULL, G_OBJECT (self));
}
+typedef struct
+{
+ EmpathyLocationManager *self;
+ gboolean force_publication;
+} PublishToAllData;
+
static void
-publish_to_all_connections (EmpathyLocationManager *self,
- gboolean force_publication)
+publish_to_all_am_prepared_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- EmpathyLocationManagerPriv *priv = GET_PRIV (self);
- GList *connections = NULL, *l;
+ TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
+ PublishToAllData *data = user_data;
+ GList *accounts, *l;
+ GError *error = NULL;
+
+ if (!tp_proxy_prepare_finish (manager, result, &error))
+ {
+ DEBUG ("Failed to prepare account manager: %s", error->message);
+ g_error_free (error);
+ goto out;
+ }
- connections = empathy_account_manager_dup_connections (priv->account_manager);
- for (l = connections; l; l = l->next)
+ accounts = tp_account_manager_dup_valid_accounts (manager);
+ for (l = accounts; l; l = l->next)
{
- publish_location (self, l->data, force_publication);
- g_object_unref (l->data);
+ TpConnection *conn = tp_account_get_connection (TP_ACCOUNT (l->data));
+
+ if (conn != NULL)
+ publish_location (data->self, conn, data->force_publication);
}
- g_list_free (connections);
+ g_list_free_full (accounts, g_object_unref);
+
+out:
+ g_object_unref (data->self);
+ g_slice_free (PublishToAllData, data);
+}
+
+static void
+publish_to_all_connections (EmpathyLocationManager *self,
+ gboolean force_publication)
+{
+ PublishToAllData *data;
+ data = g_slice_new0 (PublishToAllData);
+ data->self = g_object_ref (self);
+ data->force_publication = force_publication;
+
+ tp_proxy_prepare_async (self->priv->account_manager, NULL,
+ publish_to_all_am_prepared_cb, data);
}
static gboolean
publish_on_idle (gpointer user_data)
{
EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
- EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
- priv->timeout_id = 0;
+ manager->priv->timeout_id = 0;
publish_to_all_connections (manager, TRUE);
return FALSE;
}
static void
-new_connection_cb (EmpathyAccountManager *manager,
- TpConnection *conn,
- gpointer *self)
+new_connection_cb (TpAccount *account,
+ guint old_status,
+ guint new_status,
+ guint reason,
+ gchar *dbus_error_name,
+ GHashTable *details,
+ gpointer user_data)
{
- EmpathyLocationManagerPriv *priv = GET_PRIV (self);
+ EmpathyLocationManager *self = user_data;
+ TpConnection *conn;
+
+ conn = tp_account_get_connection (account);
+
DEBUG ("New connection %p", conn);
/* Don't publish if it is already planned (ie startup) */
- if (priv->timeout_id == 0)
+ if (self->priv->timeout_id == 0)
{
publish_location (EMPATHY_LOCATION_MANAGER (self), conn,
FALSE);
}
static void
-update_timestamp (EmpathyLocationManager *self)
-{
- EmpathyLocationManagerPriv *priv= GET_PRIV (self);
- GValue *new_value;
- gint64 stamp64;
- time_t timestamp;
-
- 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
-address_changed_cb (GeoclueAddress *address,
- int timestamp,
- GHashTable *details,
- GeoclueAccuracy *accuracy,
- gpointer self)
+update_location (EmpathyLocationManager *self,
+ GClueLocation *proxy)
{
- GeoclueAccuracyLevel level;
- EmpathyLocationManagerPriv *priv = GET_PRIV (self);
- GHashTableIter iter;
- gpointer key, value;
-
- geoclue_accuracy_get_details (accuracy, &level, NULL, NULL);
- DEBUG ("New address (accuracy level %d):", level);
- /* FIXME: Publish accuracy level also considering the position's */
-
- 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);
-
- if (g_hash_table_size (details) == 0)
- {
- 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;
+ gdouble latitude, longitude, accuracy;
+ const gchar *desc;
+ gint64 timestamp;
- new_value = tp_g_value_slice_new_string (value);
- g_hash_table_insert (priv->location, g_strdup (key), new_value);
+ latitude = gclue_location_get_latitude (proxy);
+ longitude = gclue_location_get_longitude (proxy);
+ accuracy = gclue_location_get_accuracy (proxy);
+ desc = gclue_location_get_description (proxy);
- DEBUG ("\t - %s: %s", (gchar *) key, (gchar *) value);
- }
+ DEBUG ("Location updated: (%f %f) accuracy: %f (%s)",
+ latitude, longitude, accuracy, desc);
- update_timestamp (self);
- if (priv->timeout_id == 0)
- priv->timeout_id = g_timeout_add_seconds (TIMEOUT, publish_on_idle, self);
-}
-
-static void
-initial_address_cb (GeoclueAddress *address,
- int timestamp,
- GHashTable *details,
- GeoclueAccuracy *accuracy,
- GError *error,
- gpointer self)
-{
- if (error)
+ if (self->priv->reduce_accuracy)
{
- DEBUG ("Error: %s", error->message);
- g_error_free (error);
+ /* Truncate at 1 decimal place */
+ latitude = ((int) (latitude * 10)) / 10.0;
+ longitude = ((int) (longitude * 10)) / 10.0;
}
else
{
- address_changed_cb (address, timestamp, details, accuracy, self);
+ /* Include the description only if we are not asked to reduce the
+ * accuracy as it can contains a pretty specific description of the
+ * location. */
+ tp_asv_set_string (self->priv->location, EMPATHY_LOCATION_DESCRIPTION,
+ desc);
}
-}
-
-static void
-position_changed_cb (GeocluePosition *position,
- GeocluePositionFields fields,
- int timestamp,
- double latitude,
- double longitude,
- double altitude,
- GeoclueAccuracy *accuracy,
- gpointer self)
-{
- EmpathyLocationManagerPriv *priv = GET_PRIV (self);
- 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)
- return;
-
- if (fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)
- {
- if (priv->reduce_accuracy)
- /* Truncate at 1 decimal place */
- longitude = ((int) (longitude * 10)) / 10.0;
+ tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LAT, latitude);
+ tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LON, longitude);
+ tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_ACCURACY, accuracy);
- 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);
- }
+ timestamp = tpaw_time_get_current ();
+ tp_asv_set_int64 (self->priv->location, EMPATHY_LOCATION_TIMESTAMP,
+ timestamp);
- if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE)
- {
- if (priv->reduce_accuracy)
- /* Truncate at 1 decimal place */
- latitude = ((int) (latitude * 10)) / 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_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_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 (self);
- if (priv->timeout_id == 0)
- priv->timeout_id = g_timeout_add_seconds (TIMEOUT, publish_on_idle, self);
-}
-
-static void
-initial_position_cb (GeocluePosition *position,
- GeocluePositionFields fields,
- int timestamp,
- double latitude,
- double longitude,
- double altitude,
- GeoclueAccuracy *accuracy,
- GError *error,
- gpointer self)
-{
- if (error)
- {
- DEBUG ("Error: %s", error->message);
- g_error_free (error);
- }
- else
- {
- position_changed_cb (position, fields, timestamp, latitude, longitude,
- altitude, accuracy, self);
- }
+ if (self->priv->timeout_id == 0)
+ self->priv->timeout_id = g_timeout_add_seconds (TIMEOUT, publish_on_idle,
+ self);
}
static void
-update_resources (EmpathyLocationManager *self)
+location_changed_cb (EmpathyGeoclueHelper *geoclue,
+ GClueLocation *location,
+ EmpathyLocationManager *self)
{
- EmpathyLocationManagerPriv *priv = GET_PRIV (self);
-
- DEBUG ("Updating resources %d", priv->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_COUNTRY, 0, TRUE, priv->resources,
- NULL))
- {
- DEBUG ("set_requirements failed");
- return;
- }
-
- geoclue_address_get_address_async (priv->gc_address,
- initial_address_cb, self);
- geoclue_position_get_position_async (priv->gc_position,
- initial_position_cb, self);
+ update_location (self, location);
}
static void
-setup_geoclue (EmpathyLocationManager *self)
+geoclue_new_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
{
- EmpathyLocationManagerPriv *priv = GET_PRIV (self);
-
- GeoclueMaster *master;
+ EmpathyLocationManager *self = EMPATHY_LOCATION_MANAGER (user_data);
GError *error = NULL;
+ GClueLocation *location;
- DEBUG ("Setting up Geoclue");
- master = geoclue_master_get_default ();
- priv->gc_client = geoclue_master_create_client (master, NULL, &error);
- g_object_unref (master);
+ self->priv->geoclue = empathy_geoclue_helper_new_started_finish (result,
+ &error);
- if (priv->gc_client == NULL)
+ if (self->priv->geoclue == NULL)
{
- DEBUG ("Failed to GeoclueMasterClient: %s", error->message);
+ DEBUG ("Failed to create Geoclue client: %s", error->message);
g_error_free (error);
+ self->priv->geoclue_status = GEOCLUE_FAILED;
return;
}
- update_resources (self);
+ self->priv->geoclue_status = GEOCLUE_STARTED;
- /* Get updated when the position is changes */
- priv->gc_position = geoclue_master_client_create_position (
- priv->gc_client, &error);
- if (priv->gc_position == NULL)
- {
- DEBUG ("Failed to create GeocluePosition: %s", error->message);
- g_error_free (error);
- return;
- }
+ g_signal_connect_object (self->priv->geoclue, "location-changed",
+ G_CALLBACK (location_changed_cb), self, 0);
- g_signal_connect (G_OBJECT (priv->gc_position), "position-changed",
- G_CALLBACK (position_changed_cb), self);
+ location = empathy_geoclue_helper_get_location (self->priv->geoclue);
+ if (location != NULL)
+ update_location (self, location);
+}
- /* Get updated when the address changes */
- priv->gc_address = geoclue_master_client_create_address (
- priv->gc_client, &error);
- if (priv->gc_address == NULL)
+static void
+setup_geoclue (EmpathyLocationManager *self)
+{
+ switch (self->priv->geoclue_status)
{
- DEBUG ("Failed to create GeoclueAddress: %s", error->message);
- g_error_free (error);
+ case GEOCLUE_NONE:
+ g_assert (self->priv->geoclue == NULL);
+ self->priv->geoclue_status = GEOCLUE_STARTING;
+ empathy_geoclue_helper_new_started_async (0, geoclue_new_cb, self);
+ break;
+ case GEOCLUE_STARTED:
+ case GEOCLUE_STARTING:
+ case GEOCLUE_FAILED:
return;
}
-
- g_signal_connect (G_OBJECT (priv->gc_address), "address-changed",
- G_CALLBACK (address_changed_cb), self);
-
- priv->geoclue_is_setup = TRUE;
}
static void
-publish_cb (EmpathyConf *conf,
+publish_cb (GSettings *gsettings_loc,
const gchar *key,
gpointer user_data)
{
- EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
- EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
- gboolean can_publish;
+ EmpathyLocationManager *self = EMPATHY_LOCATION_MANAGER (user_data);
DEBUG ("Publish Conf changed");
-
- if (!empathy_conf_get_bool (conf, key, &can_publish))
- return;
-
- if (can_publish)
+ if (g_settings_get_boolean (gsettings_loc, key))
{
- 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);
+ setup_geoclue (self);
}
else
{
/* As per XEP-0080: send an empty location to have remove current
* location from the servers
*/
- g_hash_table_remove_all (priv->location);
- 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;
+ g_hash_table_remove_all (self->priv->location);
+ publish_to_all_connections (self, TRUE);
- 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);
+ g_clear_object (&self->priv->geoclue);
+ self->priv->geoclue_status = GEOCLUE_NONE;
+ }
}
static void
-accuracy_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data)
+account_manager_prepared_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
- EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
-
- gboolean enabled;
-
- DEBUG ("%s changed", key);
+ GList *accounts, *l;
+ TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+ EmpathyLocationManager *self = user_data;
+ GError *error = NULL;
- if (!empathy_conf_get_bool (conf, key, &enabled))
- return;
- priv->reduce_accuracy = enabled;
+ if (!tp_proxy_prepare_finish (account_manager, result, &error))
+ {
+ DEBUG ("Failed to prepare account manager: %s", error->message);
+ g_error_free (error);
+ return;
+ }
- if (!priv->geoclue_is_setup)
- return;
+ accounts = tp_account_manager_dup_valid_accounts (account_manager);
+ for (l = accounts; l != NULL; l = l->next)
+ {
+ TpAccount *account = TP_ACCOUNT (l->data);
- geoclue_address_get_address_async (priv->gc_address,
- initial_address_cb, manager);
- geoclue_position_get_position_async (priv->gc_position,
- initial_position_cb, manager);
+ tp_g_signal_connect_object (account, "status-changed",
+ G_CALLBACK (new_connection_cb), self, 0);
+ }
+ g_list_free_full (accounts, g_object_unref);
}
static void
empathy_location_manager_init (EmpathyLocationManager *self)
{
- EmpathyConf *conf;
- EmpathyLocationManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- EMPATHY_TYPE_LOCATION_MANAGER, EmpathyLocationManagerPriv);
+ EmpathyLocationManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ EMPATHY_TYPE_LOCATION_MANAGER, EmpathyLocationManagerPrivate);
self->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);
+ priv->location = tp_asv_new (NULL, NULL);
+ priv->gsettings_loc = g_settings_new (EMPATHY_PREFS_LOCATION_SCHEMA);
/* 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), self);
+ priv->account_manager = tp_account_manager_dup ();
+
+ tp_proxy_prepare_async (priv->account_manager, NULL,
+ account_manager_prepared_cb, self);
/* Setup settings status callbacks */
- conf = empathy_conf_get ();
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_PUBLISH, publish_cb,
- self);
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK,
- resource_cb, self);
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_RESOURCE_CELL,
- resource_cb, self);
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_RESOURCE_GPS,
- resource_cb, self);
- empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY,
- accuracy_cb, self);
-
- resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK, self);
- resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_CELL, self);
- resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_GPS, self);
- accuracy_cb (conf, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY, self);
- publish_cb (conf, EMPATHY_PREFS_LOCATION_PUBLISH, self);
+ g_signal_connect (priv->gsettings_loc,
+ "changed::" EMPATHY_PREFS_LOCATION_PUBLISH,
+ G_CALLBACK (publish_cb), self);
+
+ publish_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_PUBLISH, self);
}
EmpathyLocationManager *
projects / empathy.git / blobdiff