Author: bct Date: 2008-07-04 01:19:44 +0200 (Fri, 04 Jul 2008) New Revision: 9880

Modified: trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/session.py Log: sesison-related TB fixes

Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-03 21:43:28 UTC (rev 9879) +++ trunk/src/gajim.py 2008-07-03 23:19:44 UTC (rev 9880) @@ -2134,12 +2134,8 @@ if not contact: contact = highest_contact

- if not session: - session = gajim.connections[account].get_or_create_session(fjid, None) + ctrl = self.new_chat(contact, account, resource = resource, session = session)

- self.new_chat(contact, account, resource = resource, session = session) - ctrl = session.control - gajim.last_message_time[account][jid] = 0 # long time ago

w = ctrl.parent_win

Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-07-03 21:43:28 UTC (rev 9879) +++ trunk/src/groupchat_control.py 2008-07-03 23:19:44 UTC (rev 9880) @@ -43,7 +43,6 @@

from common import gajim from common import helpers -from common.stanza_session import StanzaSession

from chat_control import ChatControl from chat_control import ChatControlBase @@ -223,9 +222,6 @@ self.new_nick = '' self.name = self.room_jid.split('@')[0]

- self.session = StanzaSession(gajim.connections[self.account], - self.room_jid, 'gc', 'gc') - compact_view = gajim.config.get('compact_view') self.chat_buttons_set_visible(compact_view) self.widget_set_visible(self.xml.get_widget('banner_eventbox'),

Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-07-03 21:43:28 UTC (rev 9879) +++ trunk/src/session.py 2008-07-03 23:19:44 UTC (rev 9880) @@ -96,7 +96,7 @@ msg_id = gajim.logger.write(log_type, full_jid_with_resource, msgtxt, tim=tim, subject=subject) except exceptions.PysqliteOperationalError, e: - gajim.dispatch('ERROR', (_('Disk WriteError'), str(e))) + self.conn.dispatch('ERROR', (_('Disk WriteError'), str(e)))

treat_as = gajim.config.get('treat_incoming_messages') if treat_as: @@ -341,10 +341,7 @@ try: # bob responds if form.getType() == 'form' and 'security' in form.asDict(): - def continue_with_negotiation(*args): - if len(args): - self.dialog.destroy() - + def continue_with_negotiation(): # we don't support 3-message negotiation as the responder if 'dhkeys' in form.asDict(): self.fail_bad_negotiation('3 message negotiation not supported when responding', ('dhkeys',))