Changeset 9308 for branches/session_centric/src/session.py

Timestamp:

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

Author:

bct

Message:

post-refactor traceback fixing

Files:

• branches/session_centric/src/session.py (modified) (4 diffs)

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)):