[sip-comm-cvs] CVS update: /sip-communicator/test/net/java/sip/communicator/slick/protocol/yahoo/, /sip-communicator/src/net/java/sip/communicator/impl/protocol/icq/

damencho at dev.java.net damencho at dev.java.net
Fri Apr 13 16:37:11 CEST 2007


User: damencho
Date: 2007-04-13 14:37:11+0000
Modified:
   sip-communicator/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
   sip-communicator/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java

Log:
 Icq message encoding.

File Changes:

Directory: /sip-communicator/test/net/java/sip/communicator/slick/protocol/yahoo/
=================================================================================

File [changed]: TestOperationSetPresence.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java?r1=1.12&r2=1.13
Delta lines:  +8 -0
-------------------
--- TestOperationSetPresence.java	2007-04-13 12:20:38+0000	1.12
+++ TestOperationSetPresence.java	2007-04-13 14:37:08+0000	1.13
@@ -417,6 +417,14 @@
             // remove it
             operationSetPresence1.unsubscribe(subEvt.getSourceContact());
             
+            // wait remove to be finished
+            Object lock = new Object();
+            synchronized(lock){
+                try{
+                    lock.wait(3000);
+                }catch (Exception e){}
+            }
+            
             // add it
             operationSetPresence1.addSubsciptionListener(subEvtCollector);
             subEvtCollector.collectedEvents.clear();

Directory: /sip-communicator/src/net/java/sip/communicator/impl/protocol/icq/
=============================================================================

File [changed]: OperationSetBasicInstantMessagingIcqImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java?r1=1.20&r2=1.21
Delta lines:  +7 -1
-------------------
--- OperationSetBasicInstantMessagingIcqImpl.java	2007-04-06 09:08:30+0000	1.20
+++ OperationSetBasicInstantMessagingIcqImpl.java	2007-04-13 14:37:08+0000	1.21
@@ -12,6 +12,7 @@
 import net.java.sip.communicator.service.protocol.Message;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
+import net.kano.joscar.*;
 import net.kano.joscar.flapcmd.*;
 import net.kano.joscar.snac.*;
 import net.kano.joscar.snaccmd.error.*;
@@ -403,6 +404,11 @@
                 if(icqProvider.USING_ICQ)
                     retreiveOfflineMessages();
 
+                String customMessageEncoding = null;
+                if((customMessageEncoding = 
+                    System.getProperty("icq.custom.message.charset")) != null)
+                    OscarTools.setDefaultCharset(customMessageEncoding);
+                
                 // run keepalive thread
                 if(keepAliveSendTask == null)
                 {




---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe at sip-communicator.dev.java.net
For additional commands, e-mail: cvs-help at sip-communicator.dev.java.net





More information about the commits mailing list