summaryrefslogtreecommitdiff
path: root/plugins/YAMN/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2016-07-29 12:36:34 +0000
committerGeorge Hazan <george.hazan@gmail.com>2016-07-29 12:36:34 +0000
commit428bf0cbd77813a43094cb5c984436deff251936 (patch)
treed7dfa8971153d53a849e45c942be97fe5b90b7ec /plugins/YAMN/src
parent82ef17ca5286f58ae7af604fb9518e8dc496b7c3 (diff)
no more TCHARs
git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/YAMN/src')
-rw-r--r--plugins/YAMN/src/browser/mailbrowser.cpp4
-rw-r--r--plugins/YAMN/src/main.cpp8
-rw-r--r--plugins/YAMN/src/proto/pop3/pop3comm.cpp6
3 files changed, 9 insertions, 9 deletions
diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp
index 2dae05544b..606622e27f 100644
--- a/plugins/YAMN/src/browser/mailbrowser.cpp
+++ b/plugins/YAMN/src/browser/mailbrowser.cpp
@@ -647,10 +647,10 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D
evt.ptszTooltip = tszMsg;
pcli->pfnAddEvent(&evt);
}
- db_set_ts(ActualAccount->hContact, "CList", "StatusMsg", tszMsg);
+ db_set_ws(ActualAccount->hContact, "CList", "StatusMsg", tszMsg);
if (nflags & YAMN_ACC_CONTNICK)
- db_set_ts(ActualAccount->hContact, YAMN_DBMODULE, "Nick", tszMsg);
+ db_set_ws(ActualAccount->hContact, YAMN_DBMODULE, "Nick", tszMsg);
}
if ((nflags & YAMN_ACC_POP) &&
diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp
index 73e21c95af..aca078ca62 100644
--- a/plugins/YAMN/src/main.cpp
+++ b/plugins/YAMN/src/main.cpp
@@ -62,10 +62,10 @@ static void GetProfileDirectory(wchar_t *szPath, int cbPath)
//This is copied from Miranda's sources. In 0.2.1.0 it is needed, in newer vesions of Miranda use MS_DB_GETPROFILEPATH service
{
wchar_t tszOldPath[MAX_PATH];
- CallService(MS_DB_GETPROFILEPATHT, _countof(tszOldPath), (LPARAM)tszOldPath);
+ CallService(MS_DB_GETPROFILEPATHW, _countof(tszOldPath), (LPARAM)tszOldPath);
mir_wstrcat(tszOldPath, L"\\*.book");
- VARST ptszNewPath( L"%miranda_userdata%");
+ VARSW ptszNewPath( L"%miranda_userdata%");
SHFILEOPSTRUCT file_op = {
NULL,
@@ -265,10 +265,10 @@ extern "C" int __declspec(dllexport) Load(void)
YAMN_STATUS = ID_STATUS_OFFLINE;
// we get the Miranda Root Path
- PathToAbsoluteT( L".", szMirandaDir);
+ PathToAbsoluteW( L".", szMirandaDir);
// retrieve the current profile name
- CallService(MS_DB_GETPROFILENAMET, (WPARAM)_countof(ProfileName), (LPARAM)ProfileName); //not to pass entire array to fcn
+ CallService(MS_DB_GETPROFILENAMEW, (WPARAM)_countof(ProfileName), (LPARAM)ProfileName); //not to pass entire array to fcn
wchar_t *fc = wcsrchr(ProfileName, '.');
if ( fc != NULL ) *fc = 0;
diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index 9b2d0da53e..edf298d3e6 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -1544,12 +1544,12 @@ wchar_t* WINAPI GetErrorString(DWORD Code)
mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, TranslateT("Error %d-%d-%d-%d:"), ErrorCode->AppError, ErrorCode->POP3Error, ErrorCode->NetError, ErrorCode->SystemError);
if (ErrorCode->POP3Error)
- mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateTS(POP3Errors[ErrorCode->POP3Error - 1]));
+ mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateW(POP3Errors[ErrorCode->POP3Error - 1]));
if (ErrorCode->NetError) {
if (ErrorCode->SSL)
- mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateTS(SSLErrors[ErrorCode->NetError - 1]));
+ mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateW(SSLErrors[ErrorCode->NetError - 1]));
else
- mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateTS(NetlibErrors[ErrorCode->NetError - 4]));
+ mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateW(NetlibErrors[ErrorCode->NetError - 4]));
}
return ErrorString;