From 394540126b181982d8b61d07a084ceeac8559ed1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 19 Jun 2012 16:10:58 +0000
Subject: - dynamic hotkey translation - MS_HOTKEY_REGISTER replaced with
 Hotkey_Register

git-svn-id: http://svn.miranda-ng.org/main/trunk@482 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/clist/clistmenus.cpp |  2 +-
 src/modules/clist/keyboard.cpp   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/modules/clist')

diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp
index c9cc9212a9..f05f9c13ae 100644
--- a/src/modules/clist/clistmenus.cpp
+++ b/src/modules/clist/clistmenus.cpp
@@ -1362,7 +1362,7 @@ void InitCustomMenus(void)
 		hkd.ptszDescription = fnGetStatusModeDescription(hkd.lParam, 0);
 		hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, '0'+i) | HKF_MIRANDA_LOCAL;
 		hkd.pszService = MS_CLIST_HKSTATUS;
-		statusHotkeys[i] = CallService(MS_HOTKEY_REGISTER, 0, LPARAM(&hkd));
+		statusHotkeys[i] = Hotkey_Register(&hkd);
 	}
 
 	HookEvent(ME_HOTKEYS_CHANGED, sttRebuildHotkeys);
diff --git a/src/modules/clist/keyboard.cpp b/src/modules/clist/keyboard.cpp
index 28fc6d7be4..2942f7137e 100644
--- a/src/modules/clist/keyboard.cpp
+++ b/src/modules/clist/keyboard.cpp
@@ -91,42 +91,42 @@ int InitClistHotKeys(void)
 	shk.ptszSection = _T("Main");
 	shk.pszService = "CLIST/HK/SHOWHIDE";
 	shk.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'A');
-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk);
+	Hotkey_Register(&shk);
 
 	shk.ptszDescription = _T("Read Message");
 	shk.pszName = "ReadMessage";
 	shk.ptszSection = _T("Main");
 	shk.pszService = "CLIST/HK/Read";
 	shk.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'I');
-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk);
+	Hotkey_Register(&shk);
 /*
 	shk.pszDescription="Search in site";
 	shk.pszName="SearchInWeb";
 	shk.pszSection="Main";
 	shk.pszService="CLIST/HK/Search";
 	shk.DefHotKey=846;
-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk);
+	Hotkey_Register(&shk);
 */
 	shk.ptszDescription = _T("Open Options Page");
 	shk.pszName = "ShowOptions";
 	shk.ptszSection = _T("Main");
 	shk.pszService = "CLIST/HK/Opts";
 	shk.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'O') | HKF_MIRANDA_LOCAL;
-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk);
+	Hotkey_Register(&shk);
 
 	shk.ptszDescription = _T("Open Logging Options");
 	shk.pszName = "ShowLogOptions";
 	shk.ptszSection = _T("Main");
 	shk.pszService = "Netlib/Log/Win";
 	shk.DefHotKey = 0;
-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk);
+	Hotkey_Register(&shk);
 
 	shk.ptszDescription = _T("Open Find User Dialog");
 	shk.pszName = "FindUsers";
 	shk.ptszSection = _T("Main");
 	shk.pszService = "FindAdd/FindAddCommand";
 	shk.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'F') | HKF_MIRANDA_LOCAL;
-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk);
+	Hotkey_Register(&shk);
 
 /*
 	shk.pszDescription="Close Miranda";
@@ -134,21 +134,21 @@ int InitClistHotKeys(void)
 	shk.pszSection="Main";
 	shk.pszService="CLIST/HK/CloseMiranda";
 	shk.DefHotKey=0;
-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk);
+	Hotkey_Register(&shk);
 
 	shk.pszDescription="Restore last status";
 	shk.pszName="RestoreLastStatus";
 	shk.pszSection="Status";
 	shk.pszService="CLIST/HK/RestoreStatus";
 	shk.DefHotKey=0;
-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk);
+	Hotkey_Register(&shk);
 
 	shk.pszDescription="Set All Offline";
 	shk.pszName="AllOffline";
 	shk.pszSection="Status";
 	shk.pszService="CLIST/HK/AllOffline";
 	shk.DefHotKey=0;
-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk);
+	Hotkey_Register(&shk);
 */
 	return 0;
 }
-- 
cgit v1.2.3