fixes #3190 (ICQ: add phone number to ICQ info)

5 files changed, 23 insertions, 14 deletions

diff --git a/protocols/ICQ-WIM/res/resources.rc b/protocols/ICQ-WIM/res/resources.rc
index fb02a5186a..525be92c6b 100644
--- a/protocols/ICQ-WIM/res/resources.rc
+++ b/protocols/ICQ-WIM/res/resources.rc
@@ -77,18 +77,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_INBOX               ICON                    "Mail.ico"
-
-IDI_MAIL_NOTIFY         ICON                    "MailNotify.ico"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Dialog
 //
 
@@ -181,6 +169,8 @@ BEGIN
     EDITTEXT        IDC_MEMBERSINCE,74,71,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT           "Last seen:",IDC_STATIC,5,32,63,8
     EDITTEXT        IDC_LASTSEEN,74,32,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT           "Phone number:",IDC_STATIC,5,84,63,8
+    EDITTEXT        IDC_PHONE,74,84,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
 END
 
 IDD_LOGINPW DIALOGEX 0, 0, 157, 70
@@ -282,6 +272,18 @@ BEGIN
 END
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_INBOX               ICON                    "Mail.ico"
+
+IDI_MAIL_NOTIFY         ICON                    "MailNotify.ico"
+
+
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/protocols/ICQ-WIM/src/resource.h b/protocols/ICQ-WIM/src/resource.h
index 01bf0841b2..ed08e3b312 100644
--- a/protocols/ICQ-WIM/src/resource.h
+++ b/protocols/ICQ-WIM/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by w:\miranda-ng\protocols\ICQ-WIM\res\resources.rc
+// Used by W:\miranda-ng\protocols\ICQ-WIM\res\resources.rc
 //
 #define IDD_OPTIONS_FULL                101
 #define IDD_OPTIONS_ACCMGR              102
@@ -28,6 +28,7 @@
 #define IDC_MEMBERSINCE                 1013
 #define IDC_LASTSEEN                    1014
 #define IDC_SAVEPASS                    1015
+#define IDC_MEMBERSINCE2                1015
 #define IDC_LIST                        1016
 #define IDC_DIFF1                       1017
 #define IDC_SPIN1                       1018
diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp
index 8ebfd4a337..43d7369a2c 100644
--- a/protocols/ICQ-WIM/src/server.cpp
+++ b/protocols/ICQ-WIM/src/server.cpp
@@ -367,7 +367,7 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact, boo
 
 	Json2string(hContact, buddy, "emailId", "Email", bIsPartial);
 	Json2string(hContact, buddy, "cellNumber", "Cellular", bIsPartial);
-	Json2string(hContact, buddy, "phoneNumber", "Phone", bIsPartial);
+	Json2string(hContact, buddy, "phoneNumber", DB_KEY_PHONE, bIsPartial);
 	Json2string(hContact, buddy, "workNumber", "CompanyPhone", bIsPartial);
 
 	Json2int(hContact, buddy, "official", "Official", bIsPartial);
@@ -1130,6 +1130,10 @@ void CIcqProto::OnStartSession(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *)
 	m_fetchBaseURL = data["fetchBaseURL"].as_mstring();
 	m_aimsid = data["aimsid"].as_mstring();
 
+	CMStringW wszPhone(data["attachedPhoneNumber"].as_mstring());
+	if (!wszPhone.IsEmpty())
+		setWString(DB_KEY_PHONE, wszPhone);
+
 	int srvTS = data["ts"].as_int();
 	m_iTimeShift = (srvTS) ? time(0) - srvTS : 0;
 
diff --git a/protocols/ICQ-WIM/src/stdafx.h b/protocols/ICQ-WIM/src/stdafx.h
index 6afc028767..c5c4f0dc7e 100644
--- a/protocols/ICQ-WIM/src/stdafx.h
+++ b/protocols/ICQ-WIM/src/stdafx.h
@@ -84,6 +84,7 @@
 #define DB_KEY_ID "aimId"
 #define DB_KEY_IDLE "IdleTS"
 #define DB_KEY_ABOUT "About"
+#define DB_KEY_PHONE "Phone"
 #define DB_KEY_ATOKEN "AToken"
 #define DB_KEY_ICQNICK "IcqNick"
 #define DB_KEY_PHONEREG "PhoneReg"
diff --git a/protocols/ICQ-WIM/src/userinfo.cpp b/protocols/ICQ-WIM/src/userinfo.cpp
index a49ead876a..887d9c2d92 100644
--- a/protocols/ICQ-WIM/src/userinfo.cpp
+++ b/protocols/ICQ-WIM/src/userinfo.cpp
@@ -34,6 +34,7 @@ struct IcqUserInfoDlg : public CUserInfoPageDlg
 	{
 		SetDlgItemTextW(m_hwnd, IDC_UIN, ppro->GetUserId(m_hContact));
 		SetDlgItemTextW(m_hwnd, IDC_NICK, ppro->getMStringW(m_hContact, DB_KEY_ICQNICK));
+		SetDlgItemTextW(m_hwnd, IDC_PHONE, ppro->getMStringW(m_hContact, DB_KEY_PHONE));
 
 		SetDlgItemTextW(m_hwnd, IDC_IDLETIME, time2text(ppro->getDword(m_hContact, DB_KEY_IDLE)));
 		SetDlgItemTextW(m_hwnd, IDC_LASTSEEN, time2text(ppro->getDword(m_hContact, DB_KEY_LASTSEEN)));