Changeset 9560

Timestamp:

05/03/08 02:10:17 (4 months ago)

Author:

bct

Message:

pm fixes

Location:

branches/session_centric/src

Files:

• chat_control.py (modified) (1 diff)
• common/connection_handlers.py (modified) (2 diffs)
• gajim.py (modified) (1 diff)
• groupchat_control.py (modified) (6 diffs)
• roster_window.py (modified) (1 diff)
• session.py (modified) (3 diffs)

branches/session_centric/src/chat_control.py

@@ -928 +928 @@
                                 gajim.interface.roster.draw_contact(room_jid, self.account)
                         groupchat_control.draw_contact(nick)
-                        mw = gajim.interface.msg_win_mgr.get_gc_window(room_jid, self.account)
-                        if mw:
-                                mw.redraw_tab(groupchat_control)
+                        if groupchat_control.parent_win:
+                                groupchat_control.parent_win.redraw_tab(groupchat_control)
                 else:
                         gajim.interface.roster.draw_contact(jid, self.account)

branches/session_centric/src/common/connection_handlers.py

@@ -1030 +1030 @@
 
                 self.awaiting_answers[id] = (VCARD_PUBLISHED, iq2)
-        
+
         def _IqCB(self, con, iq_obj):
                 id = iq_obj.getID()
@@ -1082 +1082 @@
                         if iq_obj.getType() == 'error' and jid == our_jid:
                                 # our server doesn't support vcard
+                                gajim.log.debug('xxx error xxx')
                                 self.vcard_supported = False
                         if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error':

branches/session_centric/src/gajim.py

@@ -728 +728 @@
                 jids = full_jid_with_resource.split('/', 1)
                 jid = jids[0]
-                gc_control = self.msg_win_mgr.get_control(jid, account)
+                gc_control = self.msg_win_mgr.get_gc_control(jid, account)
                 if not gc_control and \
                 jid in self.minimized_controls[account]:

branches/session_centric/src/groupchat_control.py

@@ -122 +122 @@
         def __init__(self, parent_win, gc_contact, contact, account, session):
                 room_jid = contact.jid.split('/')[0]
-                room_ctrl = gajim.interface.msg_win_mgr.get_control(room_jid, account)
+                room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account)
                 if gajim.interface.minimized_controls[account].has_key(room_jid):
                         room_ctrl = gajim.interface.minimized_controls[account][room_jid]
@@ -449 +449 @@
                 if color_name:
                         color = gtk.gdk.colormap_get_system().alloc_color(color_name)
-                        
+
                 label_str = self.name
-                
+
                 # count waiting highlighted messages
                 unread = ''
@@ -605 +605 @@
 
                 # We print if window is opened
-                pm_control = gajim.interface.msg_win_mgr.get_control(fjid, self.account)
+                pm_control = gajim.interface.msg_win_mgr.get_control(fjid, self.account, session)
+
                 if pm_control:
                         pm_control.print_conversation(msg, tim = tim, xhtml = xhtml)
+
                         return
 
@@ -884 +886 @@
         def on_send_pm(self, widget = None, model = None, iter = None, nick = None,
         msg = None):
-                '''opens a chat window and msg is not None sends private message to a
+                '''opens a chat window and if msg is not None sends private message to a
                 contact in a room'''
                 if nick is None:
@@ -1604 +1606 @@
                         # Update pm chat window
                         fjid = self.room_jid + '/' + nick
-                        ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.account)
+                        ctrl = gajim.interface.msg_win_mgr.get_gc_control(fjid, self.account)
                         if ctrl:
                                 contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
@@ -2034 +2036 @@
                         gajim.interface.roster.new_private_chat(gc_c, self.account)
                         win = gajim.interface.msg_win_mgr.get_window(nick_jid, self.account)
-                win.set_active_tab(nick_jid, self.account)
+
+                ctrl = win.get_controls(nick_jid, self.account)[0]
+
+                win.set_active_tab(ctrl)
                 win.window.present()
 

branches/session_centric/src/roster_window.py

@@ -3927 +3927 @@
                 if not mw:
                         mw = gajim.interface.msg_win_mgr.create_window(contact, account, type_)
+
+                if not session:
+                        session = gajim.connections[account].get_session(fjid, None, 'pm')
 
                 chat_control = PrivateChatControl(mw, gc_contact, contact, account, session)

branches/session_centric/src/session.py

@@ -108 +108 @@
                         jid = jid.replace('@', '')
 
-                #groupchat_control = gajim.interface.msg_win_mgr.get_control(jid, self.conn.name)
-
-# XXX fixme
-#               if not groupchat_control and \
-#               jid in gajim.interface.minimized_controls[self.conn.name]:
-#                       groupchat_control = self.minimized_controls[self.conn.name][jid]
+                groupchat_control = gajim.interface.msg_win_mgr.get_gc_control(jid, self.conn.name)
+
+                if not groupchat_control and \
+                jid in gajim.interface.minimized_controls[self.conn.name]:
+                        groupchat_control = self.minimized_controls[self.conn.name][jid]
 
                 pm = False
-#               if groupchat_control and groupchat_control.type_id == \
-#               message_control.TYPE_GC:
+                if groupchat_control and groupchat_control.type_id == \
+                message_control.TYPE_GC:
                         # It's a Private message
-#                       pm = True
-#                       msg_type = 'pm'
+                        pm = True
+                        msg_type = 'pm'
 
                 jid_of_control = full_jid_with_resource
@@ -135 +134 @@
                                         if contact.our_chatstate == 'ask': # we were jep85 disco?
                                                 contact.our_chatstate = 'active' # no more
-                                        #self.control.handle_incoming_chatstate() XXX
+                                        self.control.handle_incoming_chatstate()
                                 elif contact.chatstate != 'active':
                                         # got no valid jep85 answer, peer does not support it
@@ -169 +168 @@
                 if pm:
                         nickname = resource
-                        groupchat_control.on_private_message(nickname, msgtxt, array[2],
-                                xhtml, session, msg_id)
+                        groupchat_control.on_private_message(nickname, msgtxt, tim,
+                                xhtml, self, msg_id)
                 else:
                         self.roster_message(jid, msgtxt, tim, encrypted, msg_type,