[farsight2/master] Set compat mode when creating fsniceagent

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


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

diff --git a/transmitters/nice/fs-nice-agent.c b/transmitters/nice/fs-nice-agent.c
index b18e5ee..d847e2c 100644
--- a/transmitters/nice/fs-nice-agent.c
+++ b/transmitters/nice/fs-nice-agent.c
@@ -286,13 +286,16 @@ fs_nice_agent_main_thread (gpointer data)
 }
 
 FsNiceAgent *
-fs_nice_agent_new (GError **error)
+fs_nice_agent_new (guint compatibility_mode, GError **error)
 {
   FsNiceAgent *self = NULL;
 
-  self = g_object_new (FS_TYPE_NICE_AGENT, NULL);
+  self = g_object_new (FS_TYPE_NICE_AGENT,
+      "compatibility-mode", compatibility_mode,
+      NULL);
 
   FS_NICE_AGENT_LOCK (self);
+
   self->priv->thread = g_thread_create (fs_nice_agent_main_thread,
       self, TRUE, error);
 
diff --git a/transmitters/nice/fs-nice-agent.h b/transmitters/nice/fs-nice-agent.h
index 64fd3c3..4a697f7 100644
--- a/transmitters/nice/fs-nice-agent.h
+++ b/transmitters/nice/fs-nice-agent.h
@@ -87,7 +87,7 @@ fs_nice_agent_get_context (FsNiceAgent *self);
 void fs_nice_agent_add_weak_object (FsNiceAgent *self,
     GObject *object);
 
-FsNiceAgent *fs_nice_agent_new (GError **error);
+FsNiceAgent *fs_nice_agent_new (guint compatibility_mode, GError **error);
 
 
 GType
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index fabc89e..075e2e5 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -961,7 +961,7 @@ fs_nice_stream_transmitter_build (FsNiceStreamTransmitter *self,
     /* If we don't have a thread, build one */
     if (thread == NULL)
     {
-      thread = fs_nice_agent_new (error);
+      thread = fs_nice_agent_new (self->priv->compatibility_mode, error);
       if (!thread)
         return FALSE;
     }
-- 
1.5.6.5




More information about the farsight-commits mailing list