Bumping to 0.8.7
authorEd Page <eopage@byu.net>
Sat, 13 Mar 2010 19:52:05 +0000 (13:52 -0600)
committerEd Page <eopage@byu.net>
Sat, 13 Mar 2010 19:52:05 +0000 (13:52 -0600)
src/channel/call.py
src/constants.py
support/builddeb.py
www/telepathy-theonering.deb

index 37cf0a4..a2f2ef3 100644 (file)
@@ -47,7 +47,7 @@ class CallChannel(
                tp.ChannelInterfaceCallState.__init__(self)
                tp.ChannelInterfaceHold.__init__(self)
                self.__contactHandle = contactHandle
-               self.__calledNumer = None
+               self.__calledNumber = None
 
                self._implement_property_get(
                        telepathy.interfaces.CHANNEL_INTERFACE,
@@ -98,11 +98,14 @@ class CallChannel(
 
        def close(self):
                _moduleLogger.debug("Closing call")
+               self._delayedClose.cancel()
+
                tp.ChannelTypeStreamedMedia.Close(self)
                self.remove_from_connection()
-               if self.__calledNumer is not None:
-                       self._conn.session.backend.cancel(self.__calledNumer)
-               self._delayedClose.cancel()
+
+               if self.__calledNumber is not None:
+                       _moduleLogger.debug("Cancelling call")
+                       self._conn.session.backend.cancel(self.__calledNumber)
 
        @misc_utils.log_exception(_moduleLogger)
        def GetLocalPendingMembersWithInfo(self):
@@ -161,7 +164,7 @@ class CallChannel(
                assert self.__contactHandle == contact, "%r != %r" % (self.__contactHandle, contact)
                contactNumber = contact.phoneNumber
 
-               self.__calledNumer = contactNumber
+               self.__calledNumber = contactNumber
                self.CallStateChanged(self.__contactHandle, telepathy.constants.CHANNEL_CALL_STATE_RINGING)
                self._conn.session.backend.call(contactNumber)
                self._delayedClose.start(seconds=0)
@@ -204,11 +207,11 @@ class CallChannel(
                if not Hold:
                        return
                _moduleLogger.debug("Closing without cancel to get out of users way")
-               self.__calledNumer = None
+               self.__calledNumber = None
                self.close()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_close_requested(self, *args):
                _moduleLogger.debug("Cancel now disallowed")
-               self.__calledNumer = None
+               self.__calledNumber = None
                self.close()
index bec35b3..dc9e309 100644 (file)
@@ -2,7 +2,7 @@ import os
 
 __pretty_app_name__ = "Telepathy-TheOneRing"
 __app_name__ = "telepathy-theonering"
-__version__ = "0.8.6"
+__version__ = "0.8.7"
 __build__ = 0
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".telepathy-theonering")
index df82466..5a85bfd 100755 (executable)
@@ -34,6 +34,9 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
+0.8.7
+* Adding some logging to help track down some issues
+
 0.8.6
 * Switched to a 10 second timeout without connections before closing TOR
 * Reduced the numbr of conversations cached
index c04cf98..8f5dbad 100644 (file)
Binary files a/www/telepathy-theonering.deb and b/www/telepathy-theonering.deb differ