From a7fb9cd18953b164f8d0e83941a366ffe19af5d0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 27 Nov 2023 21:18:25 +0300 Subject: =?UTF-8?q?fixes=20#3968=20(ICQ:=20=D0=BD=D0=B5=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D1=83=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D1=8E=D0=B7=D0=B5=D1=80=D0=B8=D0=BD=D1=84?= =?UTF-8?q?=D0=BE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/ICQ-WIM/res/resources.rc | 22 +++++++++------------- protocols/ICQ-WIM/src/proto.cpp | 1 - protocols/ICQ-WIM/src/resource.h | 2 -- protocols/ICQ-WIM/src/server.cpp | 1 - protocols/ICQ-WIM/src/stdafx.h | 2 -- protocols/ICQ-WIM/src/userinfo.cpp | 2 -- 6 files changed, 9 insertions(+), 21 deletions(-) (limited to 'protocols') diff --git a/protocols/ICQ-WIM/res/resources.rc b/protocols/ICQ-WIM/res/resources.rc index 5fd755fdb6..7af238004a 100644 --- a/protocols/ICQ-WIM/res/resources.rc +++ b/protocols/ICQ-WIM/res/resources.rc @@ -157,19 +157,15 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "UIN:",IDC_STATIC,5,7,63,8 - EDITTEXT IDC_UIN,74,7,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Online since:",IDC_STATIC,5,45,63,8 - EDITTEXT IDC_ONLINESINCE,74,45,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Idle since:",IDC_STATIC,5,58,63,8 - EDITTEXT IDC_IDLETIME,74,58,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Nick:",IDC_STATIC,5,19,63,8 - EDITTEXT IDC_NICK,74,19,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Member since:",IDC_STATIC,5,71,63,8 - 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 + EDITTEXT IDC_UIN,74,6,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Nick:",IDC_STATIC,5,21,63,8 + EDITTEXT IDC_NICK,74,20,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Last seen:",IDC_STATIC,5,63,63,22 + EDITTEXT IDC_LASTSEEN,74,62,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Online since:",IDC_STATIC,5,49,63,8 + EDITTEXT IDC_ONLINESINCE,74,48,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Phone number:",IDC_STATIC,5,35,63,8 + EDITTEXT IDC_PHONE,74,34,139,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP END IDD_LOGINPW DIALOGEX 0, 0, 157, 70 diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp index 7ea15fc1bd..15fc7310cb 100644 --- a/protocols/ICQ-WIM/src/proto.cpp +++ b/protocols/ICQ-WIM/src/proto.cpp @@ -58,7 +58,6 @@ CIcqProto::CIcqProto(const char *aProtoName, const wchar_t *aUserName) : m_bErrorPopups(this, "ShowErrorPopups", true), m_bLaunchMailbox(this, "LaunchMailbox", true) { - db_set_resident(m_szModuleName, DB_KEY_IDLE); db_set_resident(m_szModuleName, DB_KEY_ONLINETS); m_isMra = !stricmp(Proto_GetAccount(m_szModuleName)->szProtoName, "MRA"); diff --git a/protocols/ICQ-WIM/src/resource.h b/protocols/ICQ-WIM/src/resource.h index 0fb507d56d..c0987e795e 100644 --- a/protocols/ICQ-WIM/src/resource.h +++ b/protocols/ICQ-WIM/src/resource.h @@ -23,9 +23,7 @@ #define IDC_SENDSMS 1008 #define IDC_CODE 1009 #define IDC_ONLINESINCE 1010 -#define IDC_IDLETIME 1011 #define IDC_NICK 1012 -#define IDC_MEMBERSINCE 1013 #define IDC_LASTSEEN 1014 #define IDC_SAVEPASS 1015 #define IDC_MEMBERSINCE2 1015 diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index deb86738ec..c27e1f4429 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -425,7 +425,6 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact, boo Json2int(hContact, buddy, "official", "Official", bIsPartial); Json2int(hContact, buddy, "idleTime", "IdleTS", bIsPartial); - Json2int(hContact, buddy, "memberSince", DB_KEY_MEMBERSINCE, bIsPartial); int iStatus = StatusFromPresence(buddy, hContact); if (iStatus > 0) diff --git a/protocols/ICQ-WIM/src/stdafx.h b/protocols/ICQ-WIM/src/stdafx.h index 27b02cd679..b27b08bece 100644 --- a/protocols/ICQ-WIM/src/stdafx.h +++ b/protocols/ICQ-WIM/src/stdafx.h @@ -85,7 +85,6 @@ #define MODULENAME "ICQ" #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" @@ -98,7 +97,6 @@ #define DB_KEY_LASTMSGID "LastMsgId" #define DB_KEY_REMOTEREAD "RemoteReadId" #define DB_KEY_SESSIONKEY "SessionKey" -#define DB_KEY_MEMBERSINCE "MemberSince" #include "http.h" #include "proto.h" diff --git a/protocols/ICQ-WIM/src/userinfo.cpp b/protocols/ICQ-WIM/src/userinfo.cpp index 2bada55d29..a48b2d0c58 100644 --- a/protocols/ICQ-WIM/src/userinfo.cpp +++ b/protocols/ICQ-WIM/src/userinfo.cpp @@ -47,8 +47,6 @@ struct IcqUserInfoDlg : public CUserInfoPageDlg db_free(&dbv); } - SetDlgItemTextW(m_hwnd, IDC_IDLETIME, time2text(ppro->getDword(m_hContact, DB_KEY_IDLE))); - SetDlgItemTextW(m_hwnd, IDC_MEMBERSINCE, time2text(ppro->getDword(m_hContact, DB_KEY_MEMBERSINCE))); return false; } }; -- cgit v1.2.3