diff options
| -rw-r--r-- | protocols/Skype/src/skype_events.cpp | 2 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_profile.cpp | 8 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_proto.cpp | 19 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_proto.h | 2 |
4 files changed, 18 insertions, 13 deletions
diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index fdcf1fdedc..541b776e15 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -5,7 +5,7 @@ int CSkypeProto::OnModulesLoaded(WPARAM, LPARAM) this->HookEvent(ME_OPT_INITIALISE, &CSkypeProto::OnOptionsInit);
this->HookEvent(ME_USERINFO_INITIALISE, &CSkypeProto::OnUserInfoInit);
this->login = this->GetSettingString(SKYPE_SETTINGS_LOGIN);
- this->rememberPassword = this->GetSettingByte("RememberPassword");
+ this->rememberPassword = this->GetSettingByte("RememberPassword") > 0;
return 0;
}
diff --git a/protocols/Skype/src/skype_profile.cpp b/protocols/Skype/src/skype_profile.cpp index f37b885525..17fcf4630f 100644 --- a/protocols/Skype/src/skype_profile.cpp +++ b/protocols/Skype/src/skype_profile.cpp @@ -311,10 +311,10 @@ void CSkypeProto::OnAccountChanged(int prop) {
case CAccount::P_AVATAR_IMAGE:
case CAccount::P_AVATAR_TIMESTAMP:
- this->UpdateOwnAvatar();
+ //this->UpdateOwnAvatar();
break;
case CAccount::P_BIRTHDAY:
- this->UpdateOwnBirthday();
+ //this->UpdateOwnBirthday();
break;
case CAccount::P_CITY:
this->UpdateOwnCity();
@@ -365,4 +365,8 @@ void CSkypeProto::OnAccountChanged(int prop) void __cdecl CSkypeProto::LoadOwnInfo(void*)
{
this->UpdateOwnProfile();
+
+ //this->account.fetch();
+ //this->account->SetOnAccountChangedCallback(
+ //(CAccount::OnAccountChanged)&CSkypeProto::OnAccountChanged, this);
}
\ No newline at end of file diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index 789c84525e..7f6b778633 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -339,7 +339,7 @@ int __cdecl CSkypeProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPA void __cdecl CSkypeProto::SignInAsync(void*)
{
- WaitForSingleObject(&this->signin_lock, INFINITE);
+ //WaitForSingleObject(&this->signin_lock, INFINITE);
this->account->LoginWithPassword(::mir_u2a(this->password), false, false);
this->account->BlockWhileLoggingIn();
@@ -363,10 +363,6 @@ void __cdecl CSkypeProto::SignInAsync(void*) }
else
{
- this->account.fetch();
- this->account->SetOnAccountChangedCallback(
- (CAccount::OnAccountChanged)&CSkypeProto::OnAccountChanged, this);
-
g_skype->GetConversationList(g_skype->inbox, CConversation::INBOX_CONVERSATIONS);
fetch(g_skype->inbox);
g_skype->SetOnConversationAddedCallback(
@@ -378,13 +374,18 @@ void __cdecl CSkypeProto::SignInAsync(void*) }
this->SetStatus(this->m_iDesiredStatus);
- this->ForkThread(&CSkypeProto::LoadOwnInfo, this);
- //this->LoadOwnInfo(this);
this->ForkThread(&CSkypeProto::LoadContactList, this);
//this->LoadContactList(this);
+
+ this->account.fetch();
+ this->account->SetOnAccountChangedCallback(
+ (CAccount::OnAccountChanged)&CSkypeProto::OnAccountChanged, this);
+
+ //this->ForkThread(&CSkypeProto::LoadOwnInfo, this);
+ this->LoadOwnInfo(this);
}
- ReleaseMutex(this->signin_lock);
+ //ReleaseMutex(this->signin_lock);
}
bool CSkypeProto::SignIn(bool isReadPassword)
@@ -410,7 +411,7 @@ bool CSkypeProto::SignIn(bool isReadPassword) else
{
this->ForkThread(&CSkypeProto::SignInAsync, this);
- //this->SignInThread(this);
+ //this->SignInAsync(this);
return true;
}
}
diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h index 36e1b6f78a..a28c62d516 100644 --- a/protocols/Skype/src/skype_proto.h +++ b/protocols/Skype/src/skype_proto.h @@ -127,7 +127,7 @@ protected: bool IsOnline();
- static LanguagesListEntry languages[];
+ static LanguagesListEntry languages[223];
// messages
void OnOnMessageReceived(const char *sid, const char *text);
|