diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 16:22:13 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 16:22:13 +0000 |
| commit | d5d023f683b23fe26ddea93738cb721d532804f0 (patch) | |
| tree | 21e7398686c7a5d1604d58bfb71ca4329c84be66 /protocols/JabberG/jabber_util.cpp | |
| parent | e58823d961a630eb62e60d2ccb443761ba5f1704 (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/jabber_util.cpp')
| -rw-r--r-- | protocols/JabberG/jabber_util.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/protocols/JabberG/jabber_util.cpp b/protocols/JabberG/jabber_util.cpp index c6fee74296..7c9867a377 100644 --- a/protocols/JabberG/jabber_util.cpp +++ b/protocols/JabberG/jabber_util.cpp @@ -354,12 +354,9 @@ void __stdcall JabberUtfToTchar( const char* pszValue, size_t cbLen, LPTSTR& des JabberUrlDecode( pszCopy );
- #if defined( _UNICODE )
- mir_utf8decode( pszCopy, &dest );
- #else
- mir_utf8decode( pszCopy, NULL );
- dest = mir_strdup( pszCopy );
- #endif
+
+ mir_utf8decode( pszCopy, &dest );
+
if ( bNeedsFree )
free( pszCopy );
@@ -678,7 +675,6 @@ char* __stdcall JabberBase64Encode( const char* buffer, int bufferLen ) static unsigned char b64rtable[256];
-#ifdef _UNICODE
char* __stdcall JabberBase64DecodeW( const WCHAR* str, int *resultLen )
{
char *stra = mir_u2a(str);
@@ -686,7 +682,6 @@ char* __stdcall JabberBase64DecodeW( const WCHAR* str, int *resultLen ) mir_free(stra);
return res;
}
-#endif
char* __stdcall JabberBase64Decode( const char* str, int *resultLen )
{
@@ -1291,11 +1286,7 @@ void JabberCopyText(HWND hwnd, TCHAR *text) TCHAR *s = (TCHAR *)GlobalLock(hMem);
lstrcpy(s, text);
GlobalUnlock(hMem);
-#ifdef UNICODE
SetClipboardData(CF_UNICODETEXT, hMem);
-#else
- SetClipboardData(CF_TEXT, hMem);
-#endif
CloseClipboard();
}
|