[telepathy-gabble/telepathy-gabble-0.8] Fix gabble_request_pipeline_item_cancel: remove the timer

Alban Crequy alban.crequy at collabora.co.uk
Wed Sep 30 10:27:40 PDT 2009


---
 src/request-pipeline.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/request-pipeline.c b/src/request-pipeline.c
index 6aba0bc..ea5a4ee 100644
--- a/src/request-pipeline.c
+++ b/src/request-pipeline.c
@@ -202,6 +202,10 @@ gabble_request_pipeline_item_cancel (GabbleRequestPipelineItem *item)
   GabbleRequestPipelinePrivate *priv =
       GABBLE_REQUEST_PIPELINE_GET_PRIVATE (item->pipeline);
 
+  g_assert (item->timer_id != 0);
+  g_source_remove (item->timer_id);
+  item->timer_id = 0;
+
   (item->callback) (priv->connection, NULL, item->user_data, &cancelled);
 
   item->zombie = TRUE;
-- 
1.5.6.5




More information about the telepathy-commits mailing list