[Telepathy-commits] [telepathy-gabble/master] media-stream.c: remove dead code dealing with remote pending send

Senko Rasic senko.rasic at collabora.co.uk
Tue Dec 2 04:34:10 PST 2008


---
 src/media-stream.c |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/src/media-stream.c b/src/media-stream.c
index bb84ec6..48a5496 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -1381,15 +1381,6 @@ update_direction (GabbleMediaStream *stream, GabbleJingleContent *c)
       pending_send |= TP_MEDIA_STREAM_PENDING_LOCAL_SEND;
     }
 
-#if 0
-  /* clear any pending remote send */
-  if ((pending_send & TP_MEDIA_STREAM_PENDING_REMOTE_SEND) != 0)
-    {
-      GMS_DEBUG_INFO (session, "setting pending local send flag");
-      pending_send &= ~TP_MEDIA_STREAM_PENDING_REMOTE_SEND;
-    }
-#endif
-
   /* make any necessary changes */
   new_combined_dir = MAKE_COMBINED_DIRECTION (requested_dir, pending_send);
   if (new_combined_dir != stream->combined_direction)
@@ -1441,18 +1432,6 @@ gabble_media_stream_change_direction (GabbleMediaStream *stream,
       current_dir ^= TP_MEDIA_STREAM_DIRECTION_SEND;
     }
 
-#if 0
-  /* if we're asking the remote end to start sending, set the pending flag and
-   * don't change our directionality just yet */
-  new_dir = requested_dir;
-  if (((current_dir & TP_MEDIA_STREAM_DIRECTION_RECEIVE) == 0) &&
-      ((new_dir & TP_MEDIA_STREAM_DIRECTION_RECEIVE) != 0))
-    {
-      pending_send ^= TP_MEDIA_STREAM_PENDING_REMOTE_SEND;
-      new_dir &= ~TP_MEDIA_STREAM_DIRECTION_RECEIVE;
-    }
-#endif
-
   /* make any necessary changes */
   new_combined_dir = MAKE_COMBINED_DIRECTION (requested_dir, pending_send);
   if (new_combined_dir != stream->combined_direction)
-- 
1.5.6.5




More information about the Telepathy-commits mailing list