diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:35:29 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:35:29 +0000 |
| commit | b92b010ae92db3f61a20ff2f579a5b717cfc8168 (patch) | |
| tree | 7be42a444fe210ba1476e7bfb41ee2f7c6008022 /protocols/MSN/msn_mail.cpp | |
| parent | 09ba010a1f1966818249e15bb652269a944d1476 (diff) | |
MSN - done right
git-svn-id: http://svn.miranda-ng.org/main/trunk@429 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN/msn_mail.cpp')
| -rw-r--r-- | protocols/MSN/msn_mail.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/protocols/MSN/msn_mail.cpp b/protocols/MSN/msn_mail.cpp index e70fbef344..52d3fcb12b 100644 --- a/protocols/MSN/msn_mail.cpp +++ b/protocols/MSN/msn_mail.cpp @@ -269,19 +269,14 @@ 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);
|