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

damencho at dev.java.net damencho at dev.java.net
Tue Apr 17 15:01:49 CEST 2007


User: damencho
Date: 2007-04-17 13:01:49+0000
Modified:
   sip-communicator/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java
   sip-communicator/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java

Log:
 Fix Aim offline icon and aim searching screennames.

File Changes:

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

File [changed]: ContactGroupIcqImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java?r1=1.16&r2=1.17
Delta lines:  +1 -1
-------------------
--- ContactGroupIcqImpl.java	2007-04-06 09:08:30+0000	1.16
+++ ContactGroupIcqImpl.java	2007-04-17 13:01:46+0000	1.17
@@ -433,7 +433,7 @@
         {
             ContactIcqImpl item = (ContactIcqImpl) contacts.next();
             if(item.getJoustSimBuddy().getScreenname().getFormatted()
-                .equals(screenName))
+                .equalsIgnoreCase(screenName))
                 return item;
         }
         return null;

File [changed]: ContactIcqImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java?r1=1.20&r2=1.21
Delta lines:  +12 -3
--------------------
--- ContactIcqImpl.java	2007-03-12 10:01:55+0000	1.20
+++ ContactIcqImpl.java	2007-04-17 13:01:46+0000	1.21
@@ -4,6 +4,7 @@
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.icqconstants.*;
+import net.java.sip.communicator.service.protocol.aimconstants.*;
 import net.kano.joustsim.oscar.oscar.service.ssi.*;
 
 /**
@@ -16,7 +17,7 @@
     Buddy joustSimBuddy = null;
     private boolean isLocal = false;
     private byte[] image = null;
-    private PresenceStatus icqStatus = IcqStatusEnum.OFFLINE;
+    private PresenceStatus icqStatus = null;
     private ServerStoredContactListIcqImpl ssclCallback = null;
     private boolean isPersistent = false;
     private boolean isResolved = false;
@@ -169,6 +170,14 @@
      */
     public PresenceStatus getPresenceStatus()
     {
+        if(icqStatus == null)
+        {
+            if(ssclCallback.getParentProvider().USING_ICQ)
+                return IcqStatusEnum.OFFLINE;
+            else
+                return AimStatusEnum.OFFLINE;
+        }
+        else
         return icqStatus;
     }
 




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