#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpContactList)
typedef struct {
- EmpathyTpContactFactory *factory;
TpConnection *connection;
TpChannel *publish;
}
static void
-got_added_members_cb (EmpathyTpContactFactory *factory,
+got_added_members_cb (TpConnection *connection,
guint n_contacts,
EmpathyContact * const * contacts,
guint n_failed,
}
if (request->len > 0) {
- empathy_tp_contact_factory_get_from_handles (priv->factory,
+ empathy_tp_contact_factory_get_from_handles (priv->connection,
request->len, (TpHandle *) request->data,
got_added_members_cb, NULL, NULL, G_OBJECT (list));
}
}
static void
-tp_contact_list_got_local_pending_cb (EmpathyTpContactFactory *factory,
+tp_contact_list_got_local_pending_cb (TpConnection *connection,
guint n_contacts,
EmpathyContact * const * contacts,
guint n_failed,
/* Those contacts want our presence, auto accept those that are already
* member, otherwise add in pendings. */
if (local_pending->len > 0) {
- empathy_tp_contact_factory_get_from_handles (priv->factory,
+ empathy_tp_contact_factory_get_from_handles (priv->connection,
local_pending->len, (TpHandle *) local_pending->data,
tp_contact_list_got_local_pending_cb, NULL, NULL,
G_OBJECT (list));
g_object_unref (priv->connection);
}
- if (priv->factory) {
- g_object_unref (priv->factory);
- }
-
g_hash_table_iter_init (&iter, priv->groups);
while (g_hash_table_iter_next (&iter, NULL, &channel)) {
g_signal_handlers_disconnect_by_func (channel,
{
EmpathyTpContactListPriv *priv = GET_PRIV (list);
- priv->factory = empathy_tp_contact_factory_dup_singleton (priv->connection);
-
/* call GetAliasFlags */
if (tp_proxy_has_interface_by_id (priv->connection,
TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING)) {