From 74d73e97add44364f5f000d23e79b2f12fc8833d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 26 Jan 2014 19:14:44 +0000
Subject: useless Unicode in Sessions & WhenWasIt

git-svn-id: http://svn.miranda-ng.org/main/trunk@7912 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Sessions/Src/Main.cpp           | 23 +++++++++++------------
 plugins/WhenWasIt/src/hooked_events.cpp | 22 ++++++++++------------
 2 files changed, 21 insertions(+), 24 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index 636da73672..2180386f89 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -861,25 +861,24 @@ static int PluginInit(WPARAM wparam,LPARAM lparam)
 
 	// Hotkeys
 	HOTKEYDESC hkd = { sizeof(hkd) };
-	hkd.dwFlags = HKD_TCHAR;
-	hkd.ptszSection = LPGENT("Sessions");
+	hkd.pszSection = LPGEN("Sessions");
 	hkd.pszName = "OpenSessionsManager";
-	hkd.ptszDescription = LPGENT("Open Sessions Manager");
+	hkd.pszDescription = LPGEN("Open Sessions Manager");
 	hkd.pszService = MS_SESSIONS_OPENMANAGER;
 	Hotkey_Register(&hkd);
 
 	hkd.pszName = "RestoreLastSession";
-	hkd.ptszDescription = LPGENT("Restore last Session");
+	hkd.pszDescription = LPGEN("Restore last Session");
 	hkd.pszService = MS_SESSIONS_RESTORELASTSESSION;
 	Hotkey_Register(&hkd);
 
 	hkd.pszName = "SaveSession";
-	hkd.ptszDescription = LPGENT("Save Session");
+	hkd.pszDescription = LPGEN("Save Session");
 	hkd.pszService = MS_SESSIONS_SAVEUSERSESSION;
 	Hotkey_Register(&hkd);
 
 	hkd.pszName = "CloseSession";
-	hkd.ptszDescription = LPGENT("Close Session");
+	hkd.pszDescription = LPGEN("Close Session");
 	hkd.pszService = MS_SESSIONS_CLOSESESSION;
 	Hotkey_Register(&hkd);
 
@@ -889,25 +888,25 @@ static int PluginInit(WPARAM wparam,LPARAM lparam)
 	// Main menu
 	CLISTMENUITEM cl = { sizeof(cl) };
 	cl.position = 1000000000;
-	cl.flags = CMIM_ALL | CMIF_TCHAR;
+	cl.flags = CMIM_ALL;
 
-	cl.ptszName = LPGENT("Save session...");
-	cl.ptszPopupName = LPGENT("Sessions Manager");
+	cl.pszName = LPGEN("Save session...");
+	cl.pszPopupName = LPGEN("Sessions Manager");
 	cl.icolibItem = iconList[0].hIcolib;
 	cl.pszService = MS_SESSIONS_SAVEUSERSESSION;
 	hmSaveCurrentSession = Menu_AddMainMenuItem(&cl);
 
-	cl.ptszName = LPGENT("Load session...");
+	cl.pszName = LPGEN("Load session...");
 	cl.pszService = MS_SESSIONS_OPENMANAGER;
 	cl.icolibItem = iconList[3].hIcolib;
 	hmLoadLastSession = Menu_AddMainMenuItem(&cl);
 
-	cl.ptszName = LPGENT("Close session");
+	cl.pszName = LPGEN("Close session");
 	cl.pszService = MS_SESSIONS_CLOSESESSION;
 	cl.icolibItem = 0;
 	hmLoadSession = Menu_AddMainMenuItem(&cl);
 
-	cl.ptszName = LPGENT("Load last session");
+	cl.pszName = LPGEN("Load last session");
 	cl.pszService = MS_SESSIONS_RESTORELASTSESSION;
 	cl.icolibItem = iconList[5].hIcolib;
 	cl.position = 10100000;
diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp
index 97fe0bdfbb..9cf7266433 100644
--- a/plugins/WhenWasIt/src/hooked_events.cpp
+++ b/plugins/WhenWasIt/src/hooked_events.cpp
@@ -85,54 +85,52 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 
 	CLISTMENUITEM cl = { sizeof(cl) };
 	cl.position = 10000000;
-	cl.flags = CMIF_TCHAR;
-	cl.ptszPopupName = LPGENT("Birthdays (When Was It)");
+	cl.pszPopupName = LPGEN("Birthdays (When Was It)");
 
 	cl.pszService = MS_WWI_CHECK_BIRTHDAYS;
 	cl.icolibItem = hCheckMenu;
-	cl.ptszName = LPGENT("Check for birthdays");
+	cl.pszName = LPGEN("Check for birthdays");
 	hmCheckBirthdays = Menu_AddMainMenuItem(&cl);
 	
 	cl.pszService = MS_WWI_LIST_SHOW;
-	cl.ptszName = LPGENT("Birthday list");
+	cl.pszName = LPGEN("Birthday list");
 	cl.icolibItem = hListMenu;
 	hmBirthdayList = Menu_AddMainMenuItem(&cl);
 	
 	cl.pszService = MS_WWI_REFRESH_USERDETAILS;
 	cl.position = 10100000;
-	cl.ptszName = LPGENT("Refresh user details");
+	cl.pszName = LPGEN("Refresh user details");
 	cl.icolibItem = hRefreshUserDetails;
 	hmRefreshDetails = Menu_AddMainMenuItem(&cl);
 	
 	cl.pszService = MS_WWI_IMPORT_BIRTHDAYS;
 	cl.position = 10200000;
-	cl.ptszName = LPGENT("Import birthdays");
+	cl.pszName = LPGEN("Import birthdays");
 	cl.icolibItem = hImportBirthdays;
 	hmImportBirthdays = Menu_AddMainMenuItem(&cl);
 	
 	cl.pszService = MS_WWI_EXPORT_BIRTHDAYS;
-	cl.ptszName = LPGENT("Export birthdays");
+	cl.pszName = LPGEN("Export birthdays");
 	cl.icolibItem = hExportBirthdays;
 	hmExportBirthdays = Menu_AddMainMenuItem(&cl);
 	
 	cl.pszService = MS_WWI_ADD_BIRTHDAY;
 	cl.position = 10000000;
 	cl.icolibItem = hAddBirthdayContact;
-	cl.ptszName = LPGENT("Add/change user &birthday");
+	cl.pszName = LPGEN("Add/change user &birthday");
 	hmAddChangeBirthday = Menu_AddContactMenuItem(&cl);
 
 	// Register hotkeys
 	HOTKEYDESC hotkey = { sizeof(hotkey) };
-	hotkey.ptszSection = LPGENT("Birthdays");
-	hotkey.dwFlags = HKD_TCHAR;
+	hotkey.pszSection = LPGEN("Birthdays");
 
 	hotkey.pszName = "wwi_birthday_list";
-	hotkey.ptszDescription = LPGENT("Birthday list");
+	hotkey.pszDescription = LPGEN("Birthday list");
 	hotkey.pszService = MS_WWI_LIST_SHOW;
 	Hotkey_Register(&hotkey);
 		
 	hotkey.pszName = "wwi_check_birthdays";
-	hotkey.ptszDescription = LPGENT("Check for birthdays");
+	hotkey.pszDescription = LPGEN("Check for birthdays");
 	hotkey.pszService = MS_WWI_CHECK_BIRTHDAYS;
 	Hotkey_Register(&hotkey);
 	
-- 
cgit v1.2.3