Changeset 9625 for trunk/src/common/stanza_session.py

Timestamp:

05/13/08 03:59:10 (6 months ago)

Author:

bct

Message:

merged in session-centric branch, with fixes for OTR compatibility

Files:

• trunk/src/common/stanza_session.py (modified) (8 diffs)

trunk/src/common/stanza_session.py

@@ -33 +33 @@
                                 self.thread_id = self.generate_thread_id()
 
+                self.loggable = True
+
                 self.last_send = 0
                 self.status = None
                 self.negotiated = {}
+
+        def is_loggable(self):
+                account = self.conn.name
+                no_log_for = gajim.config.get_per('accounts', account, 'no_log_for')
+
+                if not no_log_for:
+                        no_log_for = ''
+
+                no_log_for = no_log_for.split()
+
+                return self.loggable and account not in no_log_for and self.jid not in no_log_for
 
         def generate_thread_id(self):
@@ -71 +84 @@
                 '''A negotiation has been cancelled, so reset this session to its default state.'''
 
-                if hasattr(self, 'control'):
+                if self.control:
                         self.control.on_cancel_session_negotiation()
 
@@ -132 +145 @@
         def __init__(self, conn, jid, thread_id, type = 'chat'):
                 StanzaSession.__init__(self, conn, jid, thread_id, type = 'chat')
-
-                self.loggable = True
 
                 self.xes = {}
@@ -768 +779 @@
                 self.enable_encryption = True
 
-                if hasattr(self, 'control'):
+                if self.control:
                         self.control.print_esession_details()
 
@@ -788 +799 @@
                 self.do_retained_secret(k, srs)
 
-                # don't need to calculate ks_s here
-
+                # ks_s doesn't need to be calculated here
                 self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(k)
                 self.kc_o, self.km_o, self.ks_o = self.generate_responder_keys(k)
@@ -796 +806 @@
 
                 self.verify_identity(form, self.d, False, 'b')
-# Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza.
+                # Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza.
 
                 if self.negotiated['logging'] == 'mustnot':
@@ -804 +814 @@
                 self.enable_encryption = True
 
-                if hasattr(self, 'control'):
+                if self.control:
                         self.control.print_esession_details()
 
@@ -892 +902 @@
                 self.km_o = ''
 
-        def is_loggable(self):
-                account = self.conn.name
-                no_log_for = gajim.config.get_per('accounts', account, 'no_log_for')
-
-                if not no_log_for:
-                        no_log_for = ''
-
-                no_log_for = no_log_for.split()
-
-                return self.loggable and account not in no_log_for and self.jid not in no_log_for
-
         def cancelled_negotiation(self):
                 StanzaSession.cancelled_negotiation(self)