From d296f9f99daf102b9af5d56690e2bd00d61c1267 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 24 Jul 2018 11:11:26 +0300
Subject: 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.
---
 protocols/IcqOscarJ/src/icq_avatar.cpp | 2 +-
 protocols/IcqOscarJ/src/icq_db.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'protocols/IcqOscarJ/src')

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);
 		}
 
-- 
cgit v1.2.3