- 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

1 files changed, 4 insertions, 6 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;

 }