[telepathy-butterfly/master] Adjust to papyon "API" changes

[Louis-Francis Ratté-Boulianne]

---
 butterfly/connection.py            |    5 +++--
 butterfly/media/session_handler.py |    2 +-
 butterfly/media/stream_handler.py  |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/butterfly/connection.py b/butterfly/connection.py
index f80034d..ced5f26 100644
--- a/butterfly/connection.py
+++ b/butterfly/connection.py
@@ -243,6 +243,7 @@ class ButterflyConnection(telepathy.server.Connection,
                 self._client.profile.presence = presence
             if message is not None:
                 self._client.profile.personal_message = message
+            self._client.profile.end_point_name = "PAPYON"
 
             if (presence is not None) or (message is not None):
                 self._presence_changed(ButterflyHandleFactory(self, 'self'),
@@ -286,8 +287,8 @@ class ButterflyConnection(telepathy.server.Connection,
     # papyon.event.InviteEventInterface
     def on_invite_conference(self, call):
         logger.debug("Call invite")
-        handle = ButterflyHandleFactory(self, 'contact', call.contact.account,
-                call.contact.network_id)
+        handle = ButterflyHandleFactory(self, 'contact', call.peer.account,
+                call.peer.network_id)
 
         props = self._generate_props(telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
                 handle, False)
diff --git a/butterfly/media/session_handler.py b/butterfly/media/session_handler.py
index 6137995..009ec13 100644
--- a/butterfly/media/session_handler.py
+++ b/butterfly/media/session_handler.py
@@ -27,7 +27,7 @@ import papyon.event
 from butterfly.util.decorator import async
 from butterfly.handle import ButterflyHandleFactory
 from butterfly.media import ButterflyStreamHandler
-from papyon.sip.media import MediaSessionType
+from papyon.media.constants import *
 
 __all__ = ['ButterflySessionHandler']
 
diff --git a/butterfly/media/stream_handler.py b/butterfly/media/stream_handler.py
index 7937b40..dfd0329 100644
--- a/butterfly/media/stream_handler.py
+++ b/butterfly/media/stream_handler.py
@@ -24,7 +24,7 @@ import telepathy
 import papyon
 import papyon.event
 
-from papyon.sip.constants import *
+from papyon.media.constants import *
 
 __all__ = ['ButterflyStreamHandler']
 
-- 
1.5.6.5