Fix Aim offline icon and aim searching screennames.

2 files changed, 13 insertions, 4 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java
index 102cb05..c1f03f8 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java
@@ -433,7 +433,7 @@ public class ContactGroupIcqImpl
         {
             ContactIcqImpl item = (ContactIcqImpl) contacts.next();
             if(item.getJoustSimBuddy().getScreenname().getFormatted()
-                .equals(screenName))
+                .equalsIgnoreCase(screenName))
                 return item;
         }
         return null;
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java
index acc0587..bfbee5e 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java
@@ -4,6 +4,7 @@ import java.util.*;
 
 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 @@ public class ContactIcqImpl
     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,7 +170,15 @@ public class ContactIcqImpl
      */
     public PresenceStatus getPresenceStatus()
     {
-        return icqStatus;
+        if(icqStatus == null)
+        {
+            if(ssclCallback.getParentProvider().USING_ICQ)
+                return IcqStatusEnum.OFFLINE;
+            else
+                return AimStatusEnum.OFFLINE;
+        }
+        else
+            return icqStatus;
     }
 
     /**
@@ -330,4 +339,4 @@ public class ContactIcqImpl
     {
         this.image = image;
     }
-}
\ No newline at end of file
+}