diff options
| author | George Hazan <ghazan@miranda.im> | 2018-03-28 20:01:30 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-03-28 20:01:30 +0300 |
| commit | e7b69721b0d390cec3f81f97134a51bfef228cf8 (patch) | |
| tree | a56ef2bd15fa3c995a031bec35ce0113dec22b28 /plugins/Variables/src/parse_miranda.cpp | |
| parent | 81ce57622c3166830b23eae534dacc6b008c659d (diff) | |
PFLAG_UNIQUEIDSETTING removed, its functionality transferred to Proto_SetUniqueId / Proto_GetUniqueId
Diffstat (limited to 'plugins/Variables/src/parse_miranda.cpp')
| -rw-r--r-- | plugins/Variables/src/parse_miranda.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index 0dad8e92a0..43610db3fc 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -343,20 +343,20 @@ static wchar_t* parseProtoInfo(ARGUMENTSINFO *ai) if (ai->argc != 3)
return nullptr;
- char *szRes = nullptr;
+ const char *szRes = nullptr;
wchar_t *tszRes = nullptr;
ptrA szProto(mir_u2a(ai->targv[1]));
if (!mir_wstrcmp(ai->targv[2], _A2W(STR_PINAME)))
tszRes = Hlp_GetProtocolName(szProto);
else if (!mir_wstrcmp(ai->targv[2], _A2W(STR_PIUIDTEXT))) {
- szRes = (char *)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDTEXT, 0);
- if (INT_PTR(szRes) == CALLSERVICE_NOTFOUND)
+ szRes = (const char *)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDTEXT, 0);
+ if (INT_PTR(szRes) == CALLSERVICE_NOTFOUND || szRes == nullptr)
return nullptr;
}
else if (!mir_wstrcmp(ai->targv[2], _A2W(STR_PIUIDSETTING))) {
- szRes = (char *)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDSETTING, 0);
- if (INT_PTR(szRes) == CALLSERVICE_NOTFOUND)
+ szRes = Proto_GetUniqueId(szProto);
+ if (szRes == nullptr)
return nullptr;
}
else if (!mir_wstrcmp(ai->targv[2], _A2W(STR_PINICK)))
|