diff options
| author | George Hazan <ghazan@miranda.im> | 2018-11-12 20:12:53 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-11-12 20:12:53 +0300 |
| commit | 488214ac8af0c4aeb1a5c1d8fd48368daaf4c4c7 (patch) | |
| tree | 96b0db981b4f5054f24d484902b597ba7da1c1a5 /plugins/UserInfoEx | |
| parent | 9b35784c5042984fbb60785f0a4a41a64af545f6 (diff) | |
end of ME_OPT_INITIALISE related zoo in another plugins
Diffstat (limited to 'plugins/UserInfoEx')
| -rw-r--r-- | plugins/UserInfoEx/src/init.cpp | 4 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/psp_options.cpp | 15 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/psp_options.h | 3 |
3 files changed, 4 insertions, 18 deletions
diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp index dc30e6f5ec..c71c1c64e8 100644 --- a/plugins/UserInfoEx/src/init.cpp +++ b/plugins/UserInfoEx/src/init.cpp @@ -93,9 +93,6 @@ static int OnModulesLoaded(WPARAM, LPARAM) {
myGlobals.PopupActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS);
- // options
- OptionsLoadModule();
-
// create services to receive string lists of languages and timezones
SvcConstantsLoadModule();
@@ -205,6 +202,7 @@ int CMPlugin::Load() SvcReminderLoadModule();
// Now the module is loaded! Start initializing certain things
+ HookEvent(ME_OPT_INITIALISE, OnInitOptions);
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
HookEvent(ME_TTB_MODULELOADED, OnTopToolBarLoaded);
HookEvent(ME_SYSTEM_SHUTDOWN, OnShutdown);
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index e8e6e9fd9c..0d9ea34eaa 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -1024,7 +1024,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR * @retval MIR_OK
**/
-static int OnInitOptions(WPARAM wParam, LPARAM)
+int OnInitOptions(WPARAM wParam, LPARAM)
{
DlgContactInfoInitTreeIcons();
@@ -1072,16 +1072,3 @@ static int OnInitOptions(WPARAM wParam, LPARAM) }
return MIR_OK;
}
-
-/**
-* This function loads the options module.
-*
-* @param none
-*
-* @retval nothing
-**/
-
-void OptionsLoadModule()
-{
- HookEvent(ME_OPT_INITIALISE, OnInitOptions);
-}
diff --git a/plugins/UserInfoEx/src/psp_options.h b/plugins/UserInfoEx/src/psp_options.h index 28bf533ef4..0eed35b99b 100644 --- a/plugins/UserInfoEx/src/psp_options.h +++ b/plugins/UserInfoEx/src/psp_options.h @@ -31,5 +31,6 @@ struct MenuOptionsList int idEXIMPORT;
};
-void OptionsLoadModule();
+int OnInitOptions(WPARAM, LPARAM);
+
#endif /* _UINFOEX_OPTIONS_H_INCLUDED_ */
\ No newline at end of file |