diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2013-05-13 18:30:05 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2013-05-13 18:30:05 +0000 |
| commit | 2a1e6f05aa9fcc4dfe642bd42aeb175e3958d4b3 (patch) | |
| tree | 1f0195caf23d086ecae10fc75b11fa61d85e9a66 /protocols/Skype/src/skype_dialogs.cpp | |
| parent | 59651e97603936fc7179864506caa1818e260c76 (diff) | |
Merged revision(s) from branches/unsane/skype_test:
- CSkypeProto is derived of Skype class now
- chat events moved to skype_chat.cpp
- fixed chat message timestamp
- fixed #331, #332
git-svn-id: http://svn.miranda-ng.org/main/trunk@4644 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_dialogs.cpp')
| -rw-r--r-- | protocols/Skype/src/skype_dialogs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp index 980b7f81a6..108aa09bd1 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/protocols/Skype/src/skype_dialogs.cpp @@ -109,13 +109,13 @@ INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPAR GetDlgItemTextA(hwnd, IDC_SL, sid, SIZEOF(sid));
GetDlgItemTextA(hwnd, IDC_PW, pwd, SIZEOF(pwd));
- CSkype::VALIDATERESULT reason;
- g_skype->ValidatePassword(sid, pwd, reason);
+ Skype::VALIDATERESULT reason;
+ proto->ValidatePassword(sid, pwd, reason);
- if (reason == CSkype::VALIDATED_OK)
+ if (reason == Skype::VALIDATED_OK)
{
CAccount::Ref account;
- g_skype->GetAccount(sid, proto->account);
+ proto->GetAccount(sid, proto->account);
proto->account->SetStrProperty(CAccount::P_FULLNAME, sid);
proto->account->SetOnAccountChangedCallback(
(CAccount::OnAccountChanged)&CSkypeProto::OnAccountChanged, proto);
|