From 7bf5562a19ecac3c59dc23ebe507112e2745b635 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 2 Dec 2007 22:38:02 +0000 Subject: Conflicts: ChangeLog svn path=/trunk/; revision=455 --- libempathy/empathy-contact-factory.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'libempathy/empathy-contact-factory.c') diff --git a/libempathy/empathy-contact-factory.c b/libempathy/empathy-contact-factory.c index 5bd51c9d8..3365f1710 100644 --- a/libempathy/empathy-contact-factory.c +++ b/libempathy/empathy-contact-factory.c @@ -23,6 +23,7 @@ #include +#include #include #include #include @@ -486,7 +487,7 @@ contact_factory_avatar_maybe_update (ContactFactoryAccountData *account_data, /* Check if the avatar changed */ avatar = empathy_contact_get_avatar (contact); - if (avatar && !empathy_strdiff (avatar->token, token)) { + if (avatar && !tp_strdiff (avatar->token, token)) { return TRUE; } @@ -880,13 +881,13 @@ contact_factory_account_data_update (ContactFactoryAccountData *account_data) /* We got a new connection */ account_data->tp_conn = tp_conn; account_data->aliasing_iface = tp_conn_get_interface (tp_conn, - TELEPATHY_CONN_IFACE_ALIASING_QUARK); + TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING); account_data->avatars_iface = tp_conn_get_interface (tp_conn, - TELEPATHY_CONN_IFACE_AVATARS_QUARK); + TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS); account_data->presence_iface = tp_conn_get_interface (tp_conn, - TELEPATHY_CONN_IFACE_PRESENCE_QUARK); + TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE); account_data->capabilities_iface = tp_conn_get_interface (tp_conn, - TELEPATHY_CONN_IFACE_CAPABILITIES_QUARK); + TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES); /* Connect signals */ if (account_data->aliasing_iface) { @@ -971,12 +972,12 @@ contact_factory_account_data_new (EmpathyContactFactory *factory, } static void -contact_factory_status_changed_cb (MissionControl *mc, - TelepathyConnectionStatus status, - McPresence presence, - TelepathyConnectionStatusReason reason, - const gchar *unique_name, - EmpathyContactFactory *factory) +contact_factory_status_changed_cb (MissionControl *mc, + TpConnectionStatus status, + McPresence presence, + TpConnectionStatusReason reason, + const gchar *unique_name, + EmpathyContactFactory *factory) { EmpathyContactFactoryPriv *priv = GET_PRIV (factory); ContactFactoryAccountData *account_data; -- cgit v1.2.3