[Pkg-telepathy-commits] [libnice] 152/265: agent: Delay signal emission after the lock has been released

[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 85c6ebb946fe7ccb32a6a4761cd88bc75a41a7ca
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Mon Feb 24 18:50:59 2014 -0500

    agent: Delay signal emission after the lock has been released
    
    This way, there can be no annoying re-entrancy in our code.
---
 agent/agent.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/agent/agent.c b/agent/agent.c
index 4395f3b..689a2f6 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -3724,8 +3724,9 @@ component_io_cb (GSocket *socket, GIOCondition condition, gpointer user_data)
   if (g_source_is_destroyed (g_main_current_source ())) {
     /* Silently return FALSE. */
     nice_debug ("%s: source %p destroyed", G_STRFUNC, g_main_current_source ());
-    remove_source = TRUE;
-    goto done;
+
+    agent_unlock ();
+    return G_SOURCE_REMOVE;
   }
 
   component = socket_source->component;
@@ -3875,10 +3876,11 @@ component_io_cb (GSocket *socket, GIOCondition condition, gpointer user_data)
   }
 
 done:
-  g_object_unref (agent);
 
   agent_unlock_and_emit (agent);
 
+  g_object_unref (agent);
+
   return !remove_source;
 }
 

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