aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-08-17 18:14:16 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-08-17 18:14:30 +0800
commitbc0428f6f77805811fd5b43f05196925313dbacb (patch)
treea11daa3dd0327ffaa9c66cf4b16e89a425de8bc4
parent9b528dc51ee3fb403e46aae06a2fa6c6e531657b (diff)
downloadgsoc2013-empathy-bc0428f6f77805811fd5b43f05196925313dbacb.tar
gsoc2013-empathy-bc0428f6f77805811fd5b43f05196925313dbacb.tar.gz
gsoc2013-empathy-bc0428f6f77805811fd5b43f05196925313dbacb.tar.bz2
gsoc2013-empathy-bc0428f6f77805811fd5b43f05196925313dbacb.tar.lz
gsoc2013-empathy-bc0428f6f77805811fd5b43f05196925313dbacb.tar.xz
gsoc2013-empathy-bc0428f6f77805811fd5b43f05196925313dbacb.tar.zst
gsoc2013-empathy-bc0428f6f77805811fd5b43f05196925313dbacb.zip
Use tp-glib Location stable API (#585843)
-rw-r--r--libempathy/empathy-tp-contact-factory.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 27160a445..f62c7f12f 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -128,7 +128,7 @@ tp_contact_factory_set_aliases_cb (TpConnection *connection,
}
static void
-tp_contact_factory_set_location_cb (TpProxy *proxy,
+tp_contact_factory_set_location_cb (TpConnection *tp_conn,
const GError *error,
gpointer user_data,
GObject *weak_object)
@@ -568,7 +568,7 @@ tp_contact_factory_update_location (EmpathyTpContactFactory *tp_factory,
}
static void
-tp_contact_factory_got_locations (TpProxy *tp_proxy,
+tp_contact_factory_got_locations (TpConnection *tp_conn,
GHashTable *locations,
const GError *error,
gpointer user_data,
@@ -624,7 +624,7 @@ tp_contact_factory_capabilities_changed_cb (TpConnection *connection,
}
static void
-tp_contact_factory_location_updated_cb (TpProxy *proxy,
+tp_contact_factory_location_updated_cb (TpConnection *tp_conn,
guint handle,
GHashTable *location,
gpointer user_data,
@@ -795,8 +795,8 @@ tp_contact_factory_add_contact (EmpathyTpContactFactory *tp_factory,
g_clear_error (&error);
if (tp_proxy_has_interface_by_id (TP_PROXY (priv->connection),
- EMP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION)) {
- emp_cli_connection_interface_location_call_get_locations (TP_PROXY (priv->connection),
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION)) {
+ tp_cli_connection_interface_location_call_get_locations (priv->connection,
-1,
&handles,
tp_contact_factory_got_locations,
@@ -1202,7 +1202,7 @@ empathy_tp_contact_factory_set_location (EmpathyTpContactFactory *tp_factory,
DEBUG ("Setting location");
- emp_cli_connection_interface_location_call_set_location (TP_PROXY (priv->connection),
+ tp_cli_connection_interface_location_call_set_location (priv->connection,
-1,
location,
tp_contact_factory_set_location_cb,
@@ -1316,7 +1316,7 @@ tp_contact_factory_constructor (GType type,
NULL);
- emp_cli_connection_interface_location_connect_to_location_updated (TP_PROXY (priv->connection),
+ tp_cli_connection_interface_location_connect_to_location_updated (priv->connection,
tp_contact_factory_location_updated_cb,
NULL, NULL,
G_OBJECT (tp_factory),