Changeset 9981

Timestamp:

07/22/08 16:32:37 (5 weeks ago)

Author:

js

Message:

* End ESession when remote signs off.
* Fix typo.
* Better code in conversation_textview.py.

@bct: Your diff didn't work, I had to move it + add an if. Seems to
work now.

Location:

trunk/src

Files:

• conversation_textview.py (modified) (3 diffs)
• gajim.py (modified) (2 diffs)

trunk/src/conversation_textview.py

@@ -398 +398 @@
 
         def show_xep0184_warning(self, id):
-                try:
-                        if self.xep0184_marks[id] is not None:
-                                return
-                except KeyError:
-                        pass
+                if self.xep0184_marks.has_key(id):
+                        return
 
                 buffer = self.tv.get_buffer()
@@ -428 +425 @@
 
         def hide_xep0184_warning(self, id):
-                try:
-                        if self.xep0184_marks[id] is None:
-                                return
-                except KeyError:
+                if not self.xep0184_marks.has_key(id):
                         return
 
@@ -453 +447 @@
                 buffer.end_user_action()
 
-                self.xep0184_marks[id] = None
+                del self.xep0184_marks[id]
                 del self.xep0184_shown[id]
 

trunk/src/gajim.py

@@ -774 +774 @@
                                 gajim.connections[account]. \
                                         remove_transfers_for_contact(contact1)
+
+                                # disable encryption, since if any messages are
+                                # lost they'll be not decryptable (note that
+                                # this contradicts XEP-0201 - trying to get the
+                                # in the XEP, though)
+                                if gajim.connections[account].sessions. \
+                                has_key(ji):
+                                        for sess in gajim.connections \
+                                        [account]. sessions[ji].values():
+                                                if sess.enable_encryption:
+                                                        sess.terminate_e2e()
+                                                        gajim.connections \
+                                                        [account]. \
+                                                        delete_session(jid,
+                                                        sess.thread_id)
+
                         self.roster.chg_contact_status(contact1, array[1],
                                 status_message, account)
@@ -787 +803 @@
                         elif old_show > 1 and new_show < 2:
                                 notify.notify('contact_disconnected', jid, 
-                                        ccount, status_message)
+                                        account, status_message)
                                 if self.remote_ctrl:
                                         self.remote_ctrl.raise_signal(