summaryrefslogtreecommitdiff
path: root/protocols/Skype/src/skype_account.cpp
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2013-05-10 15:07:47 +0000
committerAlexander Lantsev <aunsane@gmail.com>2013-05-10 15:07:47 +0000
commit32cc6d62a154d5724c40085f22747df2ee2ff4cb (patch)
treef47241b283331f42b0955de792493e8139925a73 /protocols/Skype/src/skype_account.cpp
parent763272b5a51b73eedb013c209ad256f85afc8fd2 (diff)
- fixed several issues in own details saving
- fixed issues with contacts look cycle in db - fixed freez offline status after login error - other few bugs git-svn-id: http://svn.miranda-ng.org/main/trunk@4621 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_account.cpp')
-rw-r--r--protocols/Skype/src/skype_account.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/protocols/Skype/src/skype_account.cpp b/protocols/Skype/src/skype_account.cpp
index f834edb560..d79ee7e973 100644
--- a/protocols/Skype/src/skype_account.cpp
+++ b/protocols/Skype/src/skype_account.cpp
@@ -3,6 +3,7 @@
wchar_t *CSkypeProto::LogoutReasons[] =
{
+ LPGENW("") /* --- */,
LPGENW("LOGOUT_CALLED") /* LOGOUT_CALLED */,
LPGENW("HTTPS_PROXY_AUTH_FAILED") /* HTTPS_PROXY_AUTH_FAILED */,
LPGENW("SOCKS_PROXY_AUTH_FAILED") /* SOCKS_PROXY_AUTH_FAILED */,
@@ -235,7 +236,7 @@ void CSkypeProto::OnLoggedIn()
this->LoadOwnInfo(this);
this->LoadChatList(this);
- this->LoadContactList(reinterpret_cast<void *>(static_cast<int>(true)));
+ this->LoadContactList(this);
this->LoadAuthWaitList(this);
fetch(this->transferList);
@@ -266,19 +267,19 @@ void CSkypeProto::SetServerStatus(int iNewStatus)
void CSkypeProto::OnCblUpdated()
{
// reload our CL after skype CL fully synced
- this->LoadContactList(reinterpret_cast<void *>(static_cast<int>(false)));
+ this->LoadContactList(NULL);
}
void CSkypeProto::OnLoggedOut(CAccount::LOGOUTREASON reason)
{
this->Log(L"Failed to login: %s", CSkypeProto::LogoutReasons[reason]);
- this->m_iStatus = ID_STATUS_OFFLINE;
+ this->SetStatus(ID_STATUS_OFFLINE);
this->SendBroadcast(
ACKTYPE_LOGIN, ACKRESULT_FAILED,
NULL, CSkypeProto::SkypeToMirandaLoginError(reason));
- this->ShowNotification(CSkypeProto::LogoutReasons[reason - 1]);
+ this->ShowNotification(CSkypeProto::LogoutReasons[reason]);
if (this->rememberPassword && reason == CAccount::INCORRECT_PASSWORD)
{