summaryrefslogtreecommitdiff
path: root/src/core/stdmsg
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-11-12 20:12:53 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-11-12 20:12:53 +0300
commit488214ac8af0c4aeb1a5c1d8fd48368daaf4c4c7 (patch)
tree96b0db981b4f5054f24d484902b597ba7da1c1a5 /src/core/stdmsg
parent9b35784c5042984fbb60785f0a4a41a64af545f6 (diff)
end of ME_OPT_INITIALISE related zoo in another plugins
Diffstat (limited to 'src/core/stdmsg')
-rw-r--r--src/core/stdmsg/src/msgoptions.cpp7
-rw-r--r--src/core/stdmsg/src/msgs.cpp8
-rw-r--r--src/core/stdmsg/src/msgs.h2
3 files changed, 6 insertions, 11 deletions
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