[Pkg-telepathy-commits] [libnice] 138/265: outputstream: Trigger the pollable source on error or removal

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit b80c112d1f1ffe2471ac52c9da9522b1024deb3e
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Tue Feb 18 23:52:37 2014 -0500

    outputstream: Trigger the pollable source on error or removal
---
 agent/agent.c     | 2 +-
 agent/component.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/agent/agent.c b/agent/agent.c
index 999019d..54bc0c3 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -992,7 +992,7 @@ static void priv_pseudo_tcp_error (NiceAgent *agent, Stream *stream,
     Component *component)
 {
   if (component->tcp_writable_cancellable) {
-    g_cancellable_reset (component->tcp_writable_cancellable);
+    g_cancellable_cancel (component->tcp_writable_cancellable);
     g_clear_object (&component->tcp_writable_cancellable);
   }
 
diff --git a/agent/component.c b/agent/component.c
index 296f353..29c134d 100644
--- a/agent/component.c
+++ b/agent/component.c
@@ -188,7 +188,10 @@ component_free (Component *cmp)
     g_source_unref (cmp->tcp_clock);
     cmp->tcp_clock = NULL;
   }
-  g_clear_object (&cmp->tcp_writable_cancellable);
+  if (cmp->tcp_writable_cancellable) {
+    g_cancellable_cancel (cmp->tcp_writable_cancellable);
+    g_clear_object (&cmp->tcp_writable_cancellable);
+  }
   if (cmp->tcp) {
     pseudo_tcp_socket_close (cmp->tcp, TRUE);
     g_clear_object(&cmp->tcp);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git