From ab4abbb7a60f941acab8f0566c6b619f68f1b489 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 27 Jun 2015 11:09:19 +0000
Subject: - CLISTMENUITEM::pszContactOwner removed, because it's supported only
 by contact's menu; - Menu_AddContactMenuItem now receives parameter szProto;
 - Menu_Add* helpers are converted into real functions;

git-svn-id: http://svn.miranda-ng.org/main/trunk@14409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/HTTPServer/src/GuiElements.cpp | 40 +++++++---------------------------
 plugins/HTTPServer/src/main.cpp        |  5 ++---
 2 files changed, 10 insertions(+), 35 deletions(-)

(limited to 'plugins/HTTPServer')

diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp
index 0e98449539..07049a8ec2 100644
--- a/plugins/HTTPServer/src/GuiElements.cpp
+++ b/plugins/HTTPServer/src/GuiElements.cpp
@@ -1445,7 +1445,8 @@ void ShowPopupWindow(const char * pszName, const char * pszText, COLORREF ColorB
 // Developer       : KN
 /////////////////////////////////////////////////////////////////////
 
-void InitGuiElements() {
+void InitGuiElements()
+{
 	INITCOMMONCONTROLSEX stInitCom;
 	stInitCom.dwSize = sizeof(INITCOMMONCONTROLSEX);
 	stInitCom.dwICC = ICC_INTERNET_CLASSES;
@@ -1454,60 +1455,34 @@ void InitGuiElements() {
 	//hMainThread = GetCurrentThread();
 	DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &hMainThread, THREAD_SET_CONTEXT, FALSE, 0);
 
-
 	sUrlAddress = DBGetString(NULL, MODULE, "UrlAddress", szDefaultUrlAddress);
 	sPageKeyword = DBGetString(NULL, MODULE, "PageKeyword", szDefaultPageKeyword);
 
 	hShareNewFileService = CreateServiceFunction(MS_SHARE_NEW_FILE, nShareNewFile);
-	if (! hShareNewFileService) {
-		MessageBox(NULL, TranslateT("Failed to CreateServiceFunction MS_SHARE_NEW_FILE"), MSG_BOX_TITEL, MB_OK);
-		return;
-	}
-
 	hShowStatisticsViewService = CreateServiceFunction(MS_SHOW_STATISTICS_VIEW, nShowStatisticsView);
-	if (! hShowStatisticsViewService) {
-		MessageBox(NULL, TranslateT("Failed to CreateServiceFunction MS_SHOW_STATISTICS_VIEW"), MSG_BOX_TITEL, MB_OK);
-		return;
-	}
 
-	CLISTMENUITEM mi;
-	memset(&mi, 0, sizeof(mi));
-	mi.pszContactOwner = NULL;  //all contacts
-	mi.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SHARE_NEW_FILE));
+	CLISTMENUITEM mi = { 0 };
+	mi.icolibItem = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SHARE_NEW_FILE));
 	mi.position = -2000019955;
-	mi.ptszName = LPGENT("HTTP Share new file");
+	mi.name.t = LPGENT("HTTP Share new file");
 	mi.pszService = MS_SHARE_NEW_FILE;
-
 	hShareNewFileMenuItem = Menu_AddContactMenuItem(&mi);
-	if (!hShareNewFileMenuItem) {
-		MessageBox(NULL, TranslateT("Failed to add contact menu item"), MSG_BOX_TITEL, MB_OK);
-		return;
-	}
-
 
 	if (db_get_b(NULL, MODULE, "AddStatisticsMenuItem", 1) != 0) {
 		mi.position = 1000085005;
 		mi.flags = CMIF_TCHAR;
-		//mi.hIcon=LoadIcon(hInstance,MAKEINTRESOURCE(IDI_SHARE_NEW_FILE));
-		mi.pszContactOwner = NULL;
-		mi.ptszName = LPGENT("Show HTTP server statistics");
+		mi.name.t = LPGENT("Show HTTP server statistics");
 		mi.pszService = MS_SHOW_STATISTICS_VIEW;
 		hShowStatisticsViewMenuItem = Menu_AddMainMenuItem(&mi);
 	}
 
-
 	hEventOptionsInitialize = HookEvent(ME_OPT_INITIALISE, OptionsInitialize);
 	if (!hEventOptionsInitialize)
 		MessageBox(NULL, _T("Failed to HookEvent ME_OPT_INITIALISE"), MSG_BOX_TITEL, MB_OK);
 
 	bShowPopups = db_get_b(NULL, MODULE, "ShowPopups", bShowPopups) != 0;
-	/*
-	#ifdef _DEBUG
-	nShowStatisticsView(0,0);
-	#endif*/
 }
 
-
 /////////////////////////////////////////////////////////////////////
 // Member Function : UninitGuiElements
 // Type            : Global
@@ -1521,6 +1496,7 @@ void InitGuiElements() {
 // Developer       : KN
 /////////////////////////////////////////////////////////////////////
 
-void UnInitGuiElements() {
+void UnInitGuiElements()
+{
 	CloseHandle(hMainThread);
 }
diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp
index a885f8fe9f..0363d91c42 100644
--- a/plugins/HTTPServer/src/main.cpp
+++ b/plugins/HTTPServer/src/main.cpp
@@ -923,10 +923,9 @@ extern "C" __declspec(dllexport) int Load()
 	if (db_get_b(NULL, MODULE, "AddAcceptConMenuItem", 1)) {
 		CLISTMENUITEM mi = { 0 };
 		mi.flags = CMIF_TCHAR;
-		mi.pszContactOwner = NULL;  //all contacts
-		mi.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SHARE_NEW_FILE));
+		mi.icolibItem = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SHARE_NEW_FILE));
 		mi.position = 1000085000;
-		mi.pszName = LPGENT("Enable HTTP server");
+		mi.name.a = LPGENT("Enable HTTP server");
 		mi.pszService = MS_HTTP_ACCEPT_CONNECTIONS;
 		hAcceptConnectionsMenuItem = Menu_AddMainMenuItem(&mi);
 	}
-- 
cgit v1.2.3