diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:02:14 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:02:14 +0000 |
| commit | 67f1c36da9aca19e37803110aa243280e5cf053b (patch) | |
| tree | 2ded9275bfcbcea8151a4b32deb6c14c95de0e78 /protocols/MSN/msn_mail.cpp | |
| parent | 4aa6229698b946e52ce19018aaf13f8b92fb168e (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@427 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN/msn_mail.cpp')
| -rw-r--r-- | protocols/MSN/msn_mail.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/protocols/MSN/msn_mail.cpp b/protocols/MSN/msn_mail.cpp index e70fbef344..d14e9704c7 100644 --- a/protocols/MSN/msn_mail.cpp +++ b/protocols/MSN/msn_mail.cpp @@ -269,19 +269,13 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) wchar_t* mimeFromW = tFileInfo.decode(From);
wchar_t* mimeSubjectW = tFileInfo.decode(Subject);
-#ifdef _UNICODE
+
mir_sntprintf(tBuffer2, SIZEOF(tBuffer2), TranslateT("Subject: %s"), mimeSubjectW);
-#else
- mir_sntprintf(tBuffer2, SIZEOF(tBuffer2), TranslateT("Subject: %S"), mimeSubjectW);
-#endif
-#ifdef _UNICODE
+
TCHAR* msgtxt = _stricmp(From, Fromaddr) ?
TranslateT("Hotmail from %s (%S)") : TranslateT("Hotmail from %s");
-#else
- TCHAR* msgtxt = _strcmpi(From, Fromaddr) ?
- TranslateT("Hotmail from %S (%s)") : TranslateT("Hotmail from %S");
-#endif
+
mir_sntprintf(tBuffer, SIZEOF(tBuffer), msgtxt, mimeFromW, Fromaddr);
mir_free(mimeFromW);
mir_free(mimeSubjectW);
|