From 7cc5f6db8080246dfd610ba51dff56cbc5fa86a2 Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Sun, 28 May 2006 15:51:28 +0000
Subject: [PATCH] Refactoring

---
 .../icq/OperationSetBasicInstantMessagingIcqImpl.java        | 5 +++--
 .../protocol/icq/OperationSetTypingNotificationsIcqImpl.java | 3 ++-
 .../impl/protocol/icq/message/auth/AuthCmdFactory.java       | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
index d8ebd465a..315ecea0b 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
@@ -256,7 +256,7 @@ public void handleResponse(SnacResponseEvent e)
                             + contactUIN);
                         //create the volatile contact
                         sourceContact = opSetPersPresence
-                            .createVolatileContact(new Screenname(contactUIN));
+                            .createVolatileContact(contactUIN);
                     }
 
                     MessageReceivedEvent msgReceivedEvt
@@ -445,7 +445,8 @@ public void gotMessage(Conversation conversation, MessageInfo minfo)
                                    + conversation.getBuddy());
                 //create the volatile contact
                 sourceContact = opSetPersPresence
-                                .createVolatileContact(conversation.getBuddy());
+                    .createVolatileContact(
+                        conversation.getBuddy().getFormatted());
 
             }
 
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetTypingNotificationsIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetTypingNotificationsIcqImpl.java
index 64e27441d..3a2f9c9d2 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetTypingNotificationsIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetTypingNotificationsIcqImpl.java
@@ -285,7 +285,8 @@ public void gotTypingState(Conversation conversation,
                              "buddy=" + conversation.getBuddy());
                 //create the volatile contact
                 sourceContact = opSetPersPresence
-                                .createVolatileContact(conversation.getBuddy());
+                    .createVolatileContact(
+                        conversation.getBuddy().getFormatted());
             }
 
             fireTypingNotificationsEvent(
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/message/auth/AuthCmdFactory.java b/src/net/java/sip/communicator/impl/protocol/icq/message/auth/AuthCmdFactory.java
index e851f26bf..9e8800388 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/message/auth/AuthCmdFactory.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/message/auth/AuthCmdFactory.java
@@ -95,8 +95,7 @@ public SnacCommand genSnacCommand(SnacPacket packet)
             // as we added it as Volatile stopped the application
             // and after that received authorization response
             if(srcContact == null)
-                srcContact = operationSetPresence.createVolatileContact(
-                    new Screenname(uin));
+                srcContact = operationSetPresence.createVolatileContact(uin);
 
 
             if (messageType == AuthOldMsgCmd.MTYPE_AUTHREQ)