[Pkg-telepathy-commits] ./packages/experimental/farsight2 r25: warnings. From upstream git

[sjoerd at luon.net]

------------------------------------------------------------
revno: 25
committer: sjoerd at luon.net
branch nick: farsight2
timestamp: Wed 2008-11-26 17:57:20 +0100
message:
      warnings. From upstream git
  * debian/patches/01-set-remote-candidates-in-idle.patch:
    - Set remote candidates in an idle callback to prevent deadlocks
added:
  patches/01-set-remote-candidates-in-idle.patch
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-11-26 15:40:19 +0000
+++ b/changelog	2008-11-26 16:57:20 +0000
@@ -3,9 +3,11 @@
   * Enable libnice support
   * debian/patches/00-dont-release-pads.patch:
     - Don't release request pads on gstrtpbin. It's not implemented and causes
-      warnings
+      warnings. From upstream git
+  * debian/patches/01-set-remote-candidates-in-idle.patch:
+    - Set remote candidates in an idle callback to prevent deadlocks
 
- -- Sjoerd Simons <sjoerd at debian.org>  Wed, 26 Nov 2008 16:38:28 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 26 Nov 2008 17:49:48 +0100
 
 farsight2 (0.0.4-1) experimental; urgency=low
 

=== added file 'patches/01-set-remote-candidates-in-idle.patch'
--- a/patches/01-set-remote-candidates-in-idle.patch	1970-01-01 00:00:00 +0000
+++ b/patches/01-set-remote-candidates-in-idle.patch	2008-11-26 16:57:20 +0000
@@ -0,0 +1,84 @@
+commit d9a5fc09cfd04ce54ffa5ec7ed89937ddd6682a3
+Author: Olivier Cr?te <olivier.crete at collabora.co.uk>
+Date:   Thu Nov 20 19:00:34 2008 -0500
+
+    Set the remote_candidates from an idler to prevent deadlock
+
+diff --git a/tests/check/transmitter/nice.c b/tests/check/transmitter/nice.c
+index 3931ea6..4b9979d 100644
+--- a/tests/check/transmitter/nice.c
++++ b/tests/check/transmitter/nice.c
+@@ -88,21 +88,14 @@ _new_local_candidate (FsStreamTransmitter *st, FsCandidate *candidate,
+           fs_candidate_copy (candidate)));
+ }
+ 
+-static void
+-_local_candidates_prepared (FsStreamTransmitter *st, gpointer user_data)
++static gboolean
++set_the_candidates (gpointer user_data)
+ {
+-  FsStreamTransmitter *st2 = FS_STREAM_TRANSMITTER (user_data);
+-  GList *candidates = g_object_get_data (G_OBJECT (st), "candidates");
++  FsStreamTransmitter *st = FS_STREAM_TRANSMITTER (user_data);
++  GList *candidates = g_object_get_data (G_OBJECT (st), "candidates-set");
+   gboolean ret;
+   GError *error = NULL;
+ 
+-  g_object_set_data (G_OBJECT (st), "candidates", NULL);
+-
+-  ts_fail_if (g_list_length (candidates) < 2,
+-      "We don't have at least 2 candidates");
+-
+-  g_debug ("Local Candidates Prepared");
+-
+   if (force_candidates)
+   {
+     GList *item = NULL;
+@@ -127,13 +120,13 @@ _local_candidates_prepared (FsStreamTransmitter *st, gpointer user_data)
+       }
+     }
+ 
+-    ret = fs_stream_transmitter_force_remote_candidates (st2, new_list, &error);
++    ret = fs_stream_transmitter_force_remote_candidates (st, new_list, &error);
+ 
+     fs_candidate_list_destroy (new_list);
+   }
+   else
+   {
+-    ret = fs_stream_transmitter_set_remote_candidates (st2, candidates, &error);
++    ret = fs_stream_transmitter_set_remote_candidates (st, candidates, &error);
+   }
+ 
+   if (error)
+@@ -143,10 +136,31 @@ _local_candidates_prepared (FsStreamTransmitter *st, gpointer user_data)
+   ts_fail_unless (ret == TRUE, "No detailed error setting remote_candidate");
+ 
+   fs_candidate_list_destroy (candidates);
++
++  return FALSE;
+ }
+ 
+ 
+ static void
++_local_candidates_prepared (FsStreamTransmitter *st, gpointer user_data)
++{
++  FsStreamTransmitter *st2 = FS_STREAM_TRANSMITTER (user_data);
++  GList *candidates = g_object_get_data (G_OBJECT (st), "candidates");
++
++  g_object_set_data (G_OBJECT (st), "candidates", NULL);
++
++  ts_fail_if (g_list_length (candidates) < 2,
++      "We don't have at least 2 candidates");
++
++  g_debug ("Local Candidates Prepared");
++
++  g_object_set_data (G_OBJECT (st2), "candidates-set", candidates);
++
++  g_idle_add (set_the_candidates, st2);
++
++}
++
++static void
+ _new_active_candidate_pair (FsStreamTransmitter *st, FsCandidate *local,
+   FsCandidate *remote, gpointer user_data)
+ {