Changeset 9567

Timestamp:

05/03/08 18:52:27 (7 months ago)

Author:

bct

Message:

reuse existing chat sessions and controls

Location:

branches/session_centric/src

Files:

• common/connection_handlers.py (modified) (2 diffs)
• common/zeroconf/connection_handlers_zeroconf.py (modified) (2 diffs)
• roster_window.py (modified) (7 diffs)
• session.py (modified) (1 diff)

branches/session_centric/src/common/connection_handlers.py

@@ -1559 +1559 @@
                         return
                 elif mtype != 'groupchat':
-                        session = self.get_session(frm, thread_id, mtype)
+                        session = self.get_or_create_session(frm, thread_id, mtype)
 
                 if thread_id and not session.received_thread_id:
@@ -1732 +1732 @@
                         is_continued))
 
-        def get_session(self, jid, thread_id, type):
+        def get_or_create_session(self, jid, thread_id, type):
                 '''returns an existing session between this connection and 'jid', returns a new one if none exist.'''
                 session = self.find_session(jid, thread_id, type)

branches/session_centric/src/common/zeroconf/connection_handlers_zeroconf.py

@@ -659 +659 @@
                 jid  = frm
 
-                session = self.get_session(frm, thread_id, mtype)
+                session = self.get_or_create_session(frm, thread_id, mtype)
 
                 if thread_id and not session.received_thread_id:
@@ -795 +795 @@
                 raise common.xmpp.NodeProcessed
 
-        def get_session(self, jid, thread_id, type):
+        def get_or_create_session(self, jid, thread_id, type):
                 '''returns an existing session between this connection and 'jid', returns a new one if none exist.'''
                 session = self.find_session(jid, thread_id, type)

branches/session_centric/src/roster_window.py

@@ -56 +56 @@
 from groupchat_control import GroupchatControl
 from groupchat_control import PrivateChatControl
+
+from session import ChatControlSession
 
 from common import dbus_support
@@ -3391 +3393 @@
                         if gajim.single_click and not event.state & gtk.gdk.SHIFT_MASK and \
                         not event.state & gtk.gdk.CONTROL_MASK:
-                                # Don't handle dubble click if we press icon of a metacontact
+                                # Don't handle double click if we press icon of a metacontact
                                 iter = model.get_iter(path)
                                 if x > x_min and x < x_min + 27 and type_ == 'contact' and \
@@ -3929 +3931 @@
 
                 if not session:
-                        session = gajim.connections[account].get_session(fjid, None, 'pm')
+                        session = gajim.connections[account].get_or_create_session(fjid, None, 'pm')
 
                 chat_control = PrivateChatControl(mw, gc_contact, contact, account, session)
@@ -3968 +3970 @@
                                 resource = resource)
 
-                session = gajim.connections[account].get_session(fjid, None, 'chat')
+                session = gajim.connections[account].get_or_create_session(fjid, None, 'chat')
 
                 if not gajim.interface.msg_win_mgr.has_window(fjid, account):
@@ -4315 +4317 @@
                 conn = gajim.connections[account]
 
+                if not session and fjid in conn.sessions:
+                        sessions = filter(lambda s: isinstance(s, ChatControlSession),
+                                        conn.sessions[fjid].values())
+
+                        # look for an existing session with a chat control
+                        for s in sessions:
+                                if s.control:
+                                        session = s
+                                        break
+
+                        if not session and not len(sessions) == 0:
+                                # there are no sessions with chat controls, just take the first one
+                                session = sessions[0]
+
                 if not session:
-                        session = conn.get_session(fjid, None, 'chat')
+                        # couldn't find an existing ChatControlSession, just make a new one
+                        session = conn.make_new_session(fjid, None, 'chat')
 
                 if not session.control:
+                        # open a new chat control
                         session.control = self.new_chat(session, contact, account, resource=resource)
 
@@ -4337 +4355 @@
 
         def on_row_activated(self, widget, path):
-                '''When an iter is activated (dubblick or single click if gnome is set
-                this way'''
+                '''When an iter is activated (double-click or single click if gnome is
+                set this way'''
                 model = self.tree.get_model()
                 account = model[path][C_ACCOUNT].decode('utf-8')
@@ -4385 +4403 @@
                         if jid == gajim.get_jid_from_account(account):
                                 resource = c.resource
+
                         self.on_open_chat_window(widget, c, account, resource = resource, session = session)
 

branches/session_centric/src/session.py

@@ -19 +19 @@
 
                 self.control = None
+
+        def acknowledge_termination(self):
+                # the other party terminated the session. we'll keep the control around, though.
+                stanza_session.EncryptedStanzaSession.acknowledge_termination(self)
+
+                self.control.session = None
 
         # remove events associated with this session from the queue