From 11348b44519e3db97b50618967ef55fa075bbcd3 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Wed, 27 Sep 2006 14:32:44 +0000
Subject: [PATCH] Added set nickname even if null from server

---
 .../impl/protocol/icq/ServerStoredContactListIcqImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ServerStoredContactListIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ServerStoredContactListIcqImpl.java
index f257c7bc6..652d0a96a 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ServerStoredContactListIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ServerStoredContactListIcqImpl.java
@@ -632,7 +632,8 @@ public void moveContact(ContactIcqImpl contact,
                             ContactGroupIcqImpl newParent)
     {
         List contactsToMove = new ArrayList();
-        contactsToMove.add(contact);
+
+        contactsToMove.add(contact.getJoustSimBuddy());
 
         buddyList.moveBuddies(contactsToMove,
                               newParent.getJoustSimSourceGroup());
@@ -1222,6 +1223,8 @@ public void run()
                                 PROPERTY_DISPLAY_NAME, contact,
                                 oldNickname, nickName);
                         }
+                        else
+                            contact.setNickname(oldNickname);
                     }
                 }
             }