Changeset 9880

Timestamp:

07/04/08 01:19:44 (3 months ago)

Author:

bct

Message:

sesison-related TB fixes

Location:

trunk/src

Files:

• gajim.py (modified) (1 diff)
• groupchat_control.py (modified) (2 diffs)
• session.py (modified) (2 diffs)

trunk/src/gajim.py

@@ -2135 +2135 @@
                                         contact = highest_contact
 
-                                if not session:
-                                        session = gajim.connections[account].get_or_create_session(fjid, None)
-
-                                self.new_chat(contact, account, resource = resource, session = session)
-                                ctrl = session.control
+                                ctrl = self.new_chat(contact, account, resource = resource, session = session)
 
                                 gajim.last_message_time[account][jid] = 0 # long time ago

trunk/src/groupchat_control.py

@@ -44 +44 @@
 from common import gajim
 from common import helpers
-from common.stanza_session import StanzaSession
 
 from chat_control import ChatControl
@@ -223 +222 @@
                 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')

trunk/src/session.py

@@ -97 +97 @@
                                                 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')
@@ -342 +342 @@
                         # 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():