[telepathy-gabble/telepathy-gabble-0.8] vcard-manager.c: Fix: cancel the request in the pipeline on timeout

Alban Crequy alban.crequy at collabora.co.uk
Thu Oct 1 10:04:43 PDT 2009


---
 src/vcard-manager.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 2f1b327..f82ff13 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -739,7 +739,11 @@ timeout_request (gpointer data)
          request, request->callback);
 
   request->timer_id = 0;
-  complete_one_request (request, NULL, &err);
+
+  /* The pipeline machinery will call our callback with the error "canceled"
+   */
+  gabble_request_pipeline_item_cancel (request->entry->pipeline_item);
+
   return FALSE;
 }
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list