diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-24 11:11:26 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-24 11:11:26 +0300 |
| commit | d296f9f99daf102b9af5d56690e2bd00d61c1267 (patch) | |
| tree | 39311caaf80abf0b47ecb78cf94dc8157b193575 /protocols/IRCG/src/input.cpp | |
| parent | ffc521e5d5e9bd66feb65afe0046b3fc7e073356 (diff) | |
database:
- senseless fiels ptszVal removed from DBVARIANT, pwszVal is used instead;
- if you want db_get to return a string, you need to use db_get_s.
Diffstat (limited to 'protocols/IRCG/src/input.cpp')
| -rw-r--r-- | protocols/IRCG/src/input.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp index 169dbc4153..f7cf3b6f84 100644 --- a/protocols/IRCG/src/input.cpp +++ b/protocols/IRCG/src/input.cpp @@ -51,7 +51,7 @@ void CIrcProto::FormatMsg(CMStringW& text) if (sNick4Perform == L"") {
DBVARIANT dbv;
if (!getWString("PNick", &dbv)) {
- sNick4Perform = dbv.ptszVal;
+ sNick4Perform = dbv.pwszVal;
db_free(&dbv);
}
}
@@ -549,8 +549,8 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo DBVARIANT dbv1;
if (!getWString(hContact, "UWildcard", &dbv1)) {
CMStringW S = L"S";
- S += dbv1.ptszVal;
- DoUserhostWithReason(2, S.c_str(), true, dbv1.ptszVal);
+ S += dbv1.pwszVal;
+ DoUserhostWithReason(2, S.c_str(), true, dbv1.pwszVal);
db_free(&dbv1);
}
else {
@@ -624,8 +624,8 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo DBVARIANT dbv1;
CMStringW S = L"S";
if (!getWString(ccNew, "UWildcard", &dbv1)) {
- S += dbv1.ptszVal;
- DoUserhostWithReason(2, S.c_str(), true, dbv1.ptszVal);
+ S += dbv1.pwszVal;
+ DoUserhostWithReason(2, S.c_str(), true, dbv1.pwszVal);
db_free(&dbv1);
}
else {
@@ -804,7 +804,7 @@ bool CIrcProto::PostIrcMessageWnd(wchar_t *window, MCONTACT hContact, const wcha return 0;
if (hContact && !getWString(hContact, "Nick", &dbv)) {
- mir_wstrncpy(windowname, dbv.ptszVal, 255);
+ mir_wstrncpy(windowname, dbv.pwszVal, 255);
db_free(&dbv);
}
else if (window)
|