[Pkg-telepathy-commits] [libnice] 236/265: stream: No need to pass RNG to stream_restart()

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

    stream: No need to pass RNG to stream_restart()
    
    It can now take it from the agent.
---
 agent/agent.c  | 4 ++--
 agent/stream.c | 4 ++--
 agent/stream.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/agent/agent.c b/agent/agent.c
index c60ca47..ddf9319 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -3705,7 +3705,7 @@ nice_agent_restart (
 
     /* step: reset local credentials for the stream and 
      * clean up the list of remote candidates */
-    stream_restart (agent, stream, agent->rng);
+    stream_restart (agent, stream);
   }
 
   agent_unlock_and_emit (agent);
@@ -3730,7 +3730,7 @@ nice_agent_restart_stream (
 
   /* step: reset local credentials for the stream and
    * clean up the list of remote candidates */
-  stream_restart (agent, stream, agent->rng);
+  stream_restart (agent, stream);
 
   res = TRUE;
  done:
diff --git a/agent/stream.c b/agent/stream.c
index 041306d..75c81c9 100644
--- a/agent/stream.c
+++ b/agent/stream.c
@@ -133,7 +133,7 @@ void stream_initialize_credentials (Stream *stream, NiceRNG *rng)
  * session.
  */
 void
-stream_restart (NiceAgent *agent, Stream *stream, NiceRNG *rng)
+stream_restart (NiceAgent *agent, Stream *stream)
 {
   GSList *i;
 
@@ -142,7 +142,7 @@ stream_restart (NiceAgent *agent, Stream *stream, NiceRNG *rng)
 
   stream->initial_binding_request_received = FALSE;
 
-  stream_initialize_credentials (stream, rng);
+  stream_initialize_credentials (stream, agent->rng);
 
   for (i = stream->components; i; i = i->next) {
     Component *component = i->data;
diff --git a/agent/stream.h b/agent/stream.h
index 7b96bd0..9dd08ac 100644
--- a/agent/stream.h
+++ b/agent/stream.h
@@ -93,7 +93,7 @@ void
 stream_initialize_credentials (Stream *stream, NiceRNG *rng);
 
 void
-stream_restart (NiceAgent *agent, Stream *stream, NiceRNG *rng);
+stream_restart (NiceAgent *agent, Stream *stream);
 
 G_END_DECLS
 

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