[Pkg-telepathy-commits] [libnice] 239/265: component: Make detach_source close the socket

[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 bd55d4fa1dbb147835dc9b0a35fada1491dc32f1
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Tue Apr 15 22:44:52 2014 -0400

    component: Make detach_source close the socket
---
 agent/component.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/agent/component.c b/agent/component.c
index 4e9384e..4062a6b 100644
--- a/agent/component.c
+++ b/agent/component.c
@@ -495,8 +495,8 @@ component_reattach_all_sockets (Component *component)
  * @component: a #Component
  * @socket: the socket to detach the source for
  *
- * Detach the #GSource for the single specified @socket. Leave the socket itself
- * untouched.
+ * Detach the #GSource for the single specified @socket. It also closes it
+ * and frees it!
  *
  * If the @socket doesn’t exist in this @component, do nothing.
  */
@@ -516,7 +516,11 @@ component_detach_socket (Component *component, NiceSocket *nicesock)
 
   /* Detach the source. */
   socket_source = l->data;
+  component->socket_sources = g_slist_delete_link (component->socket_sources, l);
+  component->socket_sources_age++;
+
   socket_source_detach (socket_source);
+  socket_source_free (socket_source);
 }
 
 /*

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