[Pkg-telepathy-commits] ./packages/unstable/telepathy-sofiasip r46: Prepare new upstream release and add patch to correctly handle media stream errors

[Sjoerd Simons]

------------------------------------------------------------
revno: 46
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-sofiasip
timestamp: Sat 2008-04-26 11:04:42 +0200
message:
  Prepare new upstream release and add patch to correctly handle media stream errors
added:
  patches/00_media_stream_error.patch
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-03-08 17:03:21 +0000
+++ b/changelog	2008-04-26 09:04:42 +0000
@@ -1,3 +1,13 @@
+telepathy-sofiasip (0.5.7-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/00_media_stream_error.patch
+    + Added. Only close the media stream on error, not the whole session.
+    Fixes sip calls not working without available video codecs when a video
+    stream was requested (SF #1944820)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Apr 2008 11:03:03 +0200
+
 telepathy-sofiasip (0.5.5-1) unstable; urgency=low
 
   * New upstream release

=== added file 'patches/00_media_stream_error.patch'
--- a/patches/00_media_stream_error.patch	1970-01-01 00:00:00 +0000
+++ b/patches/00_media_stream_error.patch	2008-04-26 09:04:42 +0000
@@ -0,0 +1,75 @@
+Thu Apr 17 17:18:15 CEST 2008  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
+  * TpsipMediaStream: on StreamHandler.Error, close only the stream rather than terminating the session.
+  Fixes sf.net bug #1944820
+Thu Apr 17 13:52:03 CEST 2008  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
+  * TpsipMediaStream: remove redundant type assertions
+diff -rN -u old-telepathy-sofiasip/src/sip-media-stream.c new-telepathy-sofiasip/src/sip-media-stream.c
+--- old-telepathy-sofiasip/src/sip-media-stream.c	2008-04-26 10:56:03.000000000 +0200
++++ new-telepathy-sofiasip/src/sip-media-stream.c	2008-04-26 10:56:03.000000000 +0200
+@@ -513,27 +513,17 @@
+  */
+ static void
+ tpsip_media_stream_error (TpSvcMediaStreamHandler *iface,
+-                        guint errno,
+-                        const gchar *message,
+-                        DBusGMethodInvocation *context)
++                          guint errno,
++                          const gchar *message,
++                          DBusGMethodInvocation *context)
+ {
+-  /* Note: Inform the connection manager that an error occured in this stream. */
+-
+-  TpsipMediaStream *obj = TPSIP_MEDIA_STREAM (iface);
+-  TpsipMediaStreamPrivate *priv;
+-
+-  g_assert (TPSIP_IS_MEDIA_STREAM (obj));
++  DEBUG("StreamHandler.Error called: %u %s", errno, message);
+ 
+-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (obj);
+-
+-  SESSION_DEBUG(priv->session, "Media.StreamHandler::Error called -- terminating session");
+-
+-  tpsip_media_session_terminate (priv->session);
++  tpsip_media_stream_close (TPSIP_MEDIA_STREAM (iface));
+ 
+   tp_svc_media_stream_handler_return_from_error (context);
+ }
+ 
+-
+ /**
+  * tpsip_media_stream_native_candidates_prepared
+  *
+@@ -551,7 +541,6 @@
+   TpsipMediaStream *obj = TPSIP_MEDIA_STREAM (iface);
+   TpsipMediaStreamPrivate *priv;
+ 
+-  g_assert (TPSIP_IS_MEDIA_STREAM (obj));
+   priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (obj);
+ 
+   DEBUG("enter");
+@@ -623,7 +612,6 @@
+   GValue transport = { 0, };
+   gint tr_goodness;
+ 
+-  g_assert (TPSIP_IS_MEDIA_STREAM (obj));
+   priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (obj);
+ 
+   if (priv->stream_sdp != NULL)
+@@ -698,8 +686,6 @@
+ 
+   DEBUG ("enter");
+ 
+-  g_assert (TPSIP_IS_MEDIA_STREAM (obj));
+-
+   priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (obj);
+ 
+   priv->ready_received = TRUE;
+@@ -1504,7 +1490,6 @@
+    * - no IPv6 support (missing from the Farsight API?)
+    */
+ 
+-  g_assert (TPSIP_IS_MEDIA_STREAM (stream));
+   priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+ 
+   candidates = g_value_get_boxed (&priv->native_candidates);
+