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/IcqOscarJ/src | |
| 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/IcqOscarJ/src')
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_avatar.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_db.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp index aabdf34ac5..eb747258d0 100644 --- a/protocols/IcqOscarJ/src/icq_avatar.cpp +++ b/protocols/IcqOscarJ/src/icq_avatar.cpp @@ -61,7 +61,7 @@ wchar_t* CIcqProto::GetOwnAvatarFileName() return nullptr;
wchar_t tmp[MAX_PATH * 2];
- PathToAbsoluteW(dbvFile.ptszVal, tmp);
+ PathToAbsoluteW(dbvFile.pwszVal, tmp);
db_free(&dbvFile);
return null_strdup(tmp);
diff --git a/protocols/IcqOscarJ/src/icq_db.cpp b/protocols/IcqOscarJ/src/icq_db.cpp index 5f6a58d951..4026cb3acf 100644 --- a/protocols/IcqOscarJ/src/icq_db.cpp +++ b/protocols/IcqOscarJ/src/icq_db.cpp @@ -170,7 +170,7 @@ void CIcqProto::setStatusMsgVar(MCONTACT hContact, char* szStatusMsg, bool isAns char *oldStatusMsg = nullptr;
DBVARIANT dbv;
if (!db_get_ws(hContact, "CList", "StatusMsg", &dbv)) {
- oldStatusMsg = make_utf8_string(dbv.ptszVal);
+ oldStatusMsg = make_utf8_string(dbv.pwszVal);
db_free(&dbv);
}
|