From: Ed Page <eopage@byu.net>
Date: Sat, 29 May 2010 00:54:08 +0000 (-0500)
Subject: Upating telepathy python to a7418e92965713edae61d9e762b8c895a68a7251
X-Git-Url: http://git.maemo.org/git/?p=theonering;a=commitdiff_plain;h=b14494d3d36e55d4a6c2cbd2e467e1686cbb8f7e;hp=498fd1daeb6186e07778917c834e55cc49dba427

Upating telepathy python to a7418e92965713edae61d9e762b8c895a68a7251
---

diff --git a/src/tp/channel.py b/src/tp/channel.py
index 530966e..e53134a 100644
--- a/src/tp/channel.py
+++ b/src/tp/channel.py
@@ -294,7 +294,10 @@ class ChannelTypeText(Channel, _ChannelTypeTextIface):
 
     @dbus.service.signal(CHANNEL_TYPE_TEXT, signature='uuuuus')
     def Received(self, id, timestamp, sender, type, flags, text):
-        self._pending_messages[id] = (timestamp, sender, type, flags, text)
+        if id in self._pending_messages:
+            raise ValueError("You can't receive the same message twice.")
+        else:
+            self._pending_messages[id] = (timestamp, sender, type, flags, text)
 
 
 from telepathy._generated.Channel_Interface_Chat_State \
diff --git a/src/tp/conn.py b/src/tp/conn.py
index 02305c4..256a574 100644
--- a/src/tp/conn.py
+++ b/src/tp/conn.py
@@ -91,8 +91,11 @@ class Connection(_Connection, DBusProperties):
         self._interfaces = set()
 
         DBusProperties.__init__(self)
-        self._implement_property_get(CONN_INTERFACE,
-                {'SelfHandle': lambda: dbus.UInt32(self.GetSelfHandle())})
+        self._implement_property_get(CONN_INTERFACE, {
+                'SelfHandle': lambda: dbus.UInt32(self.GetSelfHandle()),
+                'Interfaces': lambda: dbus.Array(self.GetInterfaces(), signature='s'),
+                'Status': lambda: dbus.UInt32(self.GetStatus())
+                 })
 
         self._proto = proto