Starting to add access to the debug log

[theonering] / src / channel / call.py

diff --git a/src/channel/call.py b/src/channel/call.py
index 6bc9f9a..5808d4e 100644 (file)
--- a/src/channel/call.py
+++ b/src/channel/call.py
@@ -1,5 +1,6 @@
 import logging
 
+import dbus
 import gobject
 import telepathy
 
@@ -15,13 +16,31 @@ class CallChannel(
                tp.ChannelInterfaceCallState,
                tp.ChannelInterfaceGroup,
        ):
-       # @bug On Maemo 5 this is having some kind of "General" error, possibly due to an issue with "GetAll" DBusProperties stuff
 
        def __init__(self, connection, manager, props, contactHandle):
                self.__manager = manager
                self.__props = props
                self.__cancelId = None
 
+               if telepathy.interfaces.CHANNEL_INTERFACE + '.InitiatorHandle' in props:
+                       self._initiator = connection.get_handle_by_id(
+                               telepathy.HANDLE_TYPE_CONTACT,
+                               props[telepathy.interfaces.CHANNEL_INTERFACE + '.InitiatorHandle'],
+                       )
+               elif telepathy.interfaces.CHANNEL_INTERFACE + '.InitiatorID' in props:
+                       self._initiator = connection.get_handle_by_name(
+                               telepathy.HANDLE_TYPE_CONTACT,
+                               props[telepathy.interfaces.CHANNEL_INTERFACE + '.InitiatorHandle'],
+                       )
+               else:
+                       # Maemo 5 seems to require InitiatorHandle/InitiatorID to be set
+                       # even though I can't find them in the dbus spec.  I think its
+                       # generally safe to assume that its locally initiated if not
+                       # specified.  Specially for The One Ring, its always locally
+                       # initiated
+                       _moduleLogger.warning('InitiatorID or InitiatorHandle not set on new channel, assuming locally initiated')
+                       self._initiator = connection.GetSelfHandle()
+
                tp.ChannelTypeStreamedMedia.__init__(self, connection, manager, props)
                tp.ChannelInterfaceCallState.__init__(self)
                tp.ChannelInterfaceGroup.__init__(self)
@@ -33,6 +52,21 @@ class CallChannel(
                                "InitialVideo": self.initial_video,
                        },
                )
+               self._add_immutables({
+                       'InitialAudio': telepathy.interfaces.CHANNEL_TYPE_STREAMED_MEDIA,
+                       'InitialVideo': telepathy.interfaces.CHANNEL_TYPE_STREAMED_MEDIA,
+               })
+               self._implement_property_get(
+                       telepathy.interfaces.CHANNEL_INTERFACE,
+                       {
+                               'InitiatorHandle': lambda: dbus.UInt32(self._initiator.id),
+                               'InitiatorID': lambda: self._initiator.name,
+                       },
+               )
+               self._add_immutables({
+                       'InitiatorHandle': telepathy.interfaces.CHANNEL_INTERFACE,
+                       'InitiatorID': telepathy.interfaces.CHANNEL_INTERFACE,
+               })
 
                self.GroupFlagsChanged(0, 0)
                self.MembersChanged(
@@ -51,6 +85,7 @@ class CallChannel(
                self.close()
 
        def close(self):
+               _moduleLogger.debug("Closing call")
                tp.ChannelTypeStreamedMedia.Close(self)
                self.remove_from_connection()
                if self.__cancelId is not None:
@@ -58,6 +93,10 @@ class CallChannel(
                        self.__cancelId = None
 
        @gtk_toolbox.log_exception(_moduleLogger)
+       def GetLocalPendingMembersWithInfo(self):
+               return []
+
+       @gtk_toolbox.log_exception(_moduleLogger)
        def ListStreams(self):
                """
                For org.freedesktop.Telepathy.Channel.Type.StreamedMedia
@@ -97,7 +136,7 @@ class CallChannel(
                self._conn.session.backend.call(contactNumber)
 
                streamId = 0
-               streamState = telepathy.constants.MEDIA_STREAM_STATE_DISCONNECTED
+               streamState = telepathy.constants.MEDIA_STREAM_STATE_CONNECTED
                streamDirection = telepathy.constants.MEDIA_STREAM_DIRECTION_BIDIRECTIONAL
                pendingSendFlags = telepathy.constants.MEDIA_STREAM_PENDING_REMOTE_SEND
                return [(streamId, contact, streamTypes[0], streamState, streamDirection, pendingSendFlags)]