[Pkg-telepathy-commits] [libnice] 98/265: agent: Return cancelled if sending is cancelled

[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 91befb1cb9cddca8df7b1cc323c2c759d6452b26
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Thu Jan 23 21:01:41 2014 -0500

    agent: Return cancelled if sending is cancelled
---
 agent/agent.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/agent/agent.c b/agent/agent.c
index 59f1116..3c9b282 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -2879,6 +2879,9 @@ nice_agent_send_full (
       cancellable == NULL || G_IS_CANCELLABLE (cancellable), -1);
   g_return_val_if_fail (error == NULL || *error == NULL, -1);
 
+  if (g_cancellable_set_error_if_cancelled (cancellable, error))
+    return -1;
+
   agent_lock ();
 
   if (!agent_find_component (agent, stream_id, component_id,

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