aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/contactlist
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2012-01-20 15:07:44 +0000
committerDamian Minkov <damencho@jitsi.org>2012-01-20 15:07:44 +0000
commit6694c671582585f4b562bbae6027a52f24eaa141 (patch)
tree0f95fa301ab9ca20f35881e5809df7e750fadaca /src/net/java/sip/communicator/impl/contactlist
parente04cc73c114e860940e7195708512e7710f0ac0d (diff)
downloadjitsi-6694c671582585f4b562bbae6027a52f24eaa141.zip
jitsi-6694c671582585f4b562bbae6027a52f24eaa141.tar.gz
jitsi-6694c671582585f4b562bbae6027a52f24eaa141.tar.bz2
Fixes proper event fire in case of re-using existing empty meta group for adding a protocol group.
Diffstat (limited to 'src/net/java/sip/communicator/impl/contactlist')
-rw-r--r--src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
index ce89a3d..387fa90 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
@@ -2534,13 +2534,18 @@ public class MetaContactListServiceImpl
+ evt.getSourceGroup().getGroupName() + "should be placed.");
}
+ // check whether the meta group was already existing before
+ // adding proto-groups to it
+ boolean isExisting = parentMetaGroup.getMetaContactSubgroup(
+ evt.getSourceGroup().getGroupName()) != null;
+
// add parent group to the ServerStoredGroupEvent
MetaContactGroup newMetaGroup
= handleGroupCreatedEvent(parentMetaGroup, evt.getSourceGroup());
//if this was the first contact group in the meta group fire an
//ADDED event. otherwise fire a modification event.
- if(newMetaGroup.countContactGroups() > 1)
+ if(newMetaGroup.countContactGroups() > 1 || isExisting)
{
fireMetaContactGroupEvent(
newMetaGroup