Changeset 9599

Timestamp:

05/09/08 00:09:43 (7 months ago)

Author:

steve-e

Message:

Some random roster cleanups:

• remove unused code
• use self.model directly when obvious
• cleanup some FIXME comments

Files:

• trunk/src/roster_window.py (modified) (10 diffs)

trunk/src/roster_window.py

@@ -742 +742 @@
 
 
-        #FIXME: Better never even remove....
+        #FIXME: 
+        # We need to define a generic way to keep contacts in roster
+        # as long as they have pending events or as we
+        # still chat with them
         def _readd_contact_to_roster_if_needed(self, contact, account):
-                # FIXME What am I REALLY needed for
                 need_readd = False
                 if len(gajim.events.get_events(account, contact.jid)):
@@ -1720 +1722 @@
 
         def set_connecting_state(self, account):
-                model = self.modelfilter
-                child_model = model.get_model()
-                IterA = self._get_account_iter(account)
-                if IterA:
-                        child_iterA = model.convert_iter_to_child_iter(IterA)
-                        child_model[child_iterA][0] = \
+                child_iterA = self._get_account_iter(account, self.model)
+                if child_iterA:
+                        self.model[child_iterA][0] = \
                                 gajim.interface.jabber_state_images['16']['connecting']
                 if gajim.interface.systray_enabled:
@@ -1731 +1730 @@
 
         def send_status(self, account, status, txt, auto = False, to = None):
-                model = self.modelfilter
-                child_model = model.get_model()
-                iterA = self._get_account_iter(account)
+                child_iterA = self._get_account_iter(account, self.model)
                 if status != 'offline':
                         if gajim.connections[account].connected < 2:
@@ -1749 +1746 @@
                                         passphrase, save = w.run()
                                         if passphrase == -1:
-                                                if iterA:
-                                                        child_iterA = model.convert_iter_to_child_iter(iterA)
-                                                        child_model[child_iterA][0] = gajim.interface.jabber_state_images[
+                                                if child_iterA:
+                                                        self.model[child_iterA][0] = gajim.interface.jabber_state_images[
                                                                 '16']['offline']
                                                 if gajim.interface.systray_enabled:
@@ -2054 +2050 @@
                 gajim.events.add_event(account, fjid, event)
                 if popup:
-                        # FIXME: What is happening here.
-                        # What does "OR he is not in the roster at all" mean
                         if not ctrl:
                                 gajim.interface.new_chat(contact, account, \
@@ -2061 +2055 @@
                                 if path and not self.dragging and gajim.config.get(
                                 'scroll_roster_to_last_message'):
-                                        # we curently see contact in our roster OR he
-                                        # is not in the roster at all.
+                                        # we curently see contact in our roster
                                         # show and select his line in roster
                                         # do not change selection while DND'ing
@@ -3024 +3017 @@
                                 if x > x_min and x < x_min + 27 and type_ == 'contact' and \
                                 model.iter_has_child(titer):
-                                        # FIXME: Expand all meta contacts or only the current one?
-                                        #account = model[path][C_ACCOUNT].decode('utf-8')
-                                        #jid = model[path][C_JID].decode('utf-8')
-                                        # first cell in 1st column (the arrow SINGLE clicked)
-                                        #iters = self._get_contact_iter(jid, account)
-                                        #for titer in iters:
-                                        #       path = model.get_path(titer)
                                         if (self.tree.row_expanded(path)):
                                                 self.tree.collapse_row(path)
@@ -3049 +3035 @@
 
                                 elif type_ == 'contact' and x > x_min and x < x_min + 27:
-                                        # FIXME: Expand all meta contacts or only the current one?
-                                        #account = model[path][C_ACCOUNT].decode('utf-8')
-                                        #jid = model[path][C_JID].decode('utf-8')
-                                        # first cell in 1st column (the arrow SINGLE clicked)
-                                        #iters = self._get_contact_iter(jid, account)
-                                        #for titer in iters:
-                                        #       path = model.get_path(titer)
                                         if (self.tree.row_expanded(path)):
                                                 self.tree.collapse_row(path)
@@ -3975 +3954 @@
         def set_account_status_icon(self, account):
                 status = gajim.connections[account].connected
-                model = self.modelfilter
-                child_model = model.get_model()
-                iterA = self._get_account_iter(account)
-                if not iterA:
-                        return
-                child_iterA = model.convert_iter_to_child_iter(iterA)
+                child_iterA = self._get_account_iter(account, self.model)
+                if not child_iterA:
+                        return
                 if not self.regroup:
                         show = gajim.SHOW_LIST[status]
                 else:   # accounts merged
                         show = helpers.get_global_show()
-                child_model[child_iterA][C_IMG] = gajim.interface.jabber_state_images['16'][show]       
+                self.model[child_iterA][C_IMG] = gajim.interface.jabber_state_images['16'][show]        
 
 ################################################################################
@@ -4026 +4002 @@
 
         def change_roster_style(self, option):
-                model = self.modelfilter
-                child_model = model.get_model()
-                child_model.foreach(self._change_style, option)
+                self.model.foreach(self._change_style, option)
                 for win in gajim.interface.msg_win_mgr.windows():
                         win.repaint_themed_widgets()