Fixing avatar retrieves.

src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java

@@ -502,14 +502,10 @@ public byte[] getAvatar(boolean isLazy)
         if (!isLazy)
             return getAvatar();
 
-        if(cachedAvatar != null)
+        if(cachedAvatar != null
+           && cachedAvatar.length > 0)
         {
-            if(cachedAvatar.length == 0)
-            {
-                //means we already tried and there was no locally stored
-                //avatar either.
-                return null;
-            }
+            //we already have an avatar.
             return cachedAvatar;
         }
 
@@ -533,10 +529,6 @@ public byte[] getAvatar(boolean isLazy)
                 return cachedAvatar;
         }
 
-        //we don't want to open local files on every cell render so this is our
-        //way of saying that we already tried the local storage.
-        cachedAvatar = new byte[0];
-
         return null;
     }
 

src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java

@@ -485,7 +485,7 @@ private void updateGlobalStatus()
         Iterator pProviders = mainFrame.getProtocolProviders();
 
         boolean isProtocolHidden;
-System.out.println("PROTOCOL PROVIDERRRSSSSSSSSSSSSSSSSSSS ============" + pProviders.hasNext());
+
         while (pProviders.hasNext())
         {
             ProtocolProviderService protocolProvider