diff options
| author | George Hazan <ghazan@miranda.im> | 2019-01-23 13:16:35 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-01-23 13:16:35 +0300 |
| commit | f0e5f631450925938fba4d50e1d6f01d85adc712 (patch) | |
| tree | 0b152c7a34538701a6e4beade751f4c197890367 /protocols/ICQ-WIM/src | |
| parent | f5980308df254aa17a9f5d94a980fb888b6c193f (diff) | |
ICQ-WIM:
- fixes #1716 (ICQ10: add to account manager "register or login by phone number" link)
- fixes #1744 (ICQ10: pressing OK in settings rewrites registration settings)
Diffstat (limited to 'protocols/ICQ-WIM/src')
| -rw-r--r-- | protocols/ICQ-WIM/src/options.cpp | 11 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/proto.cpp | 2 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/stdafx.h | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/protocols/ICQ-WIM/src/options.cpp b/protocols/ICQ-WIM/src/options.cpp index 3ff4494232..4b2bd88035 100644 --- a/protocols/ICQ-WIM/src/options.cpp +++ b/protocols/ICQ-WIM/src/options.cpp @@ -148,7 +148,7 @@ void CIcqProto::OnLoginViaPhone(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *pRe setString(DB_KEY_SESSIONKEY, m_szSessionKey); m_dwUin = _wtoi(data["loginId"].as_mstring()); - setByte("PhoneReg", 1); + setByte(DB_KEY_PHONEREG, 1); } ///////////////////////////////////////////////////////////////////////////////////////// @@ -186,7 +186,7 @@ public: if (wszOldPass != ptrW(edtPassword.GetText())) { m_proto->delSetting(DB_KEY_ATOKEN); m_proto->delSetting(DB_KEY_SESSIONKEY); - m_proto->delSetting("PhoneReg"); + m_proto->delSetting(DB_KEY_PHONEREG); } return true; } @@ -195,11 +195,8 @@ public: { CIcqRegistrationDlg dlg(m_proto); dlg.SetParent(m_hwnd); - if (dlg.DoModal()) { - edtUin.SetInt(m_proto->getDword(DB_KEY_UIN)); - edtPassword.SetText(L""); - wszOldPass.Empty(); - } + if (dlg.DoModal()) // force exit to avoid data corruption + PostMessage(m_hwndParent, WM_COMMAND, MAKELONG(IDCANCEL, BN_CLICKED), 0); } }; diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp index 90d1259fdd..ed713f3983 100644 --- a/protocols/ICQ-WIM/src/proto.cpp +++ b/protocols/ICQ-WIM/src/proto.cpp @@ -408,7 +408,7 @@ int CIcqProto::SetStatus(int iNewStatus) return 0; } - if (!getByte("PhoneReg") && mir_wstrlen(m_szPassword) == 0) { + if (!getByte(DB_KEY_PHONEREG) && mir_wstrlen(m_szPassword) == 0) { debugLogA("Thread ended, password is not configured"); ConnectionFailed(LOGINERR_BADUSERID); return 0; diff --git a/protocols/ICQ-WIM/src/stdafx.h b/protocols/ICQ-WIM/src/stdafx.h index 59e77234f8..ed564a18f0 100644 --- a/protocols/ICQ-WIM/src/stdafx.h +++ b/protocols/ICQ-WIM/src/stdafx.h @@ -82,6 +82,7 @@ #define DB_KEY_UIN "UIN" #define DB_KEY_ATOKEN "AToken" +#define DB_KEY_PHONEREG "PhoneReg" #define DB_KEY_RCLIENTID "RClientID" #define DB_KEY_LASTMSGID "LastMsgId" #define DB_KEY_REMOTEREAD "RemoteReadId" |