another fix for OTR Verify icon

2 files changed, 13 insertions, 19 deletions

diff --git a/plugins/MirOTR/src/language.h b/plugins/MirOTR/src/language.h
index e6b4da1bfe..0ba6152ba8 100644
--- a/plugins/MirOTR/src/language.h
+++ b/plugins/MirOTR/src/language.h
@@ -14,12 +14,6 @@
 #define LANG_STATUS_PRIVATE					LPGENW("OTR Encryption: Private")
 #define LANG_STATUS_FINISHED				LPGENW("OTR Encryption: Finished")
 
-#define LANG_MENU_START						LPGENW("&Start OTR session")
-#define LANG_MENU_REFRESH					LPGENW("&Refresh OTR session")
-#define LANG_MENU_STOP						LPGENW("Sto&p OTR session")
-#define LANG_MENU_VERIFY					LPGENW("&Verify Fingerprint")
-#define LANG_MENU_TOGGLEHTML				LPGENW("&Convert HTML (for Pidgin)")
-
 #define LANG_SESSION_TERMINATED_OTR			LPGENW("OTR encrypted session with '%s' has been terminated")
 #define LANG_SESSION_REQUEST_OTR			LPGENW("Requesting OTR encrypted session with '%s'")
 #define LANG_SESSION_START_OTR				LPGENW("Beginning OTR encrypted session with '%s'")
diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp
index 8aaae58e2f..22bdb8deaf 100644
--- a/plugins/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/src/mirotrmenu.cpp
@@ -167,37 +167,37 @@ void InitMirOTRMenu(void)
 
 	// menu items
 	CMenuItem mi(&g_plugin);
-	mi.flags = CMIF_DISABLED | CMIF_UNICODE;
-	mi.name.w = LPGENW("OTR Status");
+	mi.flags = CMIF_DISABLED;
+	mi.name.a = LPGEN("OTR Status");
 	mi.position = 0;
 	hStatusInfoItem = AddMirOTRMenuItem(&mi, nullptr);
 
-	mi.flags = CMIF_UNICODE | CMIF_NOTPRIVATE | CMIF_NOTUNVERIFIED;
-	mi.name.w = LANG_MENU_START;
+	mi.flags = CMIF_NOTPRIVATE | CMIF_NOTUNVERIFIED;
+	mi.name.a = LPGEN("&Start OTR session");
 	mi.position = 100001;
 	mi.hIcolibItem = iconList[ICON_UNVERIFIED].hIcolib;
 	AddMirOTRMenuItem(&mi, MS_OTR_MENUSTART);
 
-	mi.flags = CMIF_UNICODE | CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED;
-	mi.name.w = LANG_MENU_REFRESH;
+	mi.flags = CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED;
+	mi.name.a = LPGEN("&Refresh OTR session");
 	mi.position = 100002;
 	mi.hIcolibItem = iconList[ICON_REFRESH].hIcolib;
 	AddMirOTRMenuItem(&mi, MS_OTR_MENUREFRESH);
 
-	mi.flags = CMIF_UNICODE | CMIF_NOTNOTPRIVATE;
-	mi.name.w = LANG_MENU_STOP;
+	mi.flags = CMIF_NOTNOTPRIVATE;
+	mi.name.a = LPGEN("Sto&p OTR session");
 	mi.position = 100003;
 	mi.hIcolibItem = iconList[ICON_NOT_PRIVATE].hIcolib;
 	AddMirOTRMenuItem(&mi, MS_OTR_MENUSTOP);
 
-	mi.flags = CMIF_UNICODE | CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED;
-	mi.name.w = LANG_MENU_VERIFY;
+	mi.flags = CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED;
+	mi.name.a = LPGEN("&Verify Fingerprint");
 	mi.position = 200001;
-	mi.hIcolibItem = iconList[ICON_PRIVATE].hIcolib;
+	mi.hIcolibItem = iconList[ICON_OTR].hIcolib;
 	AddMirOTRMenuItem(&mi, MS_OTR_MENUVERIFY);
 
-	mi.flags = CMIF_UNICODE | CMIF_CHECKED;
-	mi.name.w = LANG_MENU_TOGGLEHTML;
+	mi.flags = CMIF_CHECKED;
+	mi.name.a = LPGEN("&Convert HTML (for Pidgin)");
 	mi.position = 300001;
 	mi.hIcolibItem = nullptr;
 	hHTMLConvMenuItem = AddMirOTRMenuItem(&mi, MS_OTR_MENUTOGGLEHTML);