Changeset 9556

Timestamp:

05/02/08 04:32:28 (7 months ago)

Author:

bct

Message:

fixed groupchat

Location:

branches/session_centric/src

Files:

• chat_control.py (modified) (2 diffs)
• common/connection_handlers.py (modified) (3 diffs)
• gajim.py (modified) (11 diffs)
• groupchat_control.py (modified) (5 diffs)
• message_window.py (modified) (8 diffs)
• roster_window.py (modified) (12 diffs)
• session.py (modified) (1 diff)
• vcard.py (modified) (1 diff)

branches/session_centric/src/chat_control.py

@@ -917 +917 @@
                 if self.type_id == message_control.TYPE_PM:
                         room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
-                        groupchat_control = gajim.interface.msg_win_mgr.get_control(
+                        groupchat_control = gajim.interface.msg_win_mgr.get_gc_control(
                                 room_jid, self.account)
                         if room_jid in gajim.interface.minimized_controls[self.account]:
@@ -928 +928 @@
                                 gajim.interface.roster.draw_contact(room_jid, self.account)
                         groupchat_control.draw_contact(nick)
-                        mw = gajim.interface.msg_win_mgr.get_window(room_jid, self.account)
+                        mw = gajim.interface.msg_win_mgr.get_gc_window(room_jid, self.account)
                         if mw:
                                 mw.redraw_tab(groupchat_control)

branches/session_centric/src/common/connection_handlers.py

@@ -1299 +1299 @@
 
                         con.send(reply)
-                
+
                 raise common.xmpp.NodeProcessed
 
@@ -1329 +1329 @@
                 errcode = iq_obj.getErrorCode()
                 self.dispatch('ERROR_ANSWER', (id, jid_from, errmsg, errcode))
-        
+
         def _PrivateCB(self, con, iq_obj):
                 '''
@@ -1591 +1591 @@
                                 msg = session.decrypt_stanza(msg)
                         except:
-                                self.dispatch('FAILED_DECRYPT', (frm, tim))
+                                self.dispatch('FAILED_DECRYPT', (frm, tim, session))
 
                 msgtxt = msg.getBody()

branches/session_centric/src/gajim.py

@@ -447 +447 @@
                 prompt = data[2]
                 proposed_nick = data[3]
-                gc_control = self.msg_win_mgr.get_control(room_jid, account)
+                gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
                 if not gc_control and \
                 room_jid in self.minimized_controls[account]:
@@ -501 +501 @@
                                 conn.disconnect_transfer(file_props)
                                 return
-                ctrl = self.msg_win_mgr.get_control(jid_from, account)
-                if ctrl and ctrl.type_id == message_control.TYPE_GC:
-                        ctrl.print_conversation('Error %s: %s' % (array[2], array[1]))
+
+                for ctrl in self.msg_win_mgr.get_chat_controls(jid_from, account):
+                        if ctrl.type_id == message_control.TYPE_GC:
+                                ctrl.print_conversation('Error %s: %s' % (array[2], array[1]))
 
         def handle_event_con_type(self, account, con_type):
@@ -957 +958 @@
 
                 # show avatar in chat
-                win = None
-                ctrl = None
+                ctrls = []
                 if resource and self.msg_win_mgr.has_window(
                 jid + '/' + resource, account):
                         win = self.msg_win_mgr.get_window(jid + '/' + resource,
                                 account)
-                        ctrl = win.get_control(jid + '/' + resource, account)
+                        ctrls = win.get_controls(jid + '/' + resource, account)
                 elif self.msg_win_mgr.has_window(jid, account):
                         win = self.msg_win_mgr.get_window(jid, account)
-                        ctrl = win.get_control(jid, account)
-                if win and ctrl.type_id != message_control.TYPE_GC:
-                        ctrl.show_avatar()
+                        ctrls = win.get_controls(jid, account)
+
+                for ctrl in ctrls:
+                        if ctrl.type_id != message_control.TYPE_GC:
+                                ctrl.show_avatar()
 
                 # Show avatar in roster or gc_roster
-                gc_ctrl = self.msg_win_mgr.get_control(jid, account)
+                gc_ctrl = self.msg_win_mgr.get_gc_control(jid, account)
                 if not gc_ctrl and \
                 jid in self.minimized_controls[account]:
@@ -1028 +1030 @@
                 # Get the window and control for the updated status, this may be a
                 # PrivateChatControl
-                control = self.msg_win_mgr.get_control(room_jid, account)
+                control = self.msg_win_mgr.get_gc_control(room_jid, account)
+
                 if not control and \
                 room_jid in self.minimized_controls[account]:
                         control = self.minimized_controls[account][room_jid]
 
-                if control and control.type_id != message_control.TYPE_GC:
-                        return
-                if control:
-                        control.chg_contact_status(nick, show, status, array[4], array[5],
-                                array[6], array[7], array[8], array[9], array[10], array[11])
+                if not control or (control and control.type_id != message_control.TYPE_GC):
+                        return
+
+                control.chg_contact_status(nick, show, status, array[4], array[5],
+                        array[6], array[7], array[8], array[9], array[10], array[11])
 
                 contact = gajim.contacts.\
@@ -1044 +1047 @@
                         self.roster.draw_contact(room_jid, account)
 
-                ctrl = self.msg_win_mgr.get_control(fjid, account)
-
-                # print status in chat window and update status/GPG image
-                if ctrl:
+                # print status in chat windows and update status/GPG image
+                for ctrl in self.msg_win_mgr.get_chat_controls(fjid, account):
                         statusCode = array[9]
                         if '303' in statusCode:
@@ -1083 +1084 @@
                 room_jid = jids[0]
 
-                gc_control = self.msg_win_mgr.get_control(room_jid, account)
+                gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
                 if not gc_control and \
                 room_jid in self.minimized_controls[account]:
@@ -1116 +1117 @@
                 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 \
@@ -1181 +1182 @@
                 statusCode = array[1]
 
-                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]:
@@ -1240 +1241 @@
                         else:
                                 win = self.msg_win_mgr.get_window(room_jid, account)
-                                ctrl = win.get_control(room_jid, account)
+                                ctrl = win.get_gc_control(room_jid, account)
                                 win.remove_tab(ctrl, 3)
 
@@ -1783 +1784 @@
 
         def handle_event_failed_decrypt(self, account, data):
-                jid, tim = data
-
-                ctrl = self.msg_win_mgr.get_control(jid, account)
+                jid, tim, session = data
+
+                ctrl = self.msg_win_mgr.get_control(jid, account, session.thread_id)
                 if ctrl:
                         ctrl.print_conversation_line('Unable to decrypt message from %s\nIt may have been tampered with.' % (jid), 'status', '', tim)
@@ -2584 +2585 @@
                         gajim.events.remove_events(account, jid, event)
                         self.roster.draw_contact(jid, account)
+
                 if w:
                         w.set_active_tab(fjid, account)

branches/session_centric/src/groupchat_control.py

@@ -44 +44 @@
 from common import gajim
 from common import helpers
+from common.stanza_session import StanzaSession
 
 from chat_control import ChatControl
@@ -58 +59 @@
 C_AVATAR, # avatar of the contact
 ) = range(5)
-        
+
 def set_renderer_color(treeview, renderer, set_background = True):
         '''set style for group row, using PRELIGHT system color'''
@@ -210 +211 @@
                 self.new_nick = ''
                 self.name = self.room_jid.split('@')[0]
+
+                self.session = StanzaSession(gajim.connections[self.account],
+                        self.room_jid, 'gc', 'gc')
 
                 compact_view = gajim.config.get('compact_view')
@@ -853 +857 @@
                         # Update pm chat window
                         fjid = self.room_jid + '/' + nick
-                        ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.account)
                         gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
                                 nick)
-                        if ctrl:
+                        for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(fjid, self.account):
                                 gc_contact.show = 'offline'
                                 gc_contact.status = ''
@@ -2023 +2026 @@
                 menu.popup(None, None, None, event.button, event.time)
 
-        def _start_private_message(self, nick, session = None):
+        def _start_private_message(self, nick):
                 gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
                 nick_jid = gc_c.get_full_jid()

branches/session_centric/src/message_window.py

@@ -397 +397 @@
                         gtkgui_helpers.set_unset_urgency_hint(self.window, False)
 
-        def set_active_tab(self, session):
-                ctrl = self._controls[session.conn.name][session.jid][session.thread_id]
+        def set_active_tab(self, ctrl):
                 ctrl_page = self.notebook.page_num(ctrl.widget)
                 self.notebook.set_current_page(ctrl_page)
@@ -539 +538 @@
                         ctrl.update_tags()
 
-        def get_control(self, key, acct):
+        def get_control(self, key, acct, thread_id):
                 '''Return the MessageControl for jid or n, where n is a notebook page index.
-                When key is an int index acct may be None'''
+                When key is an int index acct and thread_id may be None'''
                 if isinstance(key, str):
                         key = unicode(key, 'utf-8')
@@ -548 +547 @@
                         jid = key
                         try:
-                                return self._controls[acct][jid]
+                                return self._controls[acct][jid][thread_id]
                         except:
                                 return None
@@ -558 +557 @@
                         nth_child = notebook.get_nth_page(page_num)
                         return self._widget_to_control(nth_child)
+
+        def get_gc_control(self, jid, acct):
+                return self.get_control(jid, acct, 'gc')
+
+        def get_controls(self, jid, acct):
+                try:
+                        return self._controls[acct][jid].values()
+                except KeyError:
+                        return []
 
         def change_key(self, old_jid, new_jid, acct):
@@ -595 +603 @@
                                 if ind < 0:
                                         ind = self.notebook.get_n_pages() - 1
-                        ctrl = self.get_control(ind, None)
+                        ctrl = self.get_control(ind, None, None)
                         if ctrl.get_nb_unread() > 0:
                                 found = True
@@ -787 +795 @@
         def get_window(self, jid, acct):
                 for win in self.windows():
-                        if win.get_control(jid, acct):
-                                return win
+                        try:
+                                if win._controls[acct][jid]:
+                                        return win
+                        except KeyError:
+                                pass
+                return None
+
+        def get_gc_control(self, jid, acct):
+                win = self.get_window(jid, acct)
+
+                if win:
+                        return win.get_gc_control(jid, acct)
+
                 return None
 
@@ -915 +934 @@
                                 return
 
-        def get_control(self, jid, acct):
+        def get_control(self, jid, acct, session):
                 '''Amongst all windows, return the MessageControl for jid'''
                 win = self.get_window(jid, acct)
                 if win:
-                        return win.get_control(jid, acct)
+                        return win.get_control(jid, acct, session)
                 return None
 
@@ -930 +949 @@
                                 ctrls.append(c)
                 return ctrls
+
+        def get_chat_controls(self, jid, acct):
+                win = self.get_window(jid, acct)
+
+                if win:
+                        return win.get_controls(jid, acct)
+                else:
+                        return []
 
         def windows(self):

branches/session_centric/src/roster_window.py

@@ -778 +778 @@
         def join_gc_room(self, account, room_jid, nick, password, minimize=False,
                 is_continued=False):
-                '''joins the room immediatelly'''
+                '''joins the room immediately'''
                 if gajim.interface.msg_win_mgr.has_window(room_jid, account) and \
                                 gajim.gc_connected[account][room_jid]:
                         win = gajim.interface.msg_win_mgr.get_window(room_jid, account)
+                        ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account)
                         win.window.present()
-                        win.set_active_tab(room_jid, account)
+                        win.set_active_tab(ctrl)
                         dialogs.ErrorDialog(_('You are already in group chat %s') % room_jid)
                         return
@@ -809 +810 @@
                 if not minimized_control_exists:
                         gc_win = gajim.interface.msg_win_mgr.get_window(room_jid, account)
-                        gc_win.set_active_tab(room_jid, account)
+                        gc_control = gc_win.get_gc_control(room_jid, account)
+                        gc_win.set_active_tab(gc_control)
                         gc_win.window.present()
                 gajim.connections[account].join_gc(nick, room_jid, password)
@@ -1362 +1364 @@
                                                 else:
                                                         gajim.transport_avatar[account][host].append(contact1.jid)
-                        # If we already have a chat window opened, update it with new contact
+
+                        # If we already have chat windows opened, update them with new contact
                         # instance
-                        chat_control = gajim.interface.msg_win_mgr.get_control(ji, account)
-                        if chat_control:
+                        for chat_control in gajim.interface.msg_win_mgr.get_chat_controls(ji, account):
                                 chat_control.contact = contact1
 
@@ -1386 +1388 @@
                                         win = gajim.interface.msg_win_mgr.get_window(jid_with_resource,
                                                 account)
-                                        ctrl = win.get_control(jid_with_resource, account)
-                                        ctrl.update_ui()
-                                        win.redraw_tab(ctrl)
+                                        for ctrl in win.get_controls(jid_with_resource, account):
+                                                ctrl.update_ui()
+                                                win.redraw_tab(ctrl)
+
                                 gajim.contacts.remove_contact(account, contact)
                 self.remove_contact(contact, account)
@@ -1395 +1398 @@
                 if gajim.interface.msg_win_mgr.has_window(contact.jid, account):
                         win = gajim.interface.msg_win_mgr.get_window(contact.jid, account)
-                        ctrl = win.get_control(contact.jid, account)
-                        ctrl.contact = gajim.contacts.get_contact_with_highest_priority(
-                                account, contact.jid)
-                        ctrl.update_ui()
-                        win.redraw_tab(ctrl)
-
                         uf_show = helpers.get_uf_show(show)
-                        if status:
-                                ctrl.print_conversation(_('%s is now %s (%s)') % (name, uf_show,
-                                        status), 'status')
-                        else: # No status message
-                                ctrl.print_conversation(_('%s is now %s') % (name, uf_show),
-                                        'status')
+
+                        for ctrl in win.get_controls(contact.jid, account):
+                                ctrl.contact = gajim.contacts.get_contact_with_highest_priority(
+                                        account, contact.jid)
+                                ctrl.update_ui()
+                                win.redraw_tab(ctrl)
+
+                                if status:
+                                        ctrl.print_conversation(_('%s is now %s (%s)') % (name, uf_show,
+                                                status), 'status')
+                                else: # No status message
+                                        ctrl.print_conversation(_('%s is now %s') % (name, uf_show),
+                                                'status')
 
                 # unset custom status
@@ -1809 +1813 @@
                                 gajim.connections[account].update_contact(jid, new_text, u.groups)
                                 self.draw_contact(jid, account)
-                                # Update opened chat
-                                ctrl = gajim.interface.msg_win_mgr.get_control(jid, account)
-                                if ctrl:
+                                # Update opened chats
+                                for ctrl in gajim.interface.msg_win_mgr.get_controls(jid, account):
                                         ctrl.update_ui()
                                         win = gajim.interface.msg_win_mgr.get_window(jid, account)
@@ -1859 +1862 @@
                                 msg_win = gajim.interface.msg_win_mgr.get_window(contact.jid,
                                         account)
-                                ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account)
-                                msg_win.remove_tab(ctrl, msg_win.CLOSE_CLOSE_BUTTON)
+                                for ctrl in gajim.interface.msg_win_mgr.get_controls(contact.jid,
+                                                account):
+                                        msg_win.remove_tab(ctrl, msg_win.CLOSE_CLOSE_BUTTON)
                         else:
                                 need_readd = True
@@ -1919 +1923 @@
                         keys[contact.jid] = keyID
 
-                if gajim.interface.msg_win_mgr.has_window(contact.jid, account):
-                        ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account)
+                for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(contact.jid, account):
                         ctrl.update_ui()
                 keys_str = ''
@@ -1935 +1938 @@
                 # Update chat window
                 if gajim.interface.msg_win_mgr.has_window(jid, account):
-                        win = gajim.interface.msg_win_mgr.get_window(jid, account)
-                        ctrl = win.get_control(jid, account)
-                        if win and ctrl.type_id != message_control.TYPE_GC:
-                                ctrl.show_avatar()
+                        for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(jid, account):
+                                if ctrl.type_id != message_control.TYPE_GC:
+                                        ctrl.show_avatar()
 
         def on_set_custom_avatar_activate(self, widget, contact, account):
@@ -2655 +2657 @@
                 ctrl.parent_win = mw
                 mw.new_tab(ctrl)
-                mw.set_active_tab(jid, account)
+                mw.set_active_tab(ctrl)
                 mw.window.present()
                 del gajim.interface.minimized_controls[account][jid]
@@ -3972 +3974 @@
 
                 mw = gajim.interface.msg_win_mgr.get_window(fjid, account)
-                mw.set_active_tab(fjid, account)
+                mw.set_active_tab(session.control)
                 mw.window.present()
                 # For JEP-0172
                 if added_to_roster:
-                        mc = mw.get_control(fjid, account)
-                        mc.user_nick = gajim.nicks[account]
+                        for mc in mw.get_controls(fjid, account):
+                                mc.user_nick = gajim.nicks[account]
 
         def new_room(self, room_jid, nick, account, is_continued=False):
@@ -4323 +4325 @@
 
                 win = session.control.parent_win
-                win.set_active_tab(session)
+                win.set_active_tab(session.control)
 
                 if conn.is_zeroconf and conn.status in ('offline', 'invisible'):
-                        win.get_control(fjid, account).got_disconnected()
+                        for ctrl in win.get_controls(fjid, account):
+                                ctrl.got_disconnected()
 
                 win.window.present()

branches/session_centric/src/session.py

@@ -108 +108 @@
                         jid = jid.replace('@', '')
 
-                groupchat_control = gajim.interface.msg_win_mgr.get_control(jid, self.conn.name)
+                #groupchat_control = gajim.interface.msg_win_mgr.get_control(jid, self.conn.name)
 
 # XXX fixme

branches/session_centric/src/vcard.py

@@ -124 +124 @@
                 # Update roster
                 gajim.interface.roster.draw_avatar(jid, self.account)
-                # Update chat window
-                if gajim.interface.msg_win_mgr.has_window(jid, self.account):
-                        win = gajim.interface.msg_win_mgr.get_window(jid, self.account)
-                        ctrl = win.get_control(jid, self.account)
-                        if win and ctrl.type_id != message_control.TYPE_GC:
+                # Update chat windows
+                for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(jid, self.account):
+    &