From def03bef859796b00a5486343e95d3deea1d61db Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Tue, 23 Jun 2015 17:32:19 +0000
Subject: Remove  double "CMIF_ROOTHANDLE | CMIF_ROOTHANDLE" after r14350

git-svn-id: http://svn.miranda-ng.org/main/trunk@14353 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/BasicHistory/src/BasicHistory.cpp          | 2 +-
 plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp | 4 ++--
 plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp  | 4 ++--
 plugins/FTPFileYM/src/ftpfile.cpp                  | 8 ++++----
 plugins/PasteIt/src/PasteIt.cpp                    | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'plugins')

diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp
index 85fec4f606..1bfc47a413 100644
--- a/plugins/BasicHistory/src/BasicHistory.cpp
+++ b/plugins/BasicHistory/src/BasicHistory.cpp
@@ -139,7 +139,7 @@ void InitTaskMenuItems()
 		int pos = (int)taskMenus.size();
 		for (; taskIt != Options::instance->taskOptions.end(); ++taskIt) {
 			CLISTMENUITEM mi = { 0 };
-			mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
+			mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
 			mi.pszService = MS_HISTORY_EXECUTE_TASK;
 			mi.hParentMenu = hTaskMainMenu;
 			mi.popupPosition = pos++;
diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index ce772bdc54..f087d307b9 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -817,7 +817,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 	// alignment root
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Align");
-	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;
+	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszService = "";
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) _hmiAlignRoot = menuid;
@@ -858,7 +858,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 	mi.hParentMenu = root;
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Position");
-	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;
+	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszService = "";
 	mi.pszContactOwner = (char*)0;
 	menuid = pfnAdd(&mi);
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index f8a7a573ae..7f30fff6d2 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -664,7 +664,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 	mi.hParentMenu = root;
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Align");
-	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;
+	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszService = "";
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMIAlignRoot = menuid;
@@ -704,7 +704,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 	mi.popupPosition = frameid;
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Position");
-	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;
+	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszService = "";
 	mi.pszContactOwner = (char*)0;
 	menuid = pfnAdd(&mi);
diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp
index 003f81ec97..f039edde87 100644
--- a/plugins/FTPFileYM/src/ftpfile.cpp
+++ b/plugins/FTPFileYM/src/ftpfile.cpp
@@ -105,7 +105,7 @@ void InitMenuItems()
 	mi.ptszName = stzName;
 
 	CLISTMENUITEM mi2 = { 0 };
-	mi2.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR;
+	mi2.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
 	mi2.pszService = MS_FTPFILE_CONTACTMENU;
 
 	for (int i = 0; i < ServerList::FTP_COUNT; i++) 
@@ -117,7 +117,7 @@ void InitMenuItems()
 		mi.hParentMenu = 0; 
 		if (opt.bUseSubmenu)
 		{
-			mi.flags |= CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;
+			mi.flags |= CMIF_ROOTHANDLE;
 			mi.hParentMenu = hMenu;
 		}
 
@@ -125,7 +125,7 @@ void InitMenuItems()
 		mi.popupPosition = i + 1000;
 		hSubMenu[i] = Menu_AddContactMenuItem(&mi);
 
-		mi.flags |= CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;
+		mi.flags |= CMIF_ROOTHANDLE;
 		mi.hParentMenu = hMainMenu;
 		hMainSubMenu[i] = Menu_AddMainMenuItem(&mi);
 		
@@ -161,7 +161,7 @@ void InitMenuItems()
 	}
 
 	memset(&mi, 0, sizeof(mi));
-	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
 	mi.icolibItem = iconList[ServerList::FTP_COUNT].hIcolib;
 	mi.position = 3000090001;
 	mi.ptszName = LPGENT("FTP File manager");
diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp
index 772d82c3a6..a19f1f2e7c 100644
--- a/plugins/PasteIt/src/PasteIt.cpp
+++ b/plugins/PasteIt/src/PasteIt.cpp
@@ -300,7 +300,7 @@ void InitMenuItems()
 	hContactMenu = Menu_AddContactMenuItem(&mi);
 
 	memset(&mi, 0, sizeof(mi));
-	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
 	mi.pszService = MS_PASTEIT_CONTACTMENU;
 	mi.hParentMenu = hContactMenu;
 	mi.popupPosition = FROM_CLIPBOARD;
@@ -320,7 +320,7 @@ void InitMenuItems()
 	mi2.hParentMenu = hDefWebMenu;
 	for (int i = 0; i < PasteToWeb::pages; ++i)
 	{
-		mi2.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR;
+		mi2.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
 		if (Options::instance->defWeb == i)
 			mi2.flags |= CMIF_CHECKED;
 		mi2.ptszName = pasteToWebs[i]->GetName();
-- 
cgit v1.2.3