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 /src/modules/clist/clc.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 'src/modules/clist/clc.cpp')
| -rw-r--r-- | src/modules/clist/clc.cpp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp index 1a9e32617f..982ede3406 100644 --- a/src/modules/clist/clc.cpp +++ b/src/modules/clist/clc.cpp @@ -422,25 +422,16 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, }
if ( dbcws->value.type == DBVT_ASCIIZ ) {
- #if defined( UNICODE )
- WCHAR* wszGrpName = mir_a2u(dbcws->value.pszVal+1);
- eq = !lstrcmp( szFullName, wszGrpName );
- mir_free( wszGrpName );
- #else
- eq = !lstrcmp( szFullName, dbcws->value.pszVal+1 );
- #endif
+ WCHAR* wszGrpName = mir_a2u(dbcws->value.pszVal+1);
+ eq = !lstrcmp( szFullName, wszGrpName );
+ mir_free( wszGrpName );
}
else {
char* szGrpName = NEWSTR_ALLOCA(dbcws->value.pszVal+1);
- #if defined( UNICODE )
- WCHAR* wszGrpName;
- Utf8Decode(szGrpName, &wszGrpName );
- eq = !lstrcmp( szFullName, wszGrpName );
- mir_free( wszGrpName );
- #else
- Utf8Decode(szGrpName, NULL);
- eq = !lstrcmp( szFullName, szGrpName );
- #endif
+ WCHAR* wszGrpName;
+ Utf8Decode(szGrpName, &wszGrpName );
+ eq = !lstrcmp( szFullName, wszGrpName );
+ mir_free( wszGrpName );
}
if ( eq && (contact->group->hideOffline != 0) == ((dbcws->value.pszVal[0] & GROUPF_HIDEOFFLINE) != 0))
break; //only expanded has changed: no action reqd
|