From e06c4679faf776715b47e2c158490d7337ded27a Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Wed, 3 Jul 2013 14:47:30 +0000 Subject: =?UTF-8?q?Skype:=20-=20fixed=20encoding=20in=20auth=20request=20D?= =?UTF-8?q?IALOG=20-=20fixed=20=D0=BEpening=20blocked=20list=20from=20stat?= =?UTF-8?q?is=20menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.miranda-ng.org/main/trunk@5221 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skype_blocked.cpp | 4 ++-- protocols/Skype/src/skype_database.cpp | 2 +- protocols/Skype/src/skype_events.cpp | 10 +++++----- protocols/Skype/src/skype_transfers.cpp | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/protocols/Skype/src/skype_blocked.cpp b/protocols/Skype/src/skype_blocked.cpp index 36a2dac422..8bd24954d4 100644 --- a/protocols/Skype/src/skype_blocked.cpp +++ b/protocols/Skype/src/skype_blocked.cpp @@ -45,9 +45,9 @@ int CSkypeProto::BlockCommand(WPARAM wParam, LPARAM lParam) INT_PTR CSkypeProto::OpenBlockedListCommand(WPARAM, LPARAM) { OPENOPTIONSDIALOG ood; - ood.cbSize = sizeof(ood); + ood.cbSize = sizeof(OPENOPTIONSDIALOG); ood.pszGroup = "Network"; - ood.pszPage = _T2A(this->m_tszUserName); + ood.pszPage = ::mir_t2a(this->m_tszUserName); ood.pszTab = "Blocked contacts"; return ::Options_Open(&ood); } diff --git a/protocols/Skype/src/skype_database.cpp b/protocols/Skype/src/skype_database.cpp index f67bad9f86..ddc780098e 100644 --- a/protocols/Skype/src/skype_database.cpp +++ b/protocols/Skype/src/skype_database.cpp @@ -81,7 +81,7 @@ void CSkypeProto::RaiseAuthRequestEvent(DWORD timestamp, CContact::Ref contact) pCurBlob += ::strlen(sid) + 1; ::strcpy((char *)pCurBlob, reason); - this->AddDBEvent(hContact, EVENTTYPE_AUTHREQUEST, time(NULL), PREF_UTF, cbBlob, pBlob); + this->AddDBEvent(hContact, EVENTTYPE_AUTHREQUEST, time(NULL), DBEF_UTF, cbBlob, pBlob); } void CSkypeProto::RaiseMessageSentEvent(HANDLE hContact, DWORD timestamp, SEBinary &guid, const char *message, bool isUnread) diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index fc55aa23fa..b75d98b0f1 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -102,17 +102,17 @@ int __cdecl CSkypeProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = {0}; odp.cbSize = sizeof(odp); odp.hInstance = g_hInstance; - odp.ptszTitle = this->m_tszUserName; + odp.pszTitle = ::mir_t2a(this->m_tszUserName); odp.dwInitParam = LPARAM(this); - odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE; - odp.ptszGroup = LPGENT("Network"); + odp.flags = ODPF_BOLDGROUPS; + odp.pszGroup = LPGEN("Network"); - odp.ptszTab = LPGENT("Account"); + odp.pszTab = LPGEN("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MAIN); odp.pfnDlgProc = CSkypeProto::SkypeMainOptionsProc; ::Options_AddPage(wParam, &odp); - odp.ptszTab = LPGENT("Blocked contacts"); + odp.pszTab = LPGEN("Blocked contacts"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_BLOCKED); odp.pfnDlgProc = CSkypeProto::SkypeBlockedOptionsProc; ::Options_AddPage(wParam, &odp); diff --git a/protocols/Skype/src/skype_transfers.cpp b/protocols/Skype/src/skype_transfers.cpp index 2866f34e63..e891be18c3 100644 --- a/protocols/Skype/src/skype_transfers.cpp +++ b/protocols/Skype/src/skype_transfers.cpp @@ -3,14 +3,14 @@ wchar_t *CSkypeProto::TransferFailureReasons[] = { LPGENW("") /* --- */, - LPGENW("SENDER_NOT_AUTHORISED") /* SENDER_NOT_AUTHORISED */, - LPGENW("REMOTELY_CANCELLED") /* REMOTELY_CANCELLED */, - LPGENW("FAILED_READ") /* FAILED_READ */, - LPGENW("FAILED_REMOTE_READ") /* FAILED_REMOTE_READ */, - LPGENW("FAILED_WRITE") /* FAILED_WRITE */, - LPGENW("FAILED_REMOTE_WRITE") /* FAILED_REMOTE_WRITE */, - LPGENW("REMOTE_DOES_NOT_SUPPORT_FT") /* REMOTE_DOES_NOT_SUPPORT_FT */, - LPGENW("REMOTE_OFFLINE_FOR_TOO_LONG") /* REMOTE_OFFLINE_FOR_TOO_LONG */, + LPGENW("SENDER_NOT_AUTHORISED") /* SENDER_NOT_AUTHORISED */, + LPGENW("REMOTELY_CANCELLED") /* REMOTELY_CANCELLED */, + LPGENW("FAILED_READ") /* FAILED_READ */, + LPGENW("FAILED_REMOTE_READ") /* FAILED_REMOTE_READ */, + LPGENW("FAILED_WRITE") /* FAILED_WRITE */, + LPGENW("FAILED_REMOTE_WRITE") /* FAILED_REMOTE_WRITE */, + LPGENW("REMOTE_DOES_NOT_SUPPORT_FT") /* REMOTE_DOES_NOT_SUPPORT_FT */, + LPGENW("REMOTE_OFFLINE_FOR_TOO_LONG") /* REMOTE_OFFLINE_FOR_TOO_LONG */, LPGENW("TOO_MANY_PARALLEL") /* TOO_MANY_PARALLEL */, LPGENW("PLACEHOLDER_TIMEOUT") /* PLACEHOLDER_TIMEOUT */ }; -- cgit v1.2.3