Changeset 9597 for trunk/src/roster_window.py

Timestamp:

05/08/08 23:18:39 (4 months ago)

Author:

steve-e

Message:

Coding standards.

Files:

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

trunk/src/roster_window.py

@@ -247 +247 @@
                 
                         
-################################################################################                
+#############################################################################           
 ### Methods for adding and removing roster window items
-################################################################################
+#############################################################################
         
         def add_account(self, account):
@@ -318 +318 @@
 
         
-        def _add_entity(self, contact, account, groups = None, big_brother_contact = None, 
-        big_brother_account = None):
+        def _add_entity(self, contact, account, groups = None,
+        big_brother_contact = None, big_brother_account = None):
                 '''Add the given contact to roster data model.
                 
@@ -418 +418 @@
                         all_iters = iters[:]
                         group_iters = [self._get_group_iter(group, account) for group in groups]
-                        iters = [iter for iter in all_iters if self.model.iter_parent(iter) in group_iters] 
+                        iters = [iter for iter in all_iters 
+                                if self.model.iter_parent(iter) in group_iters] 
 
                 iter_children = self.model.iter_children(iters[0])
@@ -462 +463 @@
                 big_brother_jid = big_brother_data['jid']
                 big_brother_account = big_brother_data['account']
-                big_brother_contact = gajim.contacts.get_first_contact_from_jid(big_brother_account, big_brother_jid)
-
-                assert len(self._get_contact_iter(big_brother_jid, big_brother_account, big_brother_contact, self.model)) == 0,\
+                big_brother_contact = gajim.contacts.get_first_contact_from_jid(
+                        big_brother_account, big_brother_jid)
+
+                assert len(self._get_contact_iter(big_brother_jid, big_brother_account,
+                        big_brother_contact, self.model)) == 0,\
                         "Big brother %s already in roster  \n Family: %s" % (big_brother_jid, family)
                 self._add_entity(big_brother_contact, big_brother_account)
@@ -482 +485 @@
                                 continue
                         
-                        assert len(self._get_contact_iter(_jid, _account, _contact, self.model)) == 0,\
-                                "%s already in roster. \n Family: " % (_jid, nearby_family)
+                        assert len(self._get_contact_iter(_jid, _account, _contact, self.model)
+                                ) == 0, "%s already in roster. \n Family: " % (_jid, nearby_family)
                         self._add_entity(_contact, _account, big_brother_contact = big_brother_contact,
                                 big_brother_account = big_brother_account)
@@ -518 +521 @@
                                 # Only try to remove what is actually in the roster
                                 continue
-                        assert iters, "%s shall be removed but is not in roster \n Family: %s" % (_jid, family)
+                        assert iters, "%s shall be removed but is not in roster \
+                                \n Family: %s" % (_jid, family)
 
                         family_in_roster = True
@@ -540 +544 @@
                         return False
 
-                iters = self._get_contact_iter(old_big_jid, old_big_account, old_big_contact, self.model)
+                iters = self._get_contact_iter(old_big_jid, old_big_account, old_big_contact,
+                        self.model)
                 assert len(iters) > 0, "Old Big Brother %s is not in roster anymore" % old_big_jid
                 assert not self.model.iter_children(iters[0]),\
@@ -551 +556 @@
                 ok = self._remove_entity(old_big_contact, old_big_account)
                 assert ok, "Old Big Brother %s not removed" % old_big_jid
-                assert len(self._get_contact_iter(old_big_jid, old_big_account, old_big_contact, self.model)) == 0,\
+                assert len(self._get_contact_iter(old_big_jid, old_big_account, old_big_contact,
+                        self.model)) == 0,\
                         "Old Big Brother %s is removed but still in roster" % old_big_jid
                         
@@ -1220 +1226 @@
                 return False
 
-################################################################################
+##############################################################################
 ### Roster and Modelfilter handling
-################################################################################                        
+##############################################################################                  
                 
         def _search_roster_func(self, model, column, key, iter):
@@ -2048 +2054 @@
                 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
+                        # 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, \
@@ -3482 +3489 @@
 
         def on_model_row_has_child_toggled(self, model, path, iter):
-                '''This signal is emitted when a row has gotten the first child row or lost its last child row.
+                '''Called when a row has gotten the first or lost its last child row.
+
                 Expand Parent if necessary.
                 '''
@@ -5752 +5760 @@
                 self._music_track_changed_signal = None
                 gajim.interface.msg_win_mgr = MessageWindowMgr(self.window, self.hpaned)
-                gajim.interface.msg_win_mgr.connect('window-delete', self.on_message_window_delete)
+                gajim.interface.msg_win_mgr.connect('window-delete',
+                        self.on_message_window_delete)
                 self.advanced_menus = [] # We keep them to destroy them
                 if gajim.config.get('roster_window_skip_taskbar'):
@@ -5799 +5808 @@
                 self.modelfilter = self.model.filter_new()
                 self.modelfilter.set_visible_func(self._visible_func)
-                
-                
-                self.modelfilter.connect('row-has-child-toggled', self.on_model_row_has_child_toggled)
+                self.modelfilter.connect('row-has-child-toggled',
+                        self.on_model_row_has_child_toggled)
+                self.tree.set_model(self.modelfilter)
                 # Workaroung: For strange reasons signal is behaving like row-changed
                 self._toggeling_row = False
-                
-                self.tree.set_model(self.modelfilter)
 
                 # when this value become 0 we quit main application. If it's more than 0
@@ -5838 +5845 @@
                 for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'):
                         uf_show = helpers.get_uf_show(show)
-                        liststore.append([uf_show, gajim.interface.jabber_state_images['16'][show], show,
-                                True])
+                        liststore.append([uf_show, gajim.interface.jabber_state_images['16'][show],
+                                show, True])
                 # Add a Separator (self._iter_is_separator() checks on string SEPARATOR)
                 liststore.append(['SEPARATOR', None, '', True])