Changeset 9884

Timestamp:

07/05/08 08:33:49 (5 months ago)

Author:

steve-e

Message:

Correctly count metacontacts in non merged accounts mode if we have metacontacts over several accounts.

Location:

trunk/src

Files:

• common/contacts.py (modified) (2 diffs)
• roster_window.py (modified) (1 diff)

trunk/src/common/contacts.py

@@ -327 +327 @@
                                         # do not count transports
                                         continue
-                                if self.has_brother(account, jid) and not \
-                                self.is_big_brother(account, jid):
+                                if self.has_brother(account, jid, accounts) and not \
+                                self.is_big_brother(account, jid, accounts):
                                         # count metacontacts only once
                                         continue
@@ -403 +403 @@
                                 break
 
-        def has_brother(self, account, jid):
+        def has_brother(self, account, jid, accounts):
                 tag = self.get_metacontacts_tag(account, jid)
                 if not tag:
                         return False
-                meta_jids = self.get_metacontacts_jids(tag)
+                meta_jids = self.get_metacontacts_jids(tag, accounts)
                 return len(meta_jids) > 1 or len(meta_jids[account]) > 1
 
-        def is_big_brother(self, account, jid):
+        def is_big_brother(self, account, jid, accounts):
                 family = self.get_metacontacts_family(account, jid)
                 if family:
-                        bb_data = self.get_metacontacts_big_brother(family)
+                        nearby_family = [data for data in family
+                                if account in accounts]
+                        bb_data = self.get_metacontacts_big_brother(nearby_family)
                         if bb_data['jid'] == jid and bb_data['account'] == account: 
                                 return True
                 return False
 
-        def get_metacontacts_jids(self, tag):
+        def get_metacontacts_jids(self, tag, accounts):
                 '''Returns all jid for the given tag in the form {acct: [jid1, jid2],.}'''
                 answers = {}
                 for account in self._metacontacts_tags:
                         if tag in self._metacontacts_tags[account]:
+                                if account not in accounts:
+                                        continue
                                 answers[account] = []
                                 for data in self._metacontacts_tags[account][tag]:

trunk/src/roster_window.py

@@ -3786 +3786 @@
 
                 # Is the contact we drag a meta contact?
-                is_big_brother = gajim.contacts.is_big_brother(account_source, jid_source)
+                accounts = (self.regroup and gajim.contacts.get_accounts()) or account_source
+                is_big_brother = gajim.contacts.is_big_brother(account_source, jid_source, accounts)
 
                 # Contact drop on group row or between two contacts