[Pkg-telepathy-commits] [libnice] 229/265: conncheck: Only stop conncheck timer if no stream has pending conn checks

[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 f559f388c694088433d13cdf0295bf00db866f09
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Thu Apr 24 20:33:33 2014 -0400

    conncheck: Only stop conncheck timer if no stream has pending conn checks
---
 agent/conncheck.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/agent/conncheck.c b/agent/conncheck.c
index d1cb4fa..1dc0b5b 100644
--- a/agent/conncheck.c
+++ b/agent/conncheck.c
@@ -1447,6 +1447,7 @@ void conn_check_prune_stream (NiceAgent *agent, Stream *stream)
 {
   CandidateCheckPair *pair;
   GSList *i;
+  gboolean keep_going = FALSE;
 
   for (i = stream->conncheck_list; i ; ) {
     GSList *next = i->next;
@@ -1462,8 +1463,16 @@ void conn_check_prune_stream (NiceAgent *agent, Stream *stream)
       break;
   }
 
-  if (!stream->conncheck_list)
-    conn_check_free (agent);
+  for (i = agent->streams; i; i = i->next) {
+    Stream *s = i->data;
+    if (s->conncheck_list) {
+      keep_going = TRUE;
+      break;
+    }
+  }
+
+  if (!keep_going)
+    conn_check_stop (agent);
 }
 
 /*

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