From 46eff0941450114f9dda873037d6744263dc9ad0 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 15 Jun 2012 19:20:06 +0000 Subject: small portion of "#ifsef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@435 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/jabber_proto.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'protocols') diff --git a/protocols/JabberG/jabber_proto.cpp b/protocols/JabberG/jabber_proto.cpp index 7d9ef3f14a..350c9d28a8 100644 --- a/protocols/JabberG/jabber_proto.cpp +++ b/protocols/JabberG/jabber_proto.cpp @@ -1212,11 +1212,9 @@ int __cdecl CJabberProto::SendMsg( HANDLE hContact, int flags, const char* pszSr else isEncrypted = 0; if ( flags & PREF_UTF ) { - #if defined( _UNICODE ) + mir_utf8decode( NEWSTR_ALLOCA( pszSrc ), &msg ); - #else - msg = mir_strdup( mir_utf8decode( NEWSTR_ALLOCA( pszSrc ), 0 )); - #endif + } else if ( flags & PREF_UNICODE ) msg = mir_u2t(( wchar_t* )&pszSrc[ strlen( pszSrc )+1 ] ); -- cgit v1.2.3