Show
Ignore:
Timestamp:
02/06/08 02:40:51 (10 months ago)
Author:
bct
Message:

move message handling into ChatControlSession?

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/session_centric/src/common/connection_handlers.py

    r9299 r9307  
    5050        from music_track_listener import MusicTrackListener 
    5151 
    52 from common.stanza_session import EncryptedStanzaSession  
     52# XXX interface leaking into the back end? 
     53import session 
    5354 
    5455STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 
    … …  
    17141715                if treat_as: 
    17151716                        mtype = treat_as 
    1716                 self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, 
    1717                         subject, chatstate, msg_id, composing_xep, user_nick, msghtml, 
    1718                         session, form_node)) 
     1717 
     1718                session.received(frm, msgtxt, tim, encrypted, mtype, subject, chatstate, 
     1719      msg_id, composing_xep, user_nick, msghtml, form_node) 
    17191720        # END messageCB 
    17201721 
    … …  
    17871788 
    17881789        def make_new_session(self, jid, thread_id = None, type = 'chat'): 
    1789                 sess = EncryptedStanzaSession(self, common.xmpp.JID(jid), thread_id, type) 
     1790                sess = session.ChatControlSession(self, common.xmpp.JID(jid), thread_id, type) 
    17901791 
    17911792                if not jid in self.sessions: