- fixed YAMN hotkey (fixes #443)

git-svn-id: http://svn.miranda-ng.org/main/trunk@5734 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 5 insertions, 5 deletions

diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp
index 64b9642e64..ed0ea35794 100644
--- a/plugins/YAMN/src/main.cpp
+++ b/plugins/YAMN/src/main.cpp
@@ -315,7 +315,6 @@ static void LoadPlugins()
 

 extern "C" int __declspec(dllexport) Load(void)

 {

-	int i, k;

 	mir_getLP(&pluginInfo);

 

 	YAMN_STATUS = ID_STATUS_OFFLINE;

@@ -334,7 +333,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	// Enumerate all the code pages available for the System Locale

 	EnumSystemCodePages(EnumSystemCodePagesProc, CP_INSTALLED);

 	CodePageNamesSupp = new _tcptable[CPLENSUPP];

-	for (i = 0, k = 0; i < CPLENALL; i++) {

+	for (int i = 0, k = 0; i < CPLENALL; i++) {

 		if (CodePageNamesAll[i].isValid) {

 			CodePageNamesSupp[k] = CodePageNamesAll[i];

 			k++;

@@ -395,6 +394,7 @@ extern "C" int __declspec(dllexport) Load(void)
 

 	HOTKEYDESC hkd = {0};

 	hkd.cbSize = sizeof(hkd);

+	hkd.pszName = "YAMN_hotkey";

 	hkd.pszService = MS_YAMN_FORCECHECK;

 	hkd.pszSection = YAMN_DBMODULE;

 	hkd.pszDescription = LPGEN("Check mail");

@@ -402,7 +402,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	Hotkey_Register(&hkd);

 

 	//Create thread that will be executed every second

-	if (!(SecTimer = SetTimer(NULL, 0, 1000, (TIMERPROC)TimerProc)))

+	if (!(SecTimer = SetTimer(NULL, 0, 1000, TimerProc)))

 		return 1;

 

 	return 0;

diff --git a/plugins/YAMN/src/yamn.cpp b/plugins/YAMN/src/yamn.cpp
index adc552555e..4d9ba92ae2 100644
--- a/plugins/YAMN/src/yamn.cpp
+++ b/plugins/YAMN/src/yamn.cpp
@@ -94,7 +94,7 @@ INT_PTR GetVariablesSvc(WPARAM wParam, LPARAM)
 	return wParam==YAMN_VARIABLESVERSION ? (INT_PTR)&YAMNVar : (INT_PTR)NULL;

 }

 

-void CALLBACK TimerProc(HWND, UINT, UINT, DWORD)

+void CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD)

 {

 	PYAMN_PROTOPLUGINQUEUE ActualPlugin;

 	HACCOUNT ActualAccount;

diff --git a/plugins/YAMN/src/yamn.h b/plugins/YAMN/src/yamn.h
index b7785d1651..77bdb713c5 100644
--- a/plugins/YAMN/src/yamn.h
+++ b/plugins/YAMN/src/yamn.h
@@ -76,7 +76,7 @@ void UnInitDebug();
 //From yamn.cpp

 INT_PTR GetFcnPtrSvc(WPARAM wParam,LPARAM lParam);

 INT_PTR GetVariablesSvc(WPARAM,LPARAM);

-void CALLBACK TimerProc(HWND,UINT,UINT,DWORD);

+void CALLBACK TimerProc(HWND,UINT,UINT_PTR,DWORD);

 INT_PTR ForceCheckSvc(WPARAM,LPARAM);

 

 extern struct YAMNExportedFcns *pYAMNFcn;