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

diff --git a/src/core/stdaway/awaymsg.cpp b/src/core/stdaway/awaymsg.cpp
index dc1e2441db..6cfc28c725 100644
--- a/src/core/stdaway/awaymsg.cpp
+++ b/src/core/stdaway/awaymsg.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 int LoadAwayMessageSending(void);

 

-static HANDLE hAwayMsgMenuItem;

+static HGENMENU hAwayMsgMenuItem;

 static HANDLE hWindowList;

 

 struct AwayMsgDlgData {

@@ -54,7 +54,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP
 				TCHAR str[256], format[128];

 				TCHAR *contactName = pcli->pfnGetContactDisplayName(dat->hContact, 0);

 				char *szProto = GetContactProto(dat->hContact);

-				WORD dwStatus = DBGetContactSettingWord(dat->hContact, szProto, "Status", ID_STATUS_OFFLINE);

+				WORD dwStatus = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_OFFLINE);

 				TCHAR *status = pcli->pfnGetStatusModeDescription(dwStatus, 0);

 

 				GetWindowText(hwndDlg, format, SIZEOF(format));

@@ -139,9 +139,9 @@ static int AwayMsgPreBuildMenu(WPARAM wParam, LPARAM)
 	mi.flags = CMIM_FLAGS | CMIF_NOTOFFLINE | CMIF_HIDDEN | CMIF_TCHAR;

 

 	if (szProto != NULL) {

-		int chatRoom = szProto ? DBGetContactSettingByte((HANDLE)wParam, szProto, "ChatRoom", 0) : 0;

+		int chatRoom = szProto ? db_get_b((HANDLE)wParam, szProto, "ChatRoom", 0) : 0;

 		if ( !chatRoom) {

-			int status = DBGetContactSettingWord((HANDLE)wParam, szProto, "Status", ID_STATUS_OFFLINE);

+			int status = db_get_w((HANDLE)wParam, szProto, "Status", ID_STATUS_OFFLINE);

 			mir_sntprintf(str, SIZEOF(str), TranslateT("Re&ad %s Message"), pcli->pfnGetStatusModeDescription(status, 0));

 			mi.ptszName = str;

 			if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGRECV) {

@@ -150,7 +150,7 @@ static int AwayMsgPreBuildMenu(WPARAM wParam, LPARAM)
 					mi.hIcon = LoadSkinProtoIcon(szProto, status);

 	}	}	}	}

 

-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hAwayMsgMenuItem, (LPARAM)&mi);

+	Menu_ModifyItem(hAwayMsgMenuItem, &mi);

 	IcoLib_ReleaseIcon(mi.hIcon, 0);

 	return 0;

 }

diff --git a/src/core/stdaway/sendmsg.cpp b/src/core/stdaway/sendmsg.cpp
index c0742aeb9a..e9119d4eda 100644
--- a/src/core/stdaway/sendmsg.cpp
+++ b/src/core/stdaway/sendmsg.cpp
@@ -33,7 +33,7 @@ static bool Proto_IsAccountEnabled(PROTOACCOUNT* pa)
 

 static bool Proto_IsAccountLocked(PROTOACCOUNT* pa)

 {

-	return pa && DBGetContactSettingByte(NULL, pa->szModuleName, "LockMainStatus", 0) != 0;

+	return pa && db_get_b(NULL, pa->szModuleName, "LockMainStatus", 0) != 0;

 }

 

 static const TCHAR *GetDefaultMessage(int status)

@@ -98,11 +98,11 @@ static TCHAR* GetAwayMessage(int statusMode, char *szProto)
 

 	DBVARIANT dbv;

 	if ( GetStatusModeByte(statusMode, "UsePrev")) {

-		if ( DBGetContactSettingTString(NULL, "SRAway", StatusModeToDbSetting(statusMode, "Msg"), &dbv))

+		if ( db_get_ts(NULL, "SRAway", StatusModeToDbSetting(statusMode, "Msg"), &dbv))

 			dbv.ptszVal = mir_tstrdup(GetDefaultMessage(statusMode));

 	}

 	else {

-		if ( DBGetContactSettingTString(NULL, "SRAway", StatusModeToDbSetting(statusMode, "Default"), &dbv))

+		if ( db_get_ts(NULL, "SRAway", StatusModeToDbSetting(statusMode, "Default"), &dbv))

 			dbv.ptszVal = mir_tstrdup(GetDefaultMessage(statusMode));

 

 		for (int i=0; dbv.ptszVal[i]; i++) {

@@ -281,7 +281,7 @@ static INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wPa
 				TCHAR str[1024];

 				GetDlgItemText(hwndDlg, IDC_MSG, str, SIZEOF(str));

 				ChangeAllProtoMessages(dat->szProto, dat->statusMode, str);

-				DBWriteContactSettingTString(NULL, "SRAway", StatusModeToDbSetting(dat->statusMode, "Msg"), str);

+				db_set_ts(NULL, "SRAway", StatusModeToDbSetting(dat->statusMode, "Msg"), str);

 				DestroyWindow(hwndDlg);

 			}

 			else PostMessage(hwndDlg, WM_CLOSE, 0, 0);

@@ -408,8 +408,8 @@ static INT_PTR CALLBACK DlgProcAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 				dat->info[j].usePrevious = GetStatusModeByte(statusModes[i], "UsePrev");

 

 				DBVARIANT dbv;

-				if (DBGetContactSettingTString(NULL, "SRAway", StatusModeToDbSetting(statusModes[i], "Default"), &dbv))

-					if (DBGetContactSettingTString(NULL, "SRAway", StatusModeToDbSetting(statusModes[i], "Msg"), &dbv))

+				if (db_get_ts(NULL, "SRAway", StatusModeToDbSetting(statusModes[i], "Default"), &dbv))

+					if (db_get_ts(NULL, "SRAway", StatusModeToDbSetting(statusModes[i], "Msg"), &dbv))

 						dbv.ptszVal = mir_tstrdup(GetDefaultMessage(statusModes[i]));

 				lstrcpy(dat->info[j].msg, dbv.ptszVal);

 				mir_free(dbv.ptszVal);