Author: bct Date: 2008-10-25 21:48:01 +0200 (Sat, 25 Oct 2008) New Revision: 10578
Modified: trunk/src/chat_control.py trunk/src/common/connection_handlers.py Log: partial fix for renegotiating pm e2e sessions after one party disconnects
Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-10-25 18:43:45 UTC (rev 10577) +++ trunk/src/chat_control.py 2008-10-25 19:48:01 UTC (rev 10578) @@ -2583,7 +2583,7 @@
if not self.session: fjid = self.contact.get_full_jid() - new_sess = gajim.connections[self.account].make_new_session(fjid) + new_sess = gajim.connections[self.account].make_new_session(fjid, type_=self.type_id) self.set_session(new_sess)
self.session.negotiate_e2e(False)
Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-10-25 18:43:45 UTC (rev 10577) +++ trunk/src/common/connection_handlers.py 2008-10-25 19:48:01 UTC (rev 10578) @@ -1350,6 +1350,8 @@ return None
def make_new_session(self, jid, thread_id=None, type_='chat', cls=None): + '''create and register a new session. thread_id=None to generate one. + type_ should be 'chat' or 'pm'.''' if not cls: cls = gajim.default_session_type