[Pkg-telepathy-commits] ./packages/unstable/telepathy-stream-engine r42: Add patch to throw errors if no codecs are available

[Sjoerd Simons]

------------------------------------------------------------
revno: 42
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-stream-engine
timestamp: Sat 2008-04-12 18:25:14 +0200
message:
  Add patch to throw errors if no codecs are available
added:
  patches/00_throw_error_when_no_codecs_are_available.patch
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-04-12 08:04:24 +0000
+++ b/changelog	2008-04-12 16:25:14 +0000
@@ -1,8 +1,11 @@
 telepathy-stream-engine (0.5.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/00_throw_error_when_no_codecs_are_available.patch:
+    - Added. Let a stream thrown an error if no codecs are available (From
+    upstream darcs).
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 12 Apr 2008 10:04:11 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 12 Apr 2008 18:24:11 +0200
 
 telepathy-stream-engine (0.5.0-1) unstable; urgency=low
 

=== added file 'patches/00_throw_error_when_no_codecs_are_available.patch'
--- a/patches/00_throw_error_when_no_codecs_are_available.patch	1970-01-01 00:00:00 +0000
+++ b/patches/00_throw_error_when_no_codecs_are_available.patch	2008-04-12 16:25:14 +0000
@@ -0,0 +1,42 @@
+Sat Apr 12 17:33:19 CEST 2008  Sjoerd Simons <sjoerd at luon.net>
+  * Throw an error if a stream has no available codecs
+diff -rN -u old-stream-engine/src/stream.c new-stream-engine/src/stream.c
+--- old-stream-engine/src/stream.c	2008-04-12 18:23:55.000000000 +0200
++++ new-stream-engine/src/stream.c	2008-04-12 18:23:55.000000000 +0200
+@@ -1340,18 +1340,28 @@
+ static void
+ prepare_transports (TpStreamEngineStream *self)
+ {
+-  GPtrArray *codecs;
++  const GList *fscodecs;
+ 
+   farsight_stream_prepare_transports (self->fs_stream);
+ 
+-  codecs = fs_codecs_to_tp (self,
+-      farsight_stream_get_local_codecs (self->fs_stream));
++  fscodecs = farsight_stream_get_local_codecs (self->fs_stream);
+ 
+-  DEBUG (self, "calling MediaStreamHandler::Ready");
++  if (fscodecs == NULL)
++    {
++      tp_stream_engine_stream_error (self, 0, "No codecs available");
++    }
++  else
++    {
++      GPtrArray *codecs;
+ 
+-  tp_cli_media_stream_handler_call_ready (self->priv->stream_handler_proxy,
+-      -1, codecs, async_method_callback, "Media.StreamHandler::Ready",
+-      NULL, (GObject *) self);
++      codecs = fs_codecs_to_tp (self, fscodecs);
++
++      DEBUG (self, "calling MediaStreamHandler::Ready");
++
++      tp_cli_media_stream_handler_call_ready (self->priv->stream_handler_proxy,
++          -1, codecs, async_method_callback, "Media.StreamHandler::Ready",
++          NULL, (GObject *) self);
++    }
+ }
+ 
+ static void
+