[telepathy-butterfly/master] Fix GetSelfHandle in text channel, add own handle to members

Olivier Le Thanh Duong olivier at lethanh.be
Thu Jun 11 08:06:37 PDT 2009


Redefine GetSelfHandle since we use our own handle as Butterfly doesn't have channel specific handles.
Add our own handle to the members of the channel.
---
 NEWS                      |    1 +
 butterfly/channel/text.py |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index caf0007..dabef8f 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Fixes:
  * Fixed AttributeError in on_contact_memberships_changed (fd.o #19919)
  * Actually emit the SimplePresence.PresencesChanged signal
  * Fix RequestHandles for contact and DnD in empathy (fd.o #22224)
+ * Fix GetSelfHandle in text channel, add handle in members
 
 telepathy-butterfly-0.3.3 (06-01-2009)
 ======================================
diff --git a/butterfly/channel/text.py b/butterfly/channel/text.py
index acac7a3..fe93b4b 100644
--- a/butterfly/channel/text.py
+++ b/butterfly/channel/text.py
@@ -73,6 +73,11 @@ class ButterflyTextChannel(
         telepathy.server.ChannelTypeText.Close(self)
         self.remove_from_connection()
 
+    # Redefine GetSelfHandle since we use our own handle
+    #  as Butterfly doesn't have channel specific handles
+    def GetSelfHandle(self):
+        return self._conn.GetSelfHandle()
+
     # pymsn.event.ConversationEventInterface
     def on_conversation_user_joined(self, contact):
         handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
@@ -126,6 +131,7 @@ class ButterflyTextChannel(
     @async
     def __add_initial_participants(self):
         handles = []
+        handles.append(self._conn.GetSelfHandle())
         for participant in self._conversation.participants:
             handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
                     participant.account, participant.network_id)
-- 
1.5.6.5



More information about the telepathy-commits mailing list