- 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, 20 insertions, 20 deletions

diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index 9514293cf3..d973548e74 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -285,18 +285,18 @@ int RegisterPOP3Plugin(WPARAM,LPARAM)
 			szProto = GetContactProto(hContact);

 			if (szProto != NULL && strcmp(szProto, YAMN_DBMODULE)==0)

 			{

-				if (!DBGetContactSettingString(hContact,YAMN_DBMODULE,"Id",&dbv)) {

+				if (!db_get_s(hContact,YAMN_DBMODULE,"Id",&dbv)) {

 					if ( strcmp( dbv.pszVal, Finder->Name) == 0) {

 						Finder->hContact = hContact;

-						DBWriteContactSettingWord(Finder->hContact, YAMN_DBMODULE, "Status", ID_STATUS_ONLINE);

-						DBWriteContactSettingString(Finder->hContact, "CList", "StatusMsg", Translate("No new mail message"));

+						db_set_w(Finder->hContact, YAMN_DBMODULE, "Status", ID_STATUS_ONLINE);

+						db_set_s(Finder->hContact, "CList", "StatusMsg", Translate("No new mail message"));

 						if ((Finder->Flags & YAMN_ACC_ENA) && (Finder->NewMailN.Flags & YAMN_ACC_CONT))

-							DBDeleteContactSetting(Finder->hContact, "CList", "Hidden");

+							db_unset(Finder->hContact, "CList", "Hidden");

 

 						if (!(Finder->Flags & YAMN_ACC_ENA) || !(Finder->NewMailN.Flags & YAMN_ACC_CONT))

-							DBWriteContactSettingByte(Finder->hContact, "CList", "Hidden", 1);

+							db_set_b(Finder->hContact, "CList", "Hidden", 1);

 					}

-					DBFreeVariant(&dbv);

+					db_free(&dbv);

 				}

 			}

 			hContact = db_find_next(hContact);

@@ -306,10 +306,10 @@ int RegisterPOP3Plugin(WPARAM,LPARAM)
 			//No account contact found, have to create one

 			Finder->hContact =(HANDLE) CallService(MS_DB_CONTACT_ADD, 0, 0);

 			CallService(MS_PROTO_ADDTOCONTACT,(WPARAM)Finder->hContact,(LPARAM)YAMN_DBMODULE);

-			DBWriteContactSettingString(Finder->hContact,YAMN_DBMODULE,"Id",Finder->Name);

-			DBWriteContactSettingString(Finder->hContact,YAMN_DBMODULE,"Nick",Finder->Name);

-			DBWriteContactSettingString(Finder->hContact,"Protocol","p",YAMN_DBMODULE);

-			DBWriteContactSettingWord(Finder->hContact, YAMN_DBMODULE, "Status", YAMN_STATUS);

+			db_set_s(Finder->hContact,YAMN_DBMODULE,"Id",Finder->Name);

+			db_set_s(Finder->hContact,YAMN_DBMODULE,"Nick",Finder->Name);

+			db_set_s(Finder->hContact,"Protocol","p",YAMN_DBMODULE);

+			db_set_w(Finder->hContact, YAMN_DBMODULE, "Status", YAMN_STATUS);

 		}

 	}

 

@@ -407,7 +407,7 @@ HYAMNMAIL WINAPI CreatePOP3Mail(HACCOUNT Account,DWORD MailDataVersion)
 

 static void SetContactStatus(HACCOUNT account, int status) {

 	if ((account->hContact) && (account->NewMailN.Flags & YAMN_ACC_CONT)) {

-		DBWriteContactSettingWord(account->hContact, YAMN_DBMODULE, "Status", status);

+		db_set_w(account->hContact, YAMN_DBMODULE, "Status", status);

 	}

 }

 

diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
index 72696430ab..698ce1f9fa 100644
--- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
@@ -20,13 +20,13 @@ INT_PTR CALLBACK DlgProcYAMNOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam)
 	switch(msg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hDlg);

-		CheckDlgButton(hDlg,IDC_CHECKTTB,DBGetContactSettingByte(NULL,YAMN_DBMODULE,YAMN_TTBFCHECK,1) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hDlg,IDC_CHECKTTB,db_get_b(NULL,YAMN_DBMODULE,YAMN_TTBFCHECK,1) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hDlg,IDC_LONGDATE,(optDateTime&SHOWDATELONG) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hDlg,IDC_SMARTDATE,(optDateTime&SHOWDATENOTODAY) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hDlg,IDC_NOSECONDS,(optDateTime&SHOWDATENOSECONDS) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hDlg,IDC_MAINMENU,DBGetContactSettingByte(NULL, YAMN_DBMODULE, YAMN_SHOWMAINMENU, 1));

-		CheckDlgButton(hDlg,IDC_YAMNASPROTO,DBGetContactSettingByte(NULL, YAMN_DBMODULE, YAMN_SHOWASPROTO, 1));

-		CheckDlgButton(hDlg,IDC_CLOSEONDELETE,DBGetContactSettingByte(NULL, YAMN_DBMODULE, YAMN_CLOSEDELETE, 0));

+		CheckDlgButton(hDlg,IDC_MAINMENU,db_get_b(NULL, YAMN_DBMODULE, YAMN_SHOWMAINMENU, 1));

+		CheckDlgButton(hDlg,IDC_YAMNASPROTO,db_get_b(NULL, YAMN_DBMODULE, YAMN_SHOWASPROTO, 1));

+		CheckDlgButton(hDlg,IDC_CLOSEONDELETE,db_get_b(NULL, YAMN_DBMODULE, YAMN_CLOSEDELETE, 0));

 		break;

 

 	case WM_COMMAND:

@@ -48,10 +48,10 @@ INT_PTR CALLBACK DlgProcYAMNOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam)
 		case 0:

 			switch(((LPNMHDR)lParam)->code) {

 			case PSN_APPLY:

-				DBWriteContactSettingByte(NULL, YAMN_DBMODULE, YAMN_SHOWASPROTO,  IsDlgButtonChecked(hDlg,IDC_YAMNASPROTO));

-				DBWriteContactSettingByte(NULL, YAMN_DBMODULE, YAMN_SHOWMAINMENU, IsDlgButtonChecked(hDlg,IDC_MAINMENU));

-				DBWriteContactSettingByte(NULL, YAMN_DBMODULE, YAMN_CLOSEDELETE,  IsDlgButtonChecked(hDlg,IDC_CLOSEONDELETE));

-				DBWriteContactSettingByte(NULL, YAMN_DBMODULE, YAMN_TTBFCHECK,    IsDlgButtonChecked(hDlg,IDC_CHECKTTB));

+				db_set_b(NULL, YAMN_DBMODULE, YAMN_SHOWASPROTO,  IsDlgButtonChecked(hDlg,IDC_YAMNASPROTO));

+				db_set_b(NULL, YAMN_DBMODULE, YAMN_SHOWMAINMENU, IsDlgButtonChecked(hDlg,IDC_MAINMENU));

+				db_set_b(NULL, YAMN_DBMODULE, YAMN_CLOSEDELETE,  IsDlgButtonChecked(hDlg,IDC_CLOSEONDELETE));

+				db_set_b(NULL, YAMN_DBMODULE, YAMN_TTBFCHECK,    IsDlgButtonChecked(hDlg,IDC_CHECKTTB));

 				

 				AddTopToolbarIcon(0, 0);

 				CheckMenuItems();

@@ -60,7 +60,7 @@ INT_PTR CALLBACK DlgProcYAMNOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam)
 				if (IsDlgButtonChecked(hDlg,IDC_LONGDATE))optDateTime |= SHOWDATELONG;

 				if (IsDlgButtonChecked(hDlg,IDC_SMARTDATE))optDateTime |= SHOWDATENOTODAY;

 				if (IsDlgButtonChecked(hDlg,IDC_NOSECONDS))optDateTime |= SHOWDATENOSECONDS;

-				DBWriteContactSettingByte(NULL,YAMN_DBMODULE,YAMN_DBTIMEOPTIONS,optDateTime);

+				db_set_b(NULL,YAMN_DBMODULE,YAMN_DBTIMEOPTIONS,optDateTime);

 			}

 		}

 		break;