From b7033cda5f3598d477ea37fe2dd343871ae23739 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 9 Jul 2015 11:30:37 +0000
Subject: buggy function removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@14515 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_app/src/menu_clist.cpp | 14 +++++---------
 src/mir_app/src/mir_app.def    |  1 -
 src/mir_app/src/mir_app64.def  |  1 -
 3 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp
index 3bd8a919d8..b193727c4f 100644
--- a/src/mir_app/src/menu_clist.cpp
+++ b/src/mir_app/src/menu_clist.cpp
@@ -167,8 +167,10 @@ struct MainMenuExecParam
 	TMO_IntMenuItem *pimi;
 };
 
-MIR_APP_DLL(HMENU) Menu_BuildMainMenu(void)
+MIR_APP_DLL(HMENU) Menu_GetMainMenu(void)
 {
+	RecursiveDeleteMenu(hMainMenu);
+
 	NotifyEventHooks(hPreBuildMainMenuEvent, 0, 0);
 
 	Menu_Build(hMainMenu, hMainMenuObject);
@@ -176,12 +178,6 @@ MIR_APP_DLL(HMENU) Menu_BuildMainMenu(void)
 	return hMainMenu;
 }
 
-MIR_APP_DLL(HMENU) Menu_GetMainMenu(void)
-{
-	RecursiveDeleteMenu(hMainMenu);
-	return Menu_BuildMainMenu();
-}
-
 MIR_APP_DLL(HGENMENU) Menu_AddMainMenuItem(TMO_MenuItem *pmi)
 {
 	MainMenuExecParam *mmep = (MainMenuExecParam*)mir_alloc(sizeof(MainMenuExecParam));
@@ -793,10 +789,10 @@ void RebuildMenuOrder(void)
 {
 	BYTE bHideStatusMenu = db_get_b(NULL, "CLUI", "DontHideStatusMenu", 0); // cool perversion, though
 
-	//clear statusmenu
+	// clear statusmenu
 	RecursiveDeleteMenu(hStatusMenu);
 
-	//status menu
+	// status menu
 	if (hStatusMenuObject != 0) {
 		Menu_RemoveObject(hStatusMenuObject);
 		mir_free(hStatusMainMenuHandles);
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 56dd4712d9..b9236bd42d 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -226,7 +226,6 @@ Menu_AddMainMenuItem @223
 Menu_AddProtoMenuItem @224
 Menu_AddStatusMenuItem @225
 Menu_BuildContactMenu @226
-Menu_BuildMainMenu @227
 Menu_GetMainMenu @228
 Menu_GetStatusMenu @229
 Menu_BuildSubGroupMenu @230
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 0d97c9481b..263b24cdb0 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -226,7 +226,6 @@ Menu_AddMainMenuItem @223
 Menu_AddProtoMenuItem @224
 Menu_AddStatusMenuItem @225
 Menu_BuildContactMenu @226
-Menu_BuildMainMenu @227
 Menu_GetMainMenu @228
 Menu_GetStatusMenu @229
 Menu_BuildSubGroupMenu @230
-- 
cgit v1.2.3