[Pkg-telepathy-commits] [libnice] 124/265: agent: Attaching to a NULL context should attach to the default one

[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 a5c8a1415af6b3bf83a425b30c9118089e6a1adb
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Thu Jan 30 18:37:25 2014 -0500

    agent: Attaching to a NULL context should attach to the default one
    
    Otherwise it would have attached to a newly created context
---
 agent/agent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/agent/agent.c b/agent/agent.c
index 4f7842b..986dfb8 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -3660,9 +3660,6 @@ nice_agent_attach_recv (
   Stream *stream = NULL;
   gboolean ret = FALSE;
 
-  /* ctx must be non-NULL if func is non-NULL. */
-  g_return_val_if_fail (func == NULL || ctx != NULL, FALSE);
-
   agent_lock();
 
   /* attach candidates */
@@ -3674,6 +3671,9 @@ nice_agent_attach_recv (
     goto done;
   }
 
+  if (ctx == NULL)
+    ctx = g_main_context_default ();
+
   /* Set the component’s I/O context. */
   component_set_io_context (component, ctx);
   component_set_io_callback (component, func, data, NULL, 0, NULL);

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