diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 20:04:13 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 20:04:13 +0000 |
| commit | e521b812384a0e93f48e078c6cb248913dcc893a (patch) | |
| tree | 13b1de3e9bef13a48af0318f1fd338915dd69e9a /plugins/SmileyAdd/smileys.cpp | |
| parent | ae481600939fb5420b80a8a7ef84f0ce9d6b3356 (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@437 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SmileyAdd/smileys.cpp')
| -rw-r--r-- | plugins/SmileyAdd/smileys.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/plugins/SmileyAdd/smileys.cpp b/plugins/SmileyAdd/smileys.cpp index c23467812d..84dc16b6a9 100644 --- a/plugins/SmileyAdd/smileys.cpp +++ b/plugins/SmileyAdd/smileys.cpp @@ -993,10 +993,10 @@ void SmileyCategoryListType::AddAllProtocolsAsCategory(void) const bkstring& defaultFile = GetSmileyCategory(tname)->GetFilename();
-#if (defined _UNICODE || defined UNICODE)
+
unsigned lpcp = (unsigned)CallService(MS_LANGPACK_GETCODEPAGE, 0, 0);
if (lpcp == CALLSERVICE_NOTFOUND) lpcp = CP_ACP;
-#endif
+
PROTOCOLDESCRIPTOR **protoList;
PROTOACCOUNT **accList;
@@ -1029,11 +1029,9 @@ void SmileyCategoryListType::AddAllProtocolsAsCategory(void) char protoName[128];
CallProtoService(protoList[i]->szName, PS_GETNAME, sizeof(protoName), (LPARAM)protoName);
-#if (defined _UNICODE || defined UNICODE)
+
displayName = A2W_SM(protoName, lpcp);
-#else
- displayName = protoName;
-#endif
+
tname = A2T_SM(protoList[i]->szName);
AddCategory(tname, displayName, smcProto, paths);
}
|