From 6fad3235de6bec045fec19a7265e19e880ac84e2 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 30 Jul 2017 17:30:39 +0300
Subject: Hotkeys: code cleaning

---
 plugins/BasicHistory/src/HistoryWindow.cpp | 2 +-
 plugins/BasicHistory/src/Options.cpp       | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'plugins/BasicHistory')

diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp
index 14de1f2307..b12eafe799 100644
--- a/plugins/BasicHistory/src/HistoryWindow.cpp
+++ b/plugins/BasicHistory/src/HistoryWindow.cpp
@@ -1529,7 +1529,7 @@ bool HistoryWindow::DoHotkey(UINT msg, LPARAM lParam, WPARAM wParam, int window)
 	message.message = msg;
 	message.lParam = lParam;
 	message.wParam = wParam;
-	LRESULT mim_hotkey_check = CallService(MS_HOTKEY_CHECK, (WPARAM)&message, (LPARAM)("History"));
+	LRESULT mim_hotkey_check = Hotkey_Check(&message, "History");
 	switch (mim_hotkey_check) {
 	case HISTORY_HK_FIND:
 		SetFocus(findWindow);
diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp
index 6b33158851..a5817a06dc 100644
--- a/plugins/BasicHistory/src/Options.cpp
+++ b/plugins/BasicHistory/src/Options.cpp
@@ -178,8 +178,8 @@ struct ColorOptionsList
 struct HotkeyOptionsList
 {
 	const char *pszName;
-	const wchar_t *pwszDescription;
-	const wchar_t *pwszSection;
+	wchar_t *pwszDescription;
+	wchar_t *pwszSection;
 	const char *pszService;
 	WORD DefHotKey;
 	LPARAM lParam;
@@ -240,7 +240,6 @@ void Options::Load(void)
 	HOTKEYDESC hid = { 0 };
 	fid.cbSize = sizeof(FontIDW);
 	cid.cbSize = sizeof(ColourIDW);
-	hid.cbSize = sizeof(HOTKEYDESC);
 	strncpy_s(fid.dbSettingsGroup, "BasicHistory_Fonts", _TRUNCATE);
 	wcsncpy_s(fid.backgroundGroup, L"History", _TRUNCATE);
 	wcsncpy_s(fid.group, LPGENW("History"), _TRUNCATE);
@@ -271,8 +270,8 @@ void Options::Load(void)
 	hid.dwFlags = HKD_UNICODE;
 	for (int i = 0; i < g_hotkeysSize; ++i) {
 		hid.pszName = g_HotkeyOptionsList[i].pszName;
-		hid.pwszDescription = g_HotkeyOptionsList[i].pwszDescription;
-		hid.pwszSection = g_HotkeyOptionsList[i].pwszSection;
+		hid.szDescription.w = g_HotkeyOptionsList[i].pwszDescription;
+		hid.szSection.w = g_HotkeyOptionsList[i].pwszSection;
 		hid.pszService = g_HotkeyOptionsList[i].pszService;
 		hid.DefHotKey = g_HotkeyOptionsList[i].DefHotKey;
 		hid.lParam = g_HotkeyOptionsList[i].lParam;
-- 
cgit v1.2.3