[telepathy-butterfly/master] Set the subtype of the webcam media session according to the direction

[Louis-Francis Ratté-Boulianne]

---
 butterfly/media/session_handler.py |    7 ++++++-
 butterfly/media/stream_handler.py  |    3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/butterfly/media/session_handler.py b/butterfly/media/session_handler.py
index 009ec13..7d5f888 100644
--- a/butterfly/media/session_handler.py
+++ b/butterfly/media/session_handler.py
@@ -38,7 +38,12 @@ class ButterflySessionHandler (telepathy.server.MediaSessionHandler):
         self._stream_handlers = {}
         self._next_stream_id = 0
         self._type = session.type
-        self._subtype = self._type is MediaSessionType.WEBCAM and "msn" or "rtp"
+        if self._type == MediaSessionType.WEBCAM_SEND:
+            self._subtype = "msncamsend"
+        elif self._type == MediaSessionType.WEBCAM_RECV:
+            self._subtype = "msncamrecv"
+        else:
+            self._subtype = "rtp"
         self._ready = False
         self._pending_handlers = []
 
diff --git a/butterfly/media/stream_handler.py b/butterfly/media/stream_handler.py
index 2fc3e18..d3e08bf 100644
--- a/butterfly/media/stream_handler.py
+++ b/butterfly/media/stream_handler.py
@@ -137,7 +137,8 @@ class ButterflyStreamHandler (
 
     def Ready(self, codecs):
         print "Stream %i is ready" % self._id
-        webcam = (self._session.type is MediaSessionType.WEBCAM)
+        webcam = (self._session.type is MediaSessionType.WEBCAM_SEND or
+                  self._session.type is MediaSessionType.WEBCAM_RECV)
 
         if self._remote_candidates:
             self.SetRemoteCandidateList(self._remote_candidates)
-- 
1.5.6.5