summaryrefslogtreecommitdiff
path: root/plugins/TipperYM/subst.cpp
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-06-16 14:33:30 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-06-16 14:33:30 +0000
commit05c989e58aeffcfb59cebaca6797cb69dd25cb1e (patch)
tree460bde28df51ea7b01109b56818b5880ac47ba66 /plugins/TipperYM/subst.cpp
parentac7bf920f219a7aed7eb163c8b3195e66c12e4da (diff)
another portion of "#ifdef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@446 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TipperYM/subst.cpp')
-rw-r--r--plugins/TipperYM/subst.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/TipperYM/subst.cpp b/plugins/TipperYM/subst.cpp
index bc99aee44b..531af67200 100644
--- a/plugins/TipperYM/subst.cpp
+++ b/plugins/TipperYM/subst.cpp
@@ -61,12 +61,12 @@ bool DBGetContactSettingAsString(HANDLE hContact, const char *szModuleName, cons
if (dbv.pszVal) utf2t(dbv.pszVal, buff, bufflen);
buff[bufflen - 1] = 0;
break;
-#ifdef _UNICODE
+
case DBVT_WCHAR:
if (dbv.pwszVal) wcsncpy(buff, dbv.pwszVal, bufflen);
buff[bufflen - 1] = 0;
break;
-#endif
+
}
DBFreeVariant(&dbv);
@@ -847,7 +847,7 @@ TCHAR *GetProtoStatusMessage(char *szProto, WORD wStatus)
{
swzText = (TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGT, wStatus, 0);
}
-#ifdef _UNICODE
+
else if (swzText == NULL)
{
// try to use service without SGMA_TCHAR
@@ -858,7 +858,7 @@ TCHAR *GetProtoStatusMessage(char *szProto, WORD wStatus)
mir_free(tmpMsg);
}
}
-#endif
+
if (swzText && !swzText[0])
{