Fix initial login issue with msn.

src/net/java/sip/communicator/impl/protocol/msn/ContactMsnImpl.java

@@ -18,7 +18,6 @@ public class ContactMsnImpl
     implements Contact
 {
     private MsnContact contact = null;
-    private boolean isLocal = false;
     private byte[] image = null;
     private PresenceStatus status = MsnStatusEnum.OFFLINE;
     private ServerStoredContactListMsnImpl ssclCallback = null;
@@ -40,7 +39,6 @@ public class ContactMsnImpl
                    boolean isResolved)
     {
         this.contact = contact;
-        this.isLocal = isLocal;
         this.ssclCallback = ssclCallback;
         this.isPersistent = isPersistent;
         this.isResolved = isResolved;
@@ -58,18 +56,6 @@ public String getAddress()
             return contact.getId();
     }
 
-    /**
-     * Determines whether or not this Contact instance represents the user used
-     * by this protocol provider to connect to the service.
-     *
-     * @return true if this Contact represents us (the local user) and false
-     * otherwise.
-     */
-    public boolean isLocal()
-    {
-        return isLocal;
-    }
-
     public byte[] getImage()
     {
         if(image == null)
@@ -165,7 +151,7 @@ public PresenceStatus getPresenceStatus()
      */
     public String getDisplayName()
     {
-        String name = contact.getDisplayName();
+        String name = contact.getFriendlyName();
 
         if (name == null)
             name = getAddress();

src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java

@@ -891,7 +891,7 @@ public void contactRemovedMe(MsnMessenger messenger, MsnContact contact)
         {
         }
 
-        public void contactAddCompleted1(MsnMessenger messenger, MsnContact contact)
+        public void contactAddCompleted(MsnMessenger messenger, MsnContact contact)
         {
             String contactID = contact.getEmail().getEmailAddress();
             
@@ -906,7 +906,7 @@ public void contactAddCompleted1(MsnMessenger messenger, MsnContact contact)
             }
         }
         
-        public void contactRemoveCompleted1(MsnMessenger messenger, MsnContact contact)
+        public void contactRemoveCompleted(MsnMessenger messenger, MsnContact contact)
         {
             ContactMsnImpl contactToRemove =
                 findContactById(contact.getEmail().getEmailAddress());