diff options
| author | Krzysztof <kkszysiu@gmail.com> | 2011-03-28 22:56:09 +0200 |
|---|---|---|
| committer | Krzysztof <kkszysiu@gmail.com> | 2011-03-28 22:56:09 +0200 |
| commit | f0cba645f6a1f9981b5c9a5909b5cbf1c0117f8a (patch) | |
| tree | 61ae54d91f1cfa9f590b27c0e4dfb81c653a4b5b | |
| parent | 6705bc0c4faf6ab400567b092f23a83f029f6741 (diff) | |
Code cleanup & fixes.
| -rw-r--r-- | sunshine/capabilities.py | 13 | ||||
| -rw-r--r-- | sunshine/channel/text.py | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sunshine/capabilities.py b/sunshine/capabilities.py index 3d06b5f..6fc0f82 100644 --- a/sunshine/capabilities.py +++ b/sunshine/capabilities.py @@ -22,8 +22,8 @@ import dbus import telepathy -from telepathy._generated.Connection_Interface_Contact_Capabilities \ - import ConnectionInterfaceContactCapabilities +#from telepathy._generated.Connection_Interface_Contact_Capabilities \ +# import ConnectionInterfaceContactCapabilities from sunshine.util.decorator import async from sunshine.handle import SunshineHandleFactory @@ -33,7 +33,7 @@ __all__ = ['SunshineCapabilities'] logger = logging.getLogger('Sunshine.Capabilities') class SunshineCapabilities(telepathy.server.ConnectionInterfaceCapabilities, - ConnectionInterfaceContactCapabilities): + telepathy.server.ConnectionInterfaceContactCapabilities): text_chat_class = \ ({telepathy.CHANNEL_INTERFACE + '.ChannelType': @@ -64,10 +64,10 @@ class SunshineCapabilities(telepathy.server.ConnectionInterfaceCapabilities, def __init__(self): telepathy.server.ConnectionInterfaceCapabilities.__init__(self) - ConnectionInterfaceContactCapabilities.__init__(self) + telepathy.server.ConnectionInterfaceContactCapabilities.__init__(self) # handle -> list(RCC) - self._contact_caps = {} + #self._contact_caps = {} self._video_clients = [] self._update_capabilities_calls = [] @@ -84,7 +84,7 @@ class SunshineCapabilities(telepathy.server.ConnectionInterfaceCapabilities, return telepathy.server.ConnectionInterfaceCapabilities.\ AdvertiseCapabilities(self, add, remove) - + """ def GetContactCapabilities(self, handles): if 0 in handles: raise telepathy.InvalidHandle('Contact handle list contains zero') @@ -101,6 +101,7 @@ class SunshineCapabilities(telepathy.server.ConnectionInterfaceCapabilities, ret[handle] = dbus.Array([], signature='(a{sv}as)') return ret + """ def UpdateCapabilities(self, caps): if self._status != telepathy.CONNECTION_STATUS_CONNECTED: diff --git a/sunshine/channel/text.py b/sunshine/channel/text.py index 02f7f29..8d1ad3f 100644 --- a/sunshine/channel/text.py +++ b/sunshine/channel/text.py @@ -82,7 +82,7 @@ class SunshineTextChannel(SunshineChannel, def Close(self): telepathy.server.ChannelTypeText.Close(self) - self.remove_from_connection() + #self.remove_from_connection() # Redefine GetSelfHandle since we use our own handle # as Butterfly doesn't have channel specific handles @@ -187,7 +187,7 @@ class SunshineRoomTextChannel(telepathy.server.ChannelTypeText, telepathy.server def Close(self): telepathy.server.ChannelTypeText.Close(self) - self.remove_from_connection() + #self.remove_from_connection() def GetSelfHandle(self): return self._conn.GetSelfHandle() |