Changeset 9308

Timestamp:

02/06/08 06:24:07 (7 months ago)

Author:

bct

Message:

post-refactor traceback fixing

Location:

branches/session_centric/src

Files:

• chat_control.py (modified) (2 diffs)
• common/connection_handlers.py (modified) (1 diff)
• message_control.py (modified) (1 diff)
• notify.py (modified) (2 diffs)
• roster_window.py (modified) (3 diffs)
• session.py (modified) (4 diffs)

branches/session_centric/src/chat_control.py

@@ -679 +679 @@
                                 event = 'message_received'
                                 show_in_roster = notify.get_show_in_roster(event,
-                                        self.account, self.contact)
+                                        self.account, self.contact, self.session)
                                 show_in_systray = notify.get_show_in_systray(event,
                                         self.account, self.contact)
@@ -1842 +1842 @@
                 # destroy banner tooltip - bug #pygtk for that!
                 self.status_tooltip.destroy()
+
                 # Send 'gone' chatstate
                 self.send_chatstate('gone', self.contact)
                 self.contact.chatstate = None
                 self.contact.our_chatstate = None
+
+                self.session.control = None
+
                 # Disconnect timer callbacks
                 gobject.source_remove(self.possible_paused_timeout_id)

branches/session_centric/src/common/connection_handlers.py

@@ -1753 +1753 @@
                 try:
                         del self.sessions[jid][thread_id]
-                        
+
                         if not self.sessions[jid]:
                                 del self.sessions[jid]

branches/session_centric/src/message_control.py

@@ -146 +146 @@
 
                 if not self.session:
+                        print('uhoh new session')
                         fjid = self.contact.get_full_jid()
                         new_session = gajim.connections[self.account].make_new_session(fjid)

branches/session_centric/src/notify.py

@@ -54 +54 @@
         USER_HAS_GROWL = False
 
-
-def get_show_in_roster(event, account, contact):
+def get_show_in_roster(event, account, contact, session = None):
         '''Return True if this event must be shown in roster, else False'''
         if event == 'gc_message_received':
@@ -66 +65 @@
                         return False
         if event == 'message_received':
-                chat_control = helpers.get_chat_control(account, contact)
-                if chat_control:
+                if session:
+                        if session.control:
+                                return False
+                elif helpers.get_chat_control(account, contact):
                         return False
         return True

branches/session_centric/src/roster_window.py

@@ -1300 +1300 @@
                         for result in results:
                                 tim = time.localtime(float(result[2]))
-                                self.on_message(jid, result[1], tim, account, msg_type = 'chat',
-                                        msg_id = result[0], session = session)
+                                session.roster_message(jid, result[1], tim, msg_type='chat', msg_id=result[0])
 
         def fill_contacts_and_groups_dicts(self, array, account):
@@ -3961 +3960 @@
                                 resource = resource)
 
+                session = gajim.connections[account].get_session(fjid, None, 'chat')
+
                 if not gajim.interface.msg_win_mgr.has_window(fjid, account):
-                        session = account.make_new_session(account, fjid)
-                        self.control = self.new_chat(session, contact, account, resource = resource)
+                        session.control = self.new_chat(session, contact, account, resource = resource)
 
                         if len(gajim.events.get_events(account, fjid)):
-                                chat_control.read_queue()
+                                session.control.read_queue()
 
                 mw = gajim.interface.msg_win_mgr.get_window(fjid, account)
@@ -4293 +4293 @@
                 if resource:
                         fjid += '/' + resource
+
+                conn = gajim.connections[account]
+
+                if not session:
+                        session = conn.get_session(fjid, None, 'chat')
+
                 win = gajim.interface.msg_win_mgr.get_window(fjid, account)
                 if not win:
-                        self.new_chat(session, contact, account, resource = resource)
+                        session.control = self.new_chat(session, contact, account, resource=resource)
+
+                        if len(gajim.events.get_events(account, fjid)):
+                                session.control.read_queue()
+
                         win = gajim.interface.msg_win_mgr.get_window(fjid, account)
-                        ctrl = win.get_control(fjid, account)
                         # last message is long time ago
-                        gajim.last_message_time[account][ctrl.get_full_jid()] = 0
+                        gajim.last_message_time[account][session.control.get_full_jid()] = 0
+
                 win.set_active_tab(fjid, account)
-                if gajim.connections[account].is_zeroconf and \
-                                gajim.connections[account].status in ('offline', 'invisible'):
+                if conn.is_zeroconf and conn.status in ('offline', 'invisible'):
                         win.get_control(fjid, account).got_disconnected()
 

branches/session_centric/src/session.py

@@ -52 +52 @@
                                         if contact.our_chatstate == 'ask': # we were jep85 disco?
                                                 contact.our_chatstate = 'active' # no more
-                                        self.control.handle_incoming_chatstate()
+                                        #self.control.handle_incoming_chatstate() XXX
                                 elif contact.chatstate != 'active':
                                         # got no valid jep85 answer, peer does not support it
@@ -110 +110 @@
 
                 if gajim.interface.remote_ctrl:
-                        gajim.interface.remote_ctrl.raise_signal('NewMessage', (self.conn.name, [full_jid_with_resource, message, tim, encrypted, msg_type, subject, chatstate, msg_id, composing_xep, user_nick, xhtml, form_node]))
+                        gajim.interface.remote_ctrl.raise_signal('NewMessage',
+                                        (self.conn.name, [full_jid_with_resource, message, tim,
+                                                encrypted, msg_type, subject, chatstate, msg_id,
+                                                composing_xep, user_nick, xhtml, form_node]))
 
         def roster_message(self, jid, msg, tim, encrypted=False, msg_type='',
@@ -189 +192 @@
                         event_type = 'single_message_received'
 
-                show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact)
+                show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self)
                 show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact)
 
@@ -200 +203 @@
                 if popup:
                         if not self.control:
-                                self.control = self.new_chat(self, contact, self.conn.name, resource=resource_for_chat)
+                                self.control = gajim.interface.roster.new_chat(self, contact, self.conn.name, resource=resource_for_chat)
 
                                 if len(gajim.events.get_events(self.conn.name, fjid)):