diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-10-19 23:58:43 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-10-20 00:47:03 +0800 |
| commit | 82063856bf2a278db370af8807c97e4e9c289afc (patch) | |
| tree | a8a0b4089f32a6598ae82bde9e1b25a228ec7f71 /libempathy | |
| parent | 0da8cbd3fe50e4eba859f93600a4da9c07ea751c (diff) | |
| download | gsoc2013-empathy-82063856bf2a278db370af8807c97e4e9c289afc.tar gsoc2013-empathy-82063856bf2a278db370af8807c97e4e9c289afc.tar.gz gsoc2013-empathy-82063856bf2a278db370af8807c97e4e9c289afc.tar.bz2 gsoc2013-empathy-82063856bf2a278db370af8807c97e4e9c289afc.tar.lz gsoc2013-empathy-82063856bf2a278db370af8807c97e4e9c289afc.tar.xz gsoc2013-empathy-82063856bf2a278db370af8807c97e4e9c289afc.tar.zst gsoc2013-empathy-82063856bf2a278db370af8807c97e4e9c289afc.zip | |
Unset pending_call explicitly instead of implicitly
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index cc0c8198b..1cb418977 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -254,6 +254,9 @@ free_dispatcher_request_data (DispatcherRequestData *r) 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); } @@ -285,8 +288,6 @@ free_connection_data (ConnectionData *cd) 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); } @@ -1302,6 +1303,8 @@ dispatcher_request_channel_cb (TpConnection *connection, EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (request_data->dispatcher); + request_data->pending_call = NULL; + dispatcher_connection_new_requested_channel (dispatcher, request_data, object_path, NULL, error); } @@ -1438,6 +1441,8 @@ dispatcher_request_handles_cb (TpConnection *connection, { DispatcherRequestData *request_data = (DispatcherRequestData *) user_data; + request_data->pending_call = NULL; + if (error != NULL) { EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object); @@ -1510,6 +1515,8 @@ dispatcher_create_channel_cb (TpConnection *connect, EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (request_data->dispatcher); + request_data->pending_call = NULL; + dispatcher_connection_new_requested_channel (dispatcher, request_data, object_path, properties, error); } @@ -1527,6 +1534,8 @@ dispatcher_ensure_channel_cb (TpConnection *connect, EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (request_data->dispatcher); + request_data->pending_call = NULL; + dispatcher_connection_new_requested_channel (dispatcher, request_data, object_path, properties, error); } |