- rest of menus cleared;

- old database macroses wiped out from all plugins (left in m_database.h for compatibility)

git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 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 a3ff2cb3f0..7730653313 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -76,11 +76,11 @@ void getDefaultMessage(HWND hwnd, UINT control, HANDLE hContact)
 	DBVARIANT dbv;

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

 		SetDlgItemText(hwnd, control, dbv.ptszVal);

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

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

 			SetDlgItemText(hwnd, control, dbv.ptszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 			}

 }

 INT_PTR CALLBACK StatusModesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

@@ -333,7 +333,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 					db_set_w(hContact, modname, "SendIfTheirStatusIsFLAG", (WORD)db_get_w(NULL, modname, "SendIfTheirStatusIsFLAG",0));

 					db_set_b(hContact, modname, "Reuse",(BYTE)db_get_b(NULL, modname, "Reuse",0));

 					db_set_b(hContact, modname, "GiveUpDays", (BYTE)db_get_b(NULL, modname, "GiveUpDays",0));

-					db_set_dw(hContact, modname, "GiveUpDate", (DWORD)DBGetContactSettingDword(NULL, modname, "GiveUpDate",0));

+					db_set_dw(hContact, modname, "GiveUpDate", (DWORD)db_get_dw(NULL, modname, "GiveUpDate",0));

 					db_set_w(hContact, modname, "ConfirmTimeout", (WORD)db_get_w(NULL, modname, "ConfirmTimeout",0));

 				}

 				break;

@@ -536,7 +536,7 @@ INT_PTR CALLBACK SendPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			SetWindowLongPtr(hwnd, GWLP_USERDATA, (WPARAM)spdps);

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

 			SetDlgItemText(hwnd,IDC_MESSAGE, dbv.ptszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 			SetTimer(hwnd,1,1000,NULL);

 			SendMessage(hwnd,WM_TIMER,0,0);

 		}

@@ -587,7 +587,7 @@ INT_PTR CALLBACK PounceSentDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			if (db_get_ts(hContact, modname, "PounceMsg", &dbv))

 				DestroyWindow(hwnd);

 			SetDlgItemText(hwnd, IDC_MESSAGE, dbv.ptszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 		break;

 		case WM_COMMAND:

diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index f95b995798..1b92532deb 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -186,7 +186,7 @@ int UserOnlineSettingChanged(WPARAM wParam,LPARAM lParam)
 						else SendPounce(dbv.ptszVal, hContact);

 					}

 				}

-				DBFreeVariant(&dbv);

+				db_free(&dbv);

 			}

 		}

 	}

@@ -228,7 +228,7 @@ INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam)
 		_tcscat(newPounce, message);

 		db_set_ws(hContact, modname, "PounceMsg", newPounce);

 		mir_free(newPounce);

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 	else AddSimpleMessage((WPARAM)hContact, (LPARAM)message);

 	return 0;