From 77f9feed5213b45f28eaadf3579ea398e514ad59 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Fri, 3 Nov 2006 12:50:50 +0000
Subject: [PATCH] Fix properly resolving groups when creating contact list.

---
 lib/logging.properties                        |  4 +++
 .../msn/ServerStoredContactListMsnImpl.java   |  4 +--
 .../impl/protocol/msn/VolatileGroup.java      |  7 +++++
 .../msnaccregwizz/msnaccregwizz.manifest.mf~  | 31 -------------------
 4 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100755 src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf~

diff --git a/lib/logging.properties b/lib/logging.properties
index 7dd5f1891..78b105421 100644
--- a/lib/logging.properties
+++ b/lib/logging.properties
@@ -56,6 +56,10 @@ java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLo
 
 # We don't want trace logs from joscar and joustsim
 net.kano.level = INFO
+
+# We don't want trace logs from java-jml
+net.sf.cindy.impl.level = INFO
+
 # But we want everything coming from the sip-comm
 net.java.sip.communicator.impl.contactlist.level = FINEST
 net.java.sip.communicator.slick.level = FINEST
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java
index d9d4a6f32..46bb26518 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java
@@ -238,7 +238,6 @@ public ContactGroupMsnImpl findContactGroup(String name)
 
             if (contactGroup.getGroupName().equals(name))
                 return contactGroup;
-
         }
 
         return null;
@@ -474,7 +473,7 @@ ContactGroupMsnImpl createUnresolvedContactGroup(String groupName)
         //First create the new volatile contact;
         MsnContact[] emptyBuddies = new MsnContact[]{};
         ContactGroupMsnImpl newUnresolvedGroup = new ContactGroupMsnImpl(
-                new VolatileGroup(), emptyBuddies, this, false);
+                new VolatileGroup(groupName), emptyBuddies, this, false);
 
         this.rootGroup.addSubGroup(newUnresolvedGroup);
 
@@ -733,7 +732,6 @@ public void contactListInitCompleted(MsnMessenger messenger)
                         // if there is no such contact create it
                         contact = new ContactMsnImpl(
                             item, ServerStoredContactListMsnImpl.this, true, true);
-
                         rootGroup.addContact(contact);
 
                         fireContactAdded(rootGroup, contact);
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/VolatileGroup.java b/src/net/java/sip/communicator/impl/protocol/msn/VolatileGroup.java
index a6ec90779..480dde6b8 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/VolatileGroup.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/VolatileGroup.java
@@ -18,6 +18,13 @@ public class VolatileGroup
 {
     private String groupName = new String("NotInContactList");
 
+    VolatileGroup(){}
+
+    VolatileGroup(String groupName)
+    {
+        this.groupName = groupName;
+    }
+
     public MsnContactList getContactList(){return null;}
 
     public String getGroupId()
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf~ b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf~
deleted file mode 100755
index d90a2c052..000000000
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf~
+++ /dev/null
@@ -1,31 +0,0 @@
-Bundle-Activator: net.java.sip.communicator.plugin.msnaccregwizz.MsnAccRegWizzActivator
-Bundle-Name: Msn account registration wizard
-Bundle-Description: Msn account registration wizard.
-Bundle-Vendor: sip-communicator.org
-Bundle-Version: 0.0.1
-Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.event,
- net.java.sip.communicator.service.contactlist,
- net.java.sip.communicator.service.contactlist.event,
- net.java.sip.communicator.service.gui,
- net.java.sip.communicator.service.gui.event,
- javax.swing,
- javax.swing.event,
- javax.swing.table,
- javax.swing.text,
- javax.swing.text.html,
- javax.accessibility,
- javax.swing.plaf,
- javax.swing.plaf.metal,
- javax.swing.plaf.basic,
- javax.imageio,
- javax.swing.filechooser,
- javax.swing.tree,
- javax.swing.undo,
- javax.swing.event,
- javax.swing.border