Changeset 6354

Timestamp:

05/24/06 20:17:51 (2 years ago)

Author:

dkirov

Message:

prevent loop when adding metacontact to roster
(fixes #1953 and maybe #1991)

Files:

• branches/gajim_0.10/src/roster_window.py (modified) (1 diff)
• trunk/src/roster_window.py (modified) (2 diffs)

branches/gajim_0.10/src/roster_window.py

@@ -242 +242 @@
                 family = gajim.contacts.get_metacontacts_family(account, jid)
 
-                shown_family = [] # family members that are in roster.
+                # family members that are in roster and belong to the same account.
+                shown_family = [] 
                 if family:
                         for data in family:
+                                _account = data['account']
+                                if _account != account:
+                                        continue
                                 _jid = data['jid']
-                                _account = data['account']
+                                
                                 if self.get_contact_iter(_jid, _account):
                                         shown_family.append(data)

trunk/src/roster_window.py

@@ -240 +240 @@
                 family = gajim.contacts.get_metacontacts_family(account, jid)
 
-                shown_family = [] # family members that are in roster.
+                # family members that are in roster and belong to the same account.
+                shown_family = [] 
                 if family:
                         for data in family:
+                                _account = data['account']
+                                #XXX When we support metacontacts from different servers, make 
+                                # sure that loop from #1953 is fixed and remove next 2 lines!
+                                if _account != account:
+                                        continue
                                 _jid = data['jid']
-                                _account = data['account']
+                                
                                 if self.get_contact_iter(_jid, _account):
                                         shown_family.append(data)
@@ -2251 +2257 @@
         
         def on_new_chat_menuitem_activate(self, widget, account):
-                dialogs.NewChatDialog(account)  
+                dialogs.NewChatDialog(account)
 
         def on_contents_menuitem_activate(self, widget):