EmpathyDispatcher *dispatcher)
{
EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
- ConnectionData *cd;
DEBUG ("Error: %s", message);
- cd = g_hash_table_lookup (priv->connections, connection);
-
g_hash_table_remove (priv->connections, connection);
}
connection = empathy_dispatch_operation_get_tp_connection (operation);
cd = g_hash_table_lookup (priv->connections, connection);
g_assert (cd != NULL);
- g_object_unref (G_OBJECT (connection));
object_path = empathy_dispatch_operation_get_object_path (operation);
connection = empathy_dispatch_operation_get_tp_connection (operation);
cd = g_hash_table_lookup (priv->connections, connection);
g_assert (cd != NULL);
- g_object_unref (G_OBJECT (connection));
g_object_ref (operation);
g_object_ref (dispatcher);
request_data, NULL, G_OBJECT (request_data->dispatcher));
}
-void
-empathy_dispatcher_call_with_contact (EmpathyContact *contact,
- EmpathyDispatcherRequestCb *callback,
- gpointer user_data)
-{
- EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton();
- EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
- TpConnection *connection;
- ConnectionData *cd;
- DispatcherRequestData *request_data;
-
- g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-
- connection = empathy_contact_get_connection (contact);
- cd = g_hash_table_lookup (priv->connections, connection);
- request_data = new_dispatcher_request_data (dispatcher, connection,
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, TP_HANDLE_TYPE_NONE, 0, NULL,
- contact, callback, user_data);
-
- cd->outstanding_requests = g_list_prepend
- (cd->outstanding_requests, request_data);
-
- dispatcher_request_channel (request_data);
-
- g_object_unref (dispatcher);
-}
-
void
empathy_dispatcher_chat_with_contact (EmpathyContact *contact,
EmpathyDispatcherRequestCb *callback,
static void
dispatcher_chat_with_contact_id_cb (EmpathyTpContactFactory *factory,
- GList *contacts,
+ EmpathyContact *contact,
+ const GError *error,
gpointer user_data,
GObject *weak_object)
{
ChatWithContactIdData *data = user_data;
- empathy_dispatcher_chat_with_contact (contacts->data, data->callback, data->user_data);
+ if (error)
+ {
+ /* FIXME: Should call data->callback with the error */
+ DEBUG ("Error: %s", error->message);
+ }
+ else
+ {
+ empathy_dispatcher_chat_with_contact (contact, data->callback, data->user_data);
+ }
+
g_object_unref (data->dispatcher);
g_slice_free (ChatWithContactIdData, data);
}
data->dispatcher = dispatcher;
data->callback = callback;
data->user_data = user_data;
- empathy_tp_contact_factory_get_from_ids (factory, 1, &contact_id,
+ empathy_tp_contact_factory_get_from_id (factory, contact_id,
dispatcher_chat_with_contact_id_cb, data, NULL, NULL);
g_object_unref (factory);