summaryrefslogtreecommitdiff
path: root/protocols/Skype/src/skype_account.cpp
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2013-05-05 08:38:57 +0000
committerAlexander Lantsev <aunsane@gmail.com>2013-05-05 08:38:57 +0000
commit1229cee3091839af4dd181e28b55e4823079007e (patch)
tree7afa602a61bdc81de9135b5642ec11c5ee4ea229 /protocols/Skype/src/skype_account.cpp
parent1b39cc1afb501ea3973affcf864b8485e81251ff (diff)
- reworked invitation to chat
- fixed chat contact's statuses - added "Spawn conversation" button in contact dialog - StringList now based on stl git-svn-id: http://svn.miranda-ng.org/main/trunk@4586 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_account.cpp')
-rw-r--r--protocols/Skype/src/skype_account.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/protocols/Skype/src/skype_account.cpp b/protocols/Skype/src/skype_account.cpp
index fa29bafbef..3de83ee8dd 100644
--- a/protocols/Skype/src/skype_account.cpp
+++ b/protocols/Skype/src/skype_account.cpp
@@ -225,7 +225,6 @@ void CSkypeProto::OnLoggedIn()
this->LoadContactList(reinterpret_cast<void *>(static_cast<int>(true)));
this->LoadAuthWaitList(this);
-
fetch(this->transferList);
this->SetServerStatus(this->m_iDesiredStatus);
@@ -243,7 +242,7 @@ void CSkypeProto::SetServerStatus(int iNewStatus)
int oldStatus = m_iStatus;
m_iStatus = iNewStatus;
- CContact::AVAILABILITY availability = this->MirandaToSkypeStatus(iNewStatus);
+ CContact::AVAILABILITY availability = CSkypeProto::MirandaToSkypeStatus(iNewStatus);
if (availability != CContact::UNKNOWN)
this->account->SetAvailability(availability);
@@ -261,7 +260,7 @@ void CSkypeProto::OnLoggedOut(CAccount::LOGOUTREASON reason)
this->m_iStatus = ID_STATUS_OFFLINE;
this->SendBroadcast(
ACKTYPE_LOGIN, ACKRESULT_FAILED,
- NULL, this->SkypeToMirandaLoginError(reason));
+ NULL, CSkypeProto::SkypeToMirandaLoginError(reason));
this->ShowNotification(CSkypeProto::LogoutReasons[reason - 1]);