[Pkg-telepathy-commits] ./packages/unstable/telepathy-gabble r75: Add 00_retry_media_session_initiation_on_stream_removal.patch to retry streaming session initiation when a stream is removed

[Sjoerd Simons]

------------------------------------------------------------
revno: 75
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-gabble
timestamp: Sat 2008-04-12 17:54:17 +0200
message:
  Add 00_retry_media_session_initiation_on_stream_removal.patch to retry streaming session initiation when a stream is removed
added:
  patches/00_retry_media_session_initiation_on_stream_removal.patch
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-04-11 17:01:26 +0000
+++ b/changelog	2008-04-12 15:54:17 +0000
@@ -1,12 +1,18 @@
 telepathy-gabble (0.7.3-2) UNRELEASED; urgency=low
 
+  [ Simon McVittie ]
   * Instead of shipping documentation in the -dbg package, ship a symlink
     to the main package's documentation
   * Update Build-Depends for the 0.7.3 version, which needs
     telepathy-glib (>= 0.7.0) (in practice, this is easily satisfied by the
     versions in both lenny and sid, so shouldn't be a problem)
 
- -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk>  Fri, 11 Apr 2008 17:57:15 +0100
+  [ Sjoerd Simons ]
+  * debian/patches/00_retry_media_session_initiation_on_stream_removal.patch
+    - Added. When a media stream is removed before a session initiation is
+    send recheck if an initiation should be send (from upstream darcs)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 12 Apr 2008 17:45:51 +0200
 
 telepathy-gabble (0.7.3-1) unstable; urgency=low
 

=== added file 'patches/00_retry_media_session_initiation_on_stream_removal.patch'
--- a/patches/00_retry_media_session_initiation_on_stream_removal.patch	1970-01-01 00:00:00 +0000
+++ b/patches/00_retry_media_session_initiation_on_stream_removal.patch	2008-04-12 15:54:17 +0000
@@ -0,0 +1,17 @@
+Sat Apr 12 11:30:59 CEST 2008  Sjoerd Simons <sjoerd at luon.net>
+  * When removing a media stream before the initiate is sent, send it if possible
+diff -rN -u old-telepathy-gabble/src/gabble-media-session.c new-telepathy-gabble/src/gabble-media-session.c
+--- old-telepathy-gabble/src/gabble-media-session.c	2008-04-12 17:45:38.000000000 +0200
++++ new-telepathy-gabble/src/gabble-media-session.c	2008-04-12 17:45:38.000000000 +0200
+@@ -2320,6 +2320,10 @@
+       GMS_DEBUG_INFO (session, "not sending jingle session action "
+           "\"content-remove\" to peer, no initiates or adds sent for "
+           "these streams");
++      if (priv->state < JS_STATE_PENDING_INITIATE_SENT)
++        {
++           try_session_initiate (session);
++        }
+     }
+ }
+ 
+