- BuddyPounce: fix (patch from person)

git-svn-id: http://svn.miranda-ng.org/main/trunk@4250 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 7 insertions, 7 deletions

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index a9aa0f77b5..5b466b98df 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -80,12 +80,12 @@ void hideAll(HWND hwnd)
 void getDefaultMessage(HWND hwnd, UINT control, HANDLE hContact)

 {

 	DBVARIANT dbv;

-	if (!db_get_s(hContact, modname, "PounceMsg", &dbv))

+	if (!db_get_ts(hContact, modname, "PounceMsg", &dbv))

 	{

 		SetDlgItemText(hwnd, control, dbv.ptszVal);

 		DBFreeVariant(&dbv);

 	}

-	else if (!db_get_s(NULL, modname, "PounceMsg", &dbv))

+	else if (!db_get_ts(NULL, modname, "PounceMsg", &dbv))

 	{

 		SetDlgItemText(hwnd, control, dbv.ptszVal);

 		DBFreeVariant(&dbv);

@@ -569,7 +569,7 @@ INT_PTR CALLBACK SendPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			TranslateDialogDefault(hwnd);

 			spdps->timer = db_get_b(spdps->hContact, modname, "ConfirmTimeout", 0);

 			SetWindowLongPtr(hwnd, GWLP_USERDATA, (WPARAM)spdps);

-			if (db_get_s(spdps->hContact, modname, "PounceMsg", &dbv)) DestroyWindow(hwnd);

+			if (db_get_ts(spdps->hContact, modname, "PounceMsg", &dbv)) DestroyWindow(hwnd);

 			SetDlgItemText(hwnd,IDC_MESSAGE, dbv.ptszVal);

 			DBFreeVariant(&dbv);

 			SetTimer(hwnd,1,1000,NULL);

@@ -622,7 +622,7 @@ INT_PTR CALLBACK PounceSentDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			SetWindowLongPtr(hwnd, GWLP_USERDATA, (WPARAM)lParam);

 			TranslateDialogDefault(hwnd);

 			hContact = (HANDLE)lParam;

-			if (db_get_s(hContact, modname, "PounceMsg", &dbv)) DestroyWindow(hwnd);

+			if (db_get_ts(hContact, modname, "PounceMsg", &dbv)) DestroyWindow(hwnd);

 			SetDlgItemText(hwnd, IDC_MESSAGE, dbv.ptszVal);

 			DBFreeVariant(&dbv);

 		}

diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index 46cac2a0d8..5dc859eb9b 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -72,7 +72,7 @@ int MsgAck(WPARAM wParam, LPARAM lParam)
 			DBEVENTINFO dbei = { 0 };

 			DBVARIANT dbv;

 			int reuse = db_get_b(ack->hContact,modname, "Reuse", 0);

-			if (!db_get_s(ack->hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0'))

+			if (!db_get_ts(ack->hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0'))

 			{

 				char* pszUtf = mir_utf8encodeT(dbv.ptszVal);

 				dbei.cbSize = sizeof(dbei);

@@ -174,7 +174,7 @@ int UserOnlineSettingChanged(WPARAM wParam,LPARAM lParam)
 		{

 			HANDLE hContact = (HANDLE)wParam;

 			DBVARIANT dbv;

-			if (!db_get_s(hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0'))

+			if (!db_get_ts(hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0'))

 			{

 				// check my status

 				if (statusCheck(db_get_w(hContact, modname, "SendIfMyStatusIsFLAG", 0), CallProtoService(szProto, PS_GETSTATUS,0,0)) 

@@ -233,7 +233,7 @@ INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam)
 	HANDLE hContact = (HANDLE)wParam;

 	TCHAR* message = (TCHAR*)lParam;

 	DBVARIANT dbv;

-	if (!db_get_s(hContact, modname, "PounceMsg",&dbv))

+	if (!db_get_ts(hContact, modname, "PounceMsg",&dbv))

 	{

 		TCHAR* newPounce = (TCHAR*)mir_alloc(lstrlen(dbv.ptszVal) + lstrlen(message) + 1);

 		if (!newPounce) return 1;