Changeset 9548

Timestamp:

04/30/08 04:55:13 (7 months ago)

Author:

bct

Message:

multiple chat session windows per contact. groupchat and pms broken.

Location:

branches/session_centric/src

Files:

• chat_control.py (modified) (23 diffs)
• common/events.py (modified) (1 diff)
• message_window.py (modified) (5 diffs)
• roster_window.py (modified) (3 diffs)
• session.py (modified) (3 diffs)

branches/session_centric/src/chat_control.py

@@ -386 +386 @@
                         widget.disconnect(id)
                         del self.handlers[id]
-        
+
         def connect_style_event(self, widget, set_fg = False, set_bg = False):
                 self.disconnect_style_event(widget)
@@ -710 +710 @@
                 kind in ('incoming', 'incoming_queue'):
                         self.parent_win.redraw_tab(self)
-                        ctrl = gajim.interface.msg_win_mgr.get_control(full_jid, self.account)
                         if not self.parent_win.is_active():
-                                self.parent_win.show_title(True, ctrl) # Enabled Urgent hint
+                                self.parent_win.show_title(True, self) # Enabled Urgent hint
                         else:
-                                self.parent_win.show_title(False, ctrl) # Disabled Urgent hint
+                                self.parent_win.show_title(False, self) # Disabled Urgent hint
 
         def toggle_emoticons(self):
@@ -906 +905 @@
                 self.parent_win.window.is_active():
                         # we are at the end
-                        if not gajim.events.remove_events(self.account, self.get_full_jid(),
-                        types = ['printed_' + type_, type_]):
+                        if not self.session.remove_events(['printed_' + type_, type_]):
                                 # There were events to remove
                                 self.redraw_after_event_removed(jid)
@@ -1020 +1018 @@
                 self.widget_set_visible(self.xml.get_widget('banner_eventbox'),
                         gajim.config.get('hide_chat_banner'))
-                
+
                 # Add lock image to show chat encryption
                 self.lock_image = self.xml.get_widget('lock_image')
                 self.lock_tooltip = gtk.Tooltips()
-                
+
                 # keep timeout id and window obj for possible big avatar
                 # it is on enter-notify and leave-notify so no need to be per jid
@@ -1070 +1068 @@
                         msg = _('GPG encryption enabled')
                         ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
-                        
+
                         if self.session:
                                 self.session.loggable = gajim.config.get('log_encrypted_sessions')
                         self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and \
                                         self.session.is_loggable())
-                
+
                 self.status_tooltip = gtk.Tooltips()
                 self.update_ui()
@@ -1094 +1092 @@
                 avatar_w = avatar_pixbuf.get_width()
                 avatar_h = avatar_pixbuf.get_height()
-                
+
                 scaled_buf = self.xml.get_widget('avatar_image').get_pixbuf()
                 scaled_buf_w = scaled_buf.get_width()
                 scaled_buf_h = scaled_buf.get_height()
-                
+
                 # do we have something bigger to show?
                 if avatar_w > scaled_buf_w or avatar_h > scaled_buf_h:
@@ -1104 +1102 @@
                         self.show_bigger_avatar_timeout_id = gobject.timeout_add(500,
                                 self.show_bigger_avatar, widget)
-                
+
         def on_avatar_eventbox_leave_notify_event(self, widget, event):
                 '''we left the eventbox area that holds the avatar img'''
@@ -1123 +1121 @@
                         menu.append(menuitem)
                         menu.show_all()
-                        menu.connect('selection-done', lambda w:w.destroy())    
+                        menu.connect('selection-done', lambda w:w.destroy())
                         # show the menu
                         menu.show_all()
@@ -1190 +1188 @@
                 banner_name_label = self.xml.get_widget('banner_name_label')
                 banner_eventbox = self.xml.get_widget('banner_eventbox')
-                
+
                 name = contact.get_shown_name()
                 if self.resource:
@@ -1276 +1274 @@
                         self.gpg_is_active = False
                         msg = _('GPG encryption disabled')
-                        ChatControlBase.print_conversation_line(self, msg, 'status', '', None)  
+                        ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
                         if self.session:
                                 self.session.loggable = True
@@ -1301 +1299 @@
                 gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled',
                         self.gpg_is_active)
-                
+
                 self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and \
                                 self.session.is_loggable())
-        
+
         def _show_lock_image(self, visible, enc_type = '', enc_enabled = False, chat_logged = False):
                 '''Set lock icon visibiity and create tooltip''' 
@@ -1468 +1466 @@
                 # True refresh 30 seconds vars too or else it's 30 - 5 = 25 seconds!
                 self.reset_kbd_mouse_timeout_vars()
-                return True # loop forever              
+                return True # loop forever
 
         def check_for_possible_inactive_chatstate(self, arg):
@@ -1618 +1616 @@
                 else: # active or not chatstate, get color from gtk
                         color = self.parent_win.notebook.style.fg[gtk.STATE_ACTIVE]
-                
+
 
                 name = self.contact.get_shown_name()
@@ -1637 +1635 @@
                 # Set tab image (always 16x16); unread messages show the 'event' image
                 tab_img = None
-                
+
                 if num_unread and gajim.config.get('show_unread_tab_icon'):
                         img_16 = gajim.interface.roster.get_appropriate_state_images(
@@ -1673 +1671 @@
                 muc_icon = gajim.interface.roster.load_icon('muc_active')
                 if muc_icon:
-                        convert_to_gc_menuitem.set_image(muc_icon) 
+                        convert_to_gc_menuitem.set_image(muc_icon)
 
                 ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
@@ -1683 +1681 @@
                 contact = self.parent_win.get_active_contact()
                 jid = contact.jid
-                
+
                 # check if we support and use gpg
                 if not gajim.config.get_per('accounts', self.account, 'keyid') or\
@@ -1766 +1764 @@
                 # this function checks for that and just returns so it's safe to call it
                 # with same state.
-                
+
                 # This functions also checks for violation in state transitions
                 # and raises RuntimeException with appropriate message
@@ -1795 +1793 @@
                         return
 
-                # if the new state we wanna send (state) equals 
+                # if the new state we wanna send (state) equals
                 # the current state (contact.our_chatstate) then return
                 if contact.our_chatstate == state:
@@ -1807 +1805 @@
                         # for that procedure so return to make sure we send only once
                         # 'active' until we know peer supports jep85
-                        return 
+                        return
 
                 if contact.our_chatstate == 'ask':
@@ -1827 +1825 @@
                         contact.our_chatstate = 'active'
                         self.reset_kbd_mouse_timeout_vars()
-                
+
                 # if we're inactive prevent composing (JEP violation)
                 elif contact.our_chatstate == 'inactive' and state == 'composing':
@@ -2053 +2051 @@
                         self.print_esession_details()
 
-                # Is it a pm ?
-                is_pm = False
-                room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
-                control = gajim.interface.msg_win_mgr.get_control(room_jid, self.account)
-                if control and control.type_id == message_control.TYPE_GC:
-                        is_pm = True
                 # list of message ids which should be marked as read
                 message_ids = []
@@ -2083 +2075 @@
 
                 typ = 'chat' # Is it a normal chat or a pm ?
+
                 # reset to status image in gc if it is a pm
-                if is_pm:
-                        control.update_ui()
-                        control.parent_win.show_title()
-                        typ = 'pm'
+                # Is it a pm ?
+                room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
+# XXX fixme somehow
+#               control = gajim.interface.msg_win_mgr.get_control(room_jid, self.account)
+#               if control and control.type_id == message_control.TYPE_GC:
+#                       control.update_ui()
+#                       control.parent_win.show_title()
+#                       typ = 'pm'
 
                 self.redraw_after_event_removed(jid)
@@ -2098 +2095 @@
                                 gajim.interface.roster.really_remove_contact(self.contact,
                                         self.account)
-                        elif typ == 'pm':
-                                control.remove_contact(nick)
+#                       elif typ == 'pm':
+#                               control.remove_contact(nick)
 
         def show_bigger_avatar(self, small_avatar):

branches/session_centric/src/common/events.py

@@ -117 +117 @@
         def remove_events(self, account, jid, event = None, types = []):
                 '''if event is not specified, remove all events from this jid,
-                optionnaly only from given type
+                optionally only from given type
                 return True if no such event found'''
                 if not self._events.has_key(account):

branches/session_centric/src/message_window.py

@@ -153 +153 @@
         def get_num_controls(self):
                 n = 0
-                for dict in self._controls.values():
-                        n += len(dict)
+                for jid_dict in self._controls.values():
+                        for dict in jid_dict.values():
+                                n += len(dict)
                 return n
 
@@ -207 +208 @@
                         self._controls[control.account] = {}
                 fjid = control.get_full_jid()
-                self._controls[control.account][fjid] = control
+
+                if not self._controls[control.account].has_key(fjid):
+                        self._controls[control.account][fjid] = {}
+
+                self._controls[control.account][fjid][control.session.thread_id] = control
 
                 if self.get_num_controls() == 2:
@@ -392 +397 @@
                         gtkgui_helpers.set_unset_urgency_hint(self.window, False)
 
-        def set_active_tab(self, jid, acct):
-                ctrl = self._controls[acct][jid]
+        def set_active_tab(self, session):
+                ctrl = self._controls[session.conn.name][session.jid][session.thread_id]
                 ctrl_page = self.notebook.page_num(ctrl.widget)
                 self.notebook.set_current_page(ctrl_page)
@@ -425 +430 @@
 
                 fjid = ctrl.get_full_jid()
-                del self._controls[ctrl.account][fjid]
+                thread_id = ctrl.session.thread_id
+                del self._controls[ctrl.account][fjid][thread_id]
+
+                if len(self._controls[ctrl.account][fjid]) == 0:
+                        del self._controls[ctrl.account][fjid]
+
                 if len(self._controls[ctrl.account]) == 0:
                         del self._controls[ctrl.account]
@@ -564 +574 @@
 
         def controls(self):
-                for ctrl_dict in self._controls.values():
-                        for ctrl in ctrl_dict.values():
-                                yield ctrl
+                for jid_dict in self._controls.values():
+                        for ctrl_dict in jid_dict.values():
+                                for ctrl in ctrl_dict.values():
+                                        yield ctrl
 
         def move_to_next_unread_tab(self, forward):

branches/session_centric/src/roster_window.py

@@ -4313 +4313 @@
                         session = conn.get_session(fjid, None, 'chat')
 
-                win = gajim.interface.msg_win_mgr.get_window(fjid, account)
-                if not win:
+                if not session.control:
                         session.control = self.new_chat(session, contact, account, resource=resource)
 
@@ -4320 +4319 @@
                                 session.control.read_queue()
 
-                        win = gajim.interface.msg_win_mgr.get_window(fjid, account)
                         # last message is long time ago
                         gajim.last_message_time[account][session.control.get_full_jid()] = 0
 
-                win.set_active_tab(fjid, account)
+                win = session.control.parent_win
+                win.set_active_tab(session)
+
                 if conn.is_zeroconf and conn.status in ('offline', 'invisible'):
                         win.get_control(fjid, account).got_disconnected()
@@ -5205 +5205 @@
                 elif nb_unread == 1:
                         start = '*  '
+
                 self.window.set_title(start + 'Gajim')
 

branches/session_centric/src/session.py

@@ -19 +19 @@
 
                 self.control = None
+
+        # remove events associated with this session from the queue
+        def remove_events(self, types):
+                any_removed = False
+
+                for event in gajim.events.get_events(self.conn, self.jid, types=types):
+                        if event.parameters[8] != self:
+                                continue
+
+                        r = gajim.events.remove_events(self.conn, self.jid, event)
+
+                        if not_any_removed:
+                                any_removed = r
+
+                return any_removed
 
         # extracts chatstate from a <message/> stanza
@@ -94 +109 @@
 
                 groupchat_control = gajim.interface.msg_win_mgr.get_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]
+
+# 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]
 
                 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
@@ -185 +202 @@
         subject=None, resource='', msg_id=None, user_nick='',
         advanced_notif_num=None, xhtml=None, form_node=None):
+
                 contact = None
                 # if chat window will be for specific resource