- PLUGININFO structure removed at all;

- Options_AddPage & UserInfo_AddPage replaced MS_OPT_ADDPAGE & MS_USERINFO_ADDPAGE services respectively
- total internal redesign of options' translation
- code reformatting

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

2 files changed, 2 insertions, 14 deletions

diff --git a/plugins/ChangeKeyboardLayout/commonheaders.h b/plugins/ChangeKeyboardLayout/commonheaders.h
index 8eb8f3671e..e7d8c78283 100644
--- a/plugins/ChangeKeyboardLayout/commonheaders.h
+++ b/plugins/ChangeKeyboardLayout/commonheaders.h
@@ -94,7 +94,6 @@ typedef struct
 } PopupOptions;

 

 PLUGININFOEX pluginInfoEx;

-PLUGININFO pluginInfo;

 

 HINSTANCE hInst;

 

diff --git a/plugins/ChangeKeyboardLayout/hook_events.c b/plugins/ChangeKeyboardLayout/hook_events.c
index 4afad800d1..b3e97159f0 100644
--- a/plugins/ChangeKeyboardLayout/hook_events.c
+++ b/plugins/ChangeKeyboardLayout/hook_events.c
@@ -199,19 +199,8 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	}

 	OnIconsChanged(0, 0);

 	RegPopupActions();

-

-	//Поддержка Апдейтера

-	if(ServiceExists(MS_UPDATE_REGISTERFL))

-	{

-		

-			CallService(MS_UPDATE_REGISTERFL, (WPARAM)3632, (LPARAM)&pluginInfo);

-	

-	}

-	

 	

 	DBWriteContactSettingDword(NULL, ModuleName, "CurrentVer", VERSION);

-

-

 	return 0;

 }

 

@@ -226,7 +215,7 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM lParam)
 	odp.pszGroup = Translate("Plugins");

 	odp.flags = ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = DlgMainProcOptions;

-	CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp);	

+	Options_AddPage(wParam, &odp);	

 	

 	if (ServiceExists(MS_POPUP_ADDPOPUP))

 	{

@@ -238,7 +227,7 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM lParam)
 		odp.pszGroup = Translate("PopUps");

 		odp.flags = ODPF_BOLDGROUPS;

 		odp.pfnDlgProc = DlgPopupsProcOptions;

-		CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp);	

+		Options_AddPage(wParam, &odp);	

 	}

 	return 0;

 }