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

diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp
index 68818744b4..945cdefabe 100644
--- a/src/core/stdurl/url.cpp
+++ b/src/core/stdurl/url.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 HANDLE hUrlWindowList = NULL;

 static HANDLE hEventContactSettingChange = NULL;

 static HANDLE hContactDeleted = NULL;

-static HANDLE hSRUrlMenuItem = NULL;

+static HGENMENU hSRUrlMenuItem = NULL;

 

 INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

@@ -108,15 +108,13 @@ static int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 

 static int SRUrlPreBuildMenu(WPARAM wParam, LPARAM)

 {

-	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIM_FLAGS | CMIF_HIDDEN;

-

+	bool bEnabled = false;

 	char *szProto = GetContactProto((HANDLE)wParam);

 	if (szProto != NULL)

 		if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_URLSEND)

-			mi.flags = CMIM_FLAGS;

+			bEnabled = true;

 

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

+	Menu_ShowItem(hSRUrlMenuItem, bEnabled);

 	return 0;

 }

 

diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp
index b824c20618..8cdb93ba51 100644
--- a/src/core/stdurl/urldialogs.cpp
+++ b/src/core/stdurl/urldialogs.cpp
@@ -64,7 +64,7 @@ static void sttUpdateTitle(HWND hwndDlg, HANDLE hContact)
 			else 

 				SetDlgItemText(hwndDlg, IDC_NAME, contactName);

 

-			szStatus = pcli->pfnGetStatusModeDescription(szProto == NULL ? ID_STATUS_OFFLINE : DBGetContactSettingWord(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

+			szStatus = pcli->pfnGetStatusModeDescription(szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 			mir_sntprintf(newtitle, SIZEOF(newtitle), _T("%s %s (%s)"), pszNewTitleStart, contactName, szStatus);

 		}

 	}

@@ -119,7 +119,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		}

 

 		// From message dlg

-		if ( !DBGetContactSettingByte(dat->hContact, "CList", "NotOnList", 0))

+		if ( !db_get_b(dat->hContact, "CList", "NotOnList", 0))

 			ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), SW_HIDE);

 

 		SendMessage(hwndDlg, DM_UPDATETITLE, 0, 0);

@@ -217,7 +217,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				acs.szProto = 0;

 				CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

 			}

-			if ( !DBGetContactSettingByte(dat->hContact, "CList", "NotOnList", 0)) {

+			if ( !db_get_b(dat->hContact, "CList", "NotOnList", 0)) {

 				ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

 			}

 			break;

@@ -488,7 +488,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		mir_subclassWindow( GetWindow(GetDlgItem(hwndDlg, IDC_URLS), GW_CHILD), SendEditSubclassProc);

 

 		// From message dlg

-		if ( !DBGetContactSettingByte(dat->hContact, "CList", "NotOnList", 0))

+		if ( !db_get_b(dat->hContact, "CList", "NotOnList", 0))

 			ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), SW_HIDE);

 

 		SendMessage(hwndDlg, DM_UPDATETITLE, 0, 0);

@@ -612,7 +612,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			acs.szProto = 0;

 			CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

 

-			if ( !DBGetContactSettingByte(dat->hContact, "CList", "NotOnList", 0))

+			if ( !db_get_b(dat->hContact, "CList", "NotOnList", 0))

 				ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

 		}

 		break;