end of ME_OPT_INITIALISE related zoo in another plugins

4 files changed, 9 insertions, 15 deletions

diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index b9a0a492e1..5655e16e18 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -540,9 +540,6 @@ static int AwayMsgSendAccountsChanged(WPARAM, LPARAM)
 static int AwayMsgSendModulesLoaded(WPARAM, LPARAM)

 {

 	AwayMsgSendAccountsChanged(0, 0);

-

-	HookEvent(ME_CLIST_STATUSMODECHANGE, StatusModeChange);

-	HookEvent(ME_OPT_INITIALISE, AwayMsgOptInitialise);

 	return 0;

 }

 

@@ -554,8 +551,10 @@ static INT_PTR sttGetAwayMessageT(WPARAM wParam, LPARAM lParam)
 

 int LoadAwayMessageSending(void)

 {

-	HookEvent(ME_SYSTEM_MODULESLOADED, AwayMsgSendModulesLoaded);

+	HookEvent(ME_CLIST_STATUSMODECHANGE, StatusModeChange);

+	HookEvent(ME_OPT_INITIALISE, AwayMsgOptInitialise);

 	HookEvent(ME_PROTO_ACCLISTCHANGED, AwayMsgSendAccountsChanged);

+	HookEvent(ME_SYSTEM_MODULESLOADED, AwayMsgSendModulesLoaded);

 

 	CreateServiceFunction(MS_AWAYMSG_GETSTATUSMSGW, sttGetAwayMessageT);

 	return 0;

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 98cd0e55b2..c410ccab8e 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -583,7 +583,7 @@ public:
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static int OptInitialise(WPARAM wParam, LPARAM)

+int OptInitialise(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = {};

 	odp.position = 910000000;

@@ -609,8 +609,3 @@ static int OptInitialise(WPARAM wParam, LPARAM)
 	ChatOptionsInitialize(wParam);

 	return 0;

 }

-

-void InitOptions(void)

-{

-	HookEvent(ME_OPT_INITIALISE, OptInitialise);

-}

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 628a1044c5..b3aea9901b 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -555,16 +555,16 @@ int LoadSendRecvMessageModule(void)
 	}

 

 	InitGlobals();

-	InitOptions();

 

+	HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu);

 	HookEvent(ME_DB_EVENT_ADDED, MessageEventAdded);

 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, MessageSettingChanged);

 	HookEvent(ME_DB_CONTACT_DELETED, ContactDeleted);

-	HookEvent(ME_SYSTEM_MODULESLOADED, SplitmsgModulesLoaded);

-	HookEvent(ME_SKIN_ICONSCHANGED, IconsChanged);

+	HookEvent(ME_OPT_INITIALISE, OptInitialise);

 	HookEvent(ME_PROTO_CONTACTISTYPING, TypingMessage);

+	HookEvent(ME_SKIN_ICONSCHANGED, IconsChanged);

+	HookEvent(ME_SYSTEM_MODULESLOADED, SplitmsgModulesLoaded);

 	HookEvent(ME_SYSTEM_PRESHUTDOWN, PreshutdownSendRecv);

-	HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu);

 

 	CreateServiceFunction(MS_MSG_SENDMESSAGE, SendMessageCommand);

 	CreateServiceFunction(MS_MSG_SENDMESSAGEW, SendMessageCommand_W);

diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index 6dfe7f31af..aa78f440fb 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -222,7 +222,7 @@ INT_PTR SendMessageCmd(MCONTACT hContact, wchar_t *msg);
 void LoadMsgLogIcons(void);

 void FreeMsgLogIcons(void);

 

-void InitOptions(void);

+int OptInitialise(WPARAM, LPARAM);

 

 #define MSGFONTID_MYMSG       0

 #define MSGFONTID_YOURMSG     1