Change in msn lib. fixing windows connect problem.

9 files changed, 29 insertions, 10 deletions

diff --git a/build.xml b/build.xml
index 13ae0c3..28fb0eb 100644
--- a/build.xml
+++ b/build.xml
@@ -662,7 +662,7 @@
                  as a test environment-->
             <sysproperty key="felix.config.properties"
                 value="file:./lib/felix.unit.test.properties"/>
-
+                
             <!-- Tell the slick runner where to store test results. -->
             <sysproperty key="net.java.sip.communicator.slick.runner.OUTPUT_DIR"
                 value="${test.reports.dir}"/>
@@ -1214,7 +1214,6 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/msn"
                 prefix="net/java/sip/communicator/impl/protocol/msn"/>
             <zipfileset src="${lib.noinst}/jml-1.0b1.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/cindy.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/commons-logging.jar" prefix=""/>
             <zipfileset dir="resources/images/msn"
                             prefix="resources/images/msn"/>
@@ -1230,7 +1229,6 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/msn"
                 prefix="net/java/sip/communicator/slick/protocol/msn"/>
             <zipfileset src="${lib.noinst}/jml-1.0b1.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/cindy.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/commons-logging.jar" prefix=""/>
         </jar>
     </target>
diff --git a/lib/installer-exclude/cindy.jar b/lib/installer-exclude/cindy.jar
deleted file mode 100644
index fd729fd..0000000
--- a/lib/installer-exclude/cindy.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jml-1.0b1.jar b/lib/installer-exclude/jml-1.0b1.jar
index 3ddc421..4563751 100644
--- a/lib/installer-exclude/jml-1.0b1.jar
+++ b/lib/installer-exclude/jml-1.0b1.jar
diff --git a/resources/install/logging.properties b/resources/install/logging.properties
index e77a0cf..44171bc 100644
--- a/resources/install/logging.properties
+++ b/resources/install/logging.properties
@@ -77,4 +77,4 @@ net.java.sip.communicator.impl.gui.level = INFO
 com.xyz.foo.level = SEVERE
 sun.awt.level = INFO
 java.awt.level = INFO
-
+javax.swing.level = INFO
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ContactJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ContactJabberImpl.java
index 4865f67..693828c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ContactJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ContactJabberImpl.java
@@ -9,6 +9,7 @@ package net.java.sip.communicator.impl.protocol.jabber;
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smackx.packet.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.service.protocol.jabberconstants.*;
 
 /**
@@ -18,6 +19,9 @@ import net.java.sip.communicator.service.protocol.jabberconstants.*;
 public class ContactJabberImpl
     implements Contact
 {
+    private static final Logger logger = Logger.getLogger(ContactJabberImpl.class);
+
+    
     private RosterEntry rosterEntry = null;
     private boolean isLocal = false;
     private byte[] image = null;
@@ -300,7 +304,11 @@ public class ContactJabberImpl
             
             return card.getAvatar();
         }
-        catch (XMPPException e) {}
+        catch (Exception e) 
+        {
+            logger.error("Cannot load image for contact " + 
+                this + " : " + e.getMessage());
+        }
         
         return null;
     }
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java b/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java
index 73e4299..fa724a2 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java
@@ -8,12 +8,14 @@ package net.java.sip.communicator.impl.protocol.msn;
 
 import java.util.*;
 
-import net.sf.cindy.*;
 import net.sf.jml.*;
 import net.sf.jml.impl.*;
 import net.sf.jml.protocol.*;
 import net.sf.jml.protocol.incoming.*;
 import net.java.sip.communicator.util.Logger;
+import net.sf.jml.net.Message;
+import net.sf.jml.net.SessionAdapter;
+import net.sf.jml.net.SocketSession;
 
 /**
  * Manager which listens for changing of the contact list
@@ -70,7 +72,7 @@ public class EventManager
      * @param message Message
      * @throws Exception
      */
-    public void messageSent(Session session, Message message) throws Exception
+    public void messageSent(SocketSession session, Message message) throws Exception
     {
         logger.trace(msnMessenger.getOwner().getEmail().getEmailAddress() +
                      " outgoing " + message);
@@ -82,7 +84,7 @@ public class EventManager
      * @param message Message
      * @throws Exception
      */
-    public void messageReceived(Session session, Message message)
+    public void messageReceived(SocketSession session, Message message)
         throws Exception
     {
         MsnIncomingMessage incoming = (MsnIncomingMessage)((WrapperMessage)message)
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java
index 2568b9c..9f5968a 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java
@@ -1,3 +1,4 @@
+
 /*
  * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
  *
@@ -9,7 +10,6 @@ package net.java.sip.communicator.impl.protocol.msn;
 import java.nio.channels.*;
 import java.util.*;
 
-import net.java.sip.communicator.impl.protocol.gibberish.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/VolatileContact.java b/src/net/java/sip/communicator/impl/protocol/msn/VolatileContact.java
index 0ff2a85..31219ee 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/VolatileContact.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/VolatileContact.java
@@ -1,3 +1,4 @@
+
 /*
  * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
  *
@@ -53,4 +54,6 @@ public class VolatileContact
     public String getOldDisplayName(){return "";}
 
     public MsnUserStatus getOldStatus(){return null;}
+
+    public String getPersonalMessage(){return "";}
 }
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java
index 93bc022..2913a66 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java
@@ -320,7 +320,7 @@ public class TestOperationSetPresence
     {
         try
         {
-            Thread.currentThread().sleep(1500);
+            Thread.currentThread().sleep(3000);
         }
         catch (InterruptedException ex)
         {
@@ -512,6 +512,14 @@ public class TestOperationSetPresence
         {
             // happens if the user is already subscribed
         }
+        
+        Object lock = new Object();
+        synchronized(lock)
+        {
+            logger.info("Will wait all subscriptioin events to be received by lib");
+            lock.wait(3000);
+            logger.info("Stopped waiting");
+        }
     }
 
     /**