diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_avatars.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_login.cpp | 5 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_poll_processing.cpp | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp index c8d2fc7c86..9effeb2554 100644 --- a/protocols/SkypeWeb/src/skype_avatars.cpp +++ b/protocols/SkypeWeb/src/skype_avatars.cpp @@ -104,7 +104,7 @@ INT_PTR CSkypeProto::SvcGetAvatarInfo(WPARAM, LPARAM lParam) if (::_taccess(AI->filename, 0) == 0 && !getBool(AI->hContact, "NeedNewAvatar", 0))
return GAIR_SUCCESS;
- if (m_hPollingThread) {
+ if (IsOnline()) {
PushRequest(new GetAvatarRequest(szUrl), &CSkypeProto::OnReceiveAvatar, (void*)AI->hContact);
debugLogA("Requested to read an avatar from '%s'", szUrl);
return GAIR_WAITFOR;
diff --git a/protocols/SkypeWeb/src/skype_login.cpp b/protocols/SkypeWeb/src/skype_login.cpp index f6e91b6591..4c8462bf65 100644 --- a/protocols/SkypeWeb/src/skype_login.cpp +++ b/protocols/SkypeWeb/src/skype_login.cpp @@ -110,8 +110,6 @@ void CSkypeProto::OnLoginSuccess() Server = getStringA("Server") != NULL ? getStringA("Server") : SKYPE_ENDPOINTS_HOST;
SendRequest(new CreateEndpointRequest(TokenSecret, Server), &CSkypeProto::OnEndpointCreated);
PushRequest(new GetProfileRequest(TokenSecret), &CSkypeProto::LoadProfile);
- PushRequest(new GetAvatarRequest(ptrA(getStringA("AvatarUrl"))), &CSkypeProto::OnReceiveAvatar, NULL);
- PushRequest(new GetContactListRequest(TokenSecret), &CSkypeProto::LoadContactList);
if (!m_timer)
SkypeSetTimer(this);
@@ -216,7 +214,8 @@ void CSkypeProto::OnCapabilitiesSended(const NETLIBHTTPREQUEST *response) m_hPollingThread = ForkThreadEx(&CSkypeProto::PollingThread, 0, NULL);
- //SyncHistory();
+ PushRequest(new GetAvatarRequest(ptrA(getStringA("AvatarUrl"))), &CSkypeProto::OnReceiveAvatar, NULL);
+ PushRequest(new GetContactListRequest(TokenSecret), &CSkypeProto::LoadContactList);
SendRequest(new LoadChatsRequest(RegToken, Server), &CSkypeProto::OnLoadChats);
if (getBool("AutoSync", true))
diff --git a/protocols/SkypeWeb/src/skype_poll_processing.cpp b/protocols/SkypeWeb/src/skype_poll_processing.cpp index 09357b7f67..9e4f02eca5 100644 --- a/protocols/SkypeWeb/src/skype_poll_processing.cpp +++ b/protocols/SkypeWeb/src/skype_poll_processing.cpp @@ -97,7 +97,6 @@ void CSkypeProto::ProcessEndpointPresenceRes(JSONNODE *node) MirVer.AppendFormat(" [%s]", epname);
}
}
-
db_set_s(hContact, m_szModuleName, "MirVer", MirVer);
}
|