if (r->request != NULL)
g_hash_table_unref (r->request);
+ if (r->pending_call != NULL)
+ tp_proxy_pending_call_cancel (r->pending_call);
+
g_slice_free (DispatcherRequestData, r);
}
for (l = cd->outstanding_requests ; l != NULL; l = g_list_delete_link (l,l))
{
- DispatcherRequestData *data = l->data;
- tp_proxy_pending_call_cancel (data->pending_call);
free_dispatcher_request_data (l->data);
}
EmpathyDispatcher *dispatcher =
EMPATHY_DISPATCHER (request_data->dispatcher);
+ request_data->pending_call = NULL;
+
dispatcher_connection_new_requested_channel (dispatcher,
request_data, object_path, NULL, error);
}
{
DispatcherRequestData *request_data = (DispatcherRequestData *) user_data;
+ request_data->pending_call = NULL;
+
if (error != NULL)
{
EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
EmpathyDispatcher *dispatcher =
EMPATHY_DISPATCHER (request_data->dispatcher);
+ request_data->pending_call = NULL;
+
dispatcher_connection_new_requested_channel (dispatcher,
request_data, object_path, properties, error);
}
EmpathyDispatcher *dispatcher =
EMPATHY_DISPATCHER (request_data->dispatcher);
+ request_data->pending_call = NULL;
+
dispatcher_connection_new_requested_channel (dispatcher,
request_data, object_path, properties, error);
}