[farsight2/master] Set prefs cands on agent on _new

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:26:27 PST 2008


---
 transmitters/nice/fs-nice-agent.c              |    5 ++++-
 transmitters/nice/fs-nice-agent.h              |    4 +++-
 transmitters/nice/fs-nice-stream-transmitter.c |    4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/transmitters/nice/fs-nice-agent.c b/transmitters/nice/fs-nice-agent.c
index 9193ef6..76d85ad 100644
--- a/transmitters/nice/fs-nice-agent.c
+++ b/transmitters/nice/fs-nice-agent.c
@@ -339,12 +339,15 @@ fs_nice_agent_main_thread (gpointer data)
 }
 
 FsNiceAgent *
-fs_nice_agent_new (guint compatibility_mode, GError **error)
+fs_nice_agent_new (guint compatibility_mode,
+    GList *preferred_local_candidates,
+    GError **error)
 {
   FsNiceAgent *self = NULL;
 
   self = g_object_new (FS_TYPE_NICE_AGENT,
       "compatibility-mode", compatibility_mode,
+      "preferred-local-candidates", preferred_local_candidates,
       NULL);
 
   self->agent = nice_agent_new (&self->priv->udpfactory,
diff --git a/transmitters/nice/fs-nice-agent.h b/transmitters/nice/fs-nice-agent.h
index cefb257..a3ff597 100644
--- a/transmitters/nice/fs-nice-agent.h
+++ b/transmitters/nice/fs-nice-agent.h
@@ -89,7 +89,9 @@ fs_nice_agent_get_context (FsNiceAgent *self);
 void fs_nice_agent_add_weak_object (FsNiceAgent *self,
     GObject *object);
 
-FsNiceAgent *fs_nice_agent_new (guint compatibility_mode, GError **error);
+FsNiceAgent *fs_nice_agent_new (guint compatibility_mode,
+    GList *preferred_local_candidates,
+    GError **error);
 
 
 GType
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index 075e2e5..afb5845 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -961,7 +961,9 @@ fs_nice_stream_transmitter_build (FsNiceStreamTransmitter *self,
     /* If we don't have a thread, build one */
     if (thread == NULL)
     {
-      thread = fs_nice_agent_new (self->priv->compatibility_mode, error);
+      thread = fs_nice_agent_new (self->priv->compatibility_mode,
+          self->priv->preferred_local_candidates,
+          error);
       if (!thread)
         return FALSE;
     }
-- 
1.5.6.5




More information about the farsight-commits mailing list