Fix properly resolving groups when creating contact list.

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

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);

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()

src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf~

@@ -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