Changeset 9113 for trunk/src/message_control.py

Timestamp:

12/08/07 06:49:38 (12 months ago)

Author:

bct

Message:

realtime notification of esession begin/end

Files:

• trunk/src/message_control.py (modified) (2 diffs)

trunk/src/message_control.py

@@ -118 +118 @@
 
         def set_session(self, session):
-                if session == self.session:
+                if hasattr(self, 'session') and session == self.session:
                         return
 
-                if self.session:
+                was_encrypted = False
+
+                if hasattr(self, 'session') and self.session:
+                        if self.session.enable_encryption:
+                                was_encrypted = True
+
                         print "starting a new session, dropping the old one!"
                         gajim.connections[self.account].delete_session(self.session.jid, self.session.thread_id)
 
                 self.session = session
+
+                if session:
+                        session.control = self
+
+                        if was_encrypted:
+                                self.print_esession_details()
 
         def send_message(self, message, keyID = '', type = 'chat',
@@ -135 +146 @@
 
                 if not self.session:
-                        self.session = gajim.connections[self.account].make_new_session(self.contact.get_full_jid())
+                        fjid = self.contact.get_full_jid()
+                        new_session = gajim.connections[self.account].make_new_session(fjid)
+
+                        self.set_session(new_session)
 
                 # Send and update history