[telepathy-butterfly/master] Moved created_locally check at right place
Louis-Francis Ratté-Boulianne
louis-francis.ratte-boulianne at collabora.co.uk
Thu Sep 10 06:48:17 PDT 2009
---
butterfly/channel/media.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/butterfly/channel/media.py b/butterfly/channel/media.py
index 4441d68..713029a 100644
--- a/butterfly/channel/media.py
+++ b/butterfly/channel/media.py
@@ -149,6 +149,9 @@ class ButterflyMediaChannel(
#papyon.event.media.MediaSessionEventInterface
def on_stream_created(self, stream):
+ if stream.created_locally:
+ return # Stream handler is already existing
+
logger.info("Media Stream created upon peer request")
handler = self._session_handler.HandleStream(stream)
handler.connect("state-changed", self.on_stream_state_changed)
@@ -156,9 +159,6 @@ class ButterflyMediaChannel(
#papyon.event.media.MediaSessionEventInterface
def on_stream_added(self, stream):
- if stream.created_locally:
- return # Stream handler is already existing
-
handler = self._session_handler.NewStream(stream)
logger.info("Media Stream %i added" % handler.id)
self.StreamAdded(handler.id, self._handle, handler.type)
--
1.5.6.5
More information about the telepathy-commits
mailing list