diff options
Diffstat (limited to 'src/net/java/sip/communicator/impl')
4 files changed, 12 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java index 5e5049e..2bb8f13 100644 --- a/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java @@ -303,6 +303,9 @@ public class ContactGroupIcqImpl if(!((ContactGroup)obj).getGroupName().equals(getGroupName())) return false; + if(getProtocolProvider() != ((ContactGroup)obj).getProtocolProvider()) + return false; + //since ICQ does not support having two groups with the same name // at this point we could bravely state that the groups are the same // and not bother to compare buddies. (gotta check that though) diff --git a/src/net/java/sip/communicator/impl/protocol/msn/ContactGroupMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/ContactGroupMsnImpl.java index 7b1c831..64085a6 100644 --- a/src/net/java/sip/communicator/impl/protocol/msn/ContactGroupMsnImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/msn/ContactGroupMsnImpl.java @@ -267,6 +267,9 @@ public class ContactGroupMsnImpl if(!((ContactGroup)obj).getGroupName().equals(getGroupName())) return false; + if(getProtocolProvider() != ((ContactGroup)obj).getProtocolProvider()) + return false; + //since Msn does not support having two groups with the same name // at this point we could bravely state that the groups are the same // and not bother to compare buddies. (gotta check that though) diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ContactGroupSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ContactGroupSipImpl.java index ae1d184..f40f6b3 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/ContactGroupSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/ContactGroupSipImpl.java @@ -592,6 +592,9 @@ public class ContactGroupSipImpl || sipGroup.countSubgroups() != countSubgroups()) return false; + if(getProtocolProvider() != ((ContactGroup)obj).getProtocolProvider()) + return false; + //traverse child contacts Iterator<Contact> theirContacts = sipGroup.contacts(); diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java index 1682bd5..762694a 100644 --- a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java @@ -268,6 +268,9 @@ public class ContactGroupYahooImpl if(!((ContactGroup)obj).getGroupName().equals(getGroupName())) return false; + if(getProtocolProvider() != ((ContactGroup)obj).getProtocolProvider()) + return false; + //since Yahoo does not support having two groups with the same name // at this point we could bravely state that the groups are the same // and not bother to compare buddies. (gotta check that though) |