ICQ-WIM: no need to wipe out Nick field

2 files changed, 8 insertions, 2 deletions

diff --git a/protocols/ICQ-WIM/src/poll.cpp b/protocols/ICQ-WIM/src/poll.cpp
index c42bb10b93..9296b90090 100644
--- a/protocols/ICQ-WIM/src/poll.cpp
+++ b/protocols/ICQ-WIM/src/poll.cpp
@@ -197,7 +197,10 @@ void CIcqProto::ProcessImState(const JSONNode &ev)
 
 void CIcqProto::ProcessMyInfo(const JSONNode &ev)
 {
-	Json2string(0, ev, "friendly", "Nick");
+	const JSONNode &var = ev["friendly"];
+	if (var)
+		setWString("Nick", var.as_mstring());
+
 	CheckAvatarChange(0, ev);
 }
 
diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp
index 14c94444bc..e7add0cec7 100644
--- a/protocols/ICQ-WIM/src/server.cpp
+++ b/protocols/ICQ-WIM/src/server.cpp
@@ -261,7 +261,10 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact)
 	CMStringW str(buddy["state"].as_mstring());
 	setDword(hContact, "Status", StatusFromString(str));
 
-	Json2string(hContact, buddy, "friendly", "Nick");
+	const JSONNode &var = buddy["friendly"];
+	if (var)
+		setWString(hContact, "Nick", var.as_mstring());
+
 	Json2string(hContact, buddy, "emailId", "Email");
 	Json2string(hContact, buddy, "cellNumber", "Cellular");
 	Json2string(hContact, buddy, "phoneNumber", "Phone");