Changeset 9116

Timestamp:

12/08/07 10:09:06 (12 months ago)

Author:

bct

Message:

merged realtime cancellation patch

Location:

branches/session_centric/src

Files:

• chat_control.py (modified) (3 diffs)
• common/stanza_session.py (modified) (5 diffs)
• gajim.py (modified) (2 diffs)
• negotiation.py (modified) (1 diff)

branches/session_centric/src/chat_control.py

@@ -1465 +1465 @@
                 self.kbd_activity_in_last_30_secs = False
 
+        def on_cancel_session_negotiation(self):
+                msg = _('Session negotiation cancelled')
+                ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
 
         # print esession settings to textview
@@ -2156 +2159 @@
                 tb = self.xml.get_widget('gpg_togglebutton')
                 tb.set_active(not tb.get_active())
-        
+
         def _on_convert_to_gc_menuitem_activate(self, widget):
                 '''user want to invite some friends to chat'''
@@ -2165 +2168 @@
                         self.session.terminate_e2e()
 
-                        msg = _('Encryption disabled')
-                        ChatControlBase.print_conversation_line(self, msg, 
-                                'status', '', None)
+                        self.print_esession_details()
 
                         jid = str(self.session.jid)

branches/session_centric/src/common/stanza_session.py

@@ -37 +37 @@
                 self.status = None
                 self.negotiated = {}
-        
+
         def generate_thread_id(self):
                 return "".join([random.choice(string.ascii_letters) for x in xrange(0,32)])
@@ -47 +47 @@
                 msg.setAttr('to', self.jid)
                 self.conn.send_stanza(msg)
-        
+
                 if isinstance(msg, xmpp.Message):
                         self.last_send = time.time()
@@ -73 +73 @@
 
                 if hasattr(self, 'control'):
-                        msg = _('Session negotiation cancelled')
-                        self.control.print_conversation_line(self, msg, 'status', '', None)
+                        self.control.on_cancel_session_negotiation()
 
                 self.status = None
@@ -351 +350 @@
 
                         if not eir_pubkey.verify(hash, signature):
-                                raise exceptions.NegotiationError, 'public key signature verification failed!' 
+                                raise exceptions.NegotiationError, 'public key signature verification failed!'
 
                 elif mac_o_calculated != mac_o:
@@ -904 +903 @@
 
                 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)
+                self.enable_encryption = False
+
+                self.km_o = ''

branches/session_centric/src/gajim.py

@@ -1903 +1903 @@
 
                 if form.getField('accept') and not form['accept'] in ('1', 'true'):
-                        dialogs.InformationDialog(_('Session negotiation cancelled'),
-                                        _('The client at %s cancelled the session negotiation.') % (jid))
                         session.cancelled_negotiation()
                         return
@@ -2019 +2017 @@
                         # user cancelled the negotiation
 
-                        session.cancelled_negotiation()
-
-                        return
-
-                if form.getField('terminate'):
-                        if form.getField('terminate').getValue() in ('1', 'true'):
-                                session.acknowledge_termination()
-
-                                gajim.connections[account].delete_session(str(jid), session.thread_id)
-
-                                ctrl = gajim.interface.msg_win_mgr.get_control(str(jid), account)
-
-                                if ctrl:
-                                        new_sess = gajim.connections[account].make_new_session(str(jid))
-                                        ctrl.set_session(new_sess)
-
-                                return
+                        session.reject_negotiation()
+
+                        return
+
+                if form.getField('terminate') and\
+                form.getField('terminate').getValue() in ('1', 'true'):
+                        was_encrypted = session.enable_encryption
+                        ctrl = session.control
+
+                        session.acknowledge_termination()
+                        gajim.connections[account].delete_session(str(jid), session.thread_id)
+
+                        if ctrl:
+                                new_sess = gajim.connections[account].make_new_session(str(jid))
+                                ctrl.set_session(new_sess)
+
+                                if was_encrypted:
+                                        ctrl.print_esession_details()
+
+                        return
 
                 # non-esession negotiation. this isn't very useful, but i'm keeping it around

branches/session_centric/src/negotiation.py

@@ -20 +20 @@
 
         def failure_cb():
-                session.cancelled_negotiation()
+                session.reject_negotiation()
 
         dialogs.ConfirmationDialogCheck(_('''OK to continue with negotiation?'''),