From: Ed Page <eopage@byu.net>
Date: Thu, 4 Mar 2010 03:16:45 +0000 (-0600)
Subject: Reducing the timeout for closing the channel and cleaning up some code
X-Git-Url: http://git.maemo.org/git/?p=theonering;a=commitdiff_plain;h=65723b7df8bf00f5274202e0f9673ab4b72e3924

Reducing the timeout for closing the channel and cleaning up some code
---

diff --git a/src/channel/call.py b/src/channel/call.py
index fefece3..37cf0a4 100644
--- a/src/channel/call.py
+++ b/src/channel/call.py
@@ -79,8 +79,10 @@ class CallChannel(
 		})
 
 		self.GroupFlagsChanged(0, 0)
+		added, removed = [self._conn.GetSelfHandle()], []
+		localPending, remotePending = [], [contactHandle]
 		self.MembersChanged(
-			'', [self._conn.GetSelfHandle()], [], [], [contactHandle],
+			'', added, removed, localPending, remotePending,
 			0, telepathy.CHANNEL_GROUP_CHANGE_REASON_NONE
 		)
 
@@ -162,7 +164,7 @@ class CallChannel(
 		self.__calledNumer = contactNumber
 		self.CallStateChanged(self.__contactHandle, telepathy.constants.CHANNEL_CALL_STATE_RINGING)
 		self._conn.session.backend.call(contactNumber)
-		self._delayedClose.start(seconds=2)
+		self._delayedClose.start(seconds=0)
 		self.CallStateChanged(self.__contactHandle, telepathy.constants.CHANNEL_CALL_STATE_FORWARDED)
 
 		streamId = 0