summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_protoint.h1
-rw-r--r--protocols/Discord/src/proto.cpp3
-rw-r--r--protocols/FacebookRM/src/proto.cpp3
-rw-r--r--protocols/Gadu-Gadu/src/gg_proto.cpp3
-rw-r--r--protocols/IRCG/src/ircproto.cpp1
-rw-r--r--protocols/IcqOscarJ/src/icq_proto.cpp3
-rwxr-xr-xprotocols/JabberG/src/jabber_proto.cpp1
-rw-r--r--protocols/MRA/src/MraProto.cpp1
-rw-r--r--protocols/MSN/src/msn_proto.cpp3
-rw-r--r--protocols/Twitter/src/proto.cpp4
-rw-r--r--protocols/VKontakte/src/vk_proto.cpp3
-rw-r--r--src/mir_app/src/options.cpp2
12 files changed, 3 insertions, 25 deletions
diff --git a/include/m_protoint.h b/include/m_protoint.h
index 401135fd30..eccc991273 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -40,7 +40,6 @@ typedef enum
EV_PROTO_ONREADYTOEXIT,
EV_PROTO_ONEXIT,
EV_PROTO_ONRENAME,
- EV_PROTO_ONOPTIONS,
EV_PROTO_ONERASE,
EV_PROTO_ONMENU,
EV_PROTO_ONCONTACTDELETED,
diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index f15f31bb1b..8c0aaa1abd 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -601,9 +601,6 @@ int CDiscordProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
case EV_PROTO_ONEXIT:
return OnPreShutdown(wParam, lParam);
- case EV_PROTO_ONOPTIONS:
- return OnOptionsInit(wParam, lParam);
-
case EV_PROTO_ONCONTACTDELETED:
return OnDeleteContact((MCONTACT)wParam);
}
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 61b3d8de79..64cea2b2e4 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -396,9 +396,6 @@ int FacebookProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
case EV_PROTO_ONEXIT:
return OnPreShutdown(wParam, lParam);
- case EV_PROTO_ONOPTIONS:
- return OnOptionsInit(wParam, lParam);
-
case EV_PROTO_ONCONTACTDELETED:
return OnContactDeleted(wParam, lParam);
diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index 7e086f9060..d5f822ca0b 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -729,9 +729,6 @@ int GaduProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)
sessions_closedlg();
break;
- case EV_PROTO_ONOPTIONS:
- return options_init(wParam, lParam);
-
case EV_PROTO_ONMENU:
menus_init();
break;
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index fe7bb55831..aedd341e74 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -817,7 +817,6 @@ int __cdecl CIrcProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM l
switch (eventType) {
case EV_PROTO_ONLOAD: return OnModulesLoaded(0, 0);
case EV_PROTO_ONEXIT: return OnPreShutdown(0, 0);
- case EV_PROTO_ONOPTIONS: return OnInitOptionsPages(wParam, lParam);
case EV_PROTO_ONMENU:
InitMainMenus();
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index ba2ca46ae5..e10146939f 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -1819,9 +1819,6 @@ int __cdecl CIcqProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM l
case EV_PROTO_ONEXIT:
return OnPreShutdown(0, 0);
- case EV_PROTO_ONOPTIONS:
- return OnOptionsInit(wParam, lParam);
-
case EV_PROTO_ONERASE:
{
char szDbSetting[MAX_PATH];
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index c3fc9162df..55519f1627 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -1331,7 +1331,6 @@ int __cdecl CJabberProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARA
switch (eventType) {
case EV_PROTO_ONLOAD: return OnModulesLoadedEx(0, 0);
case EV_PROTO_ONEXIT: return OnPreShutdown(0, 0);
- case EV_PROTO_ONOPTIONS: return OnOptionsInit(wParam, lParam);
case EV_PROTO_ONMENU:
MenuInit();
diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index dc6b540008..9940b0365e 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -559,7 +559,6 @@ int CMraProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)
switch (eventType) {
case EV_PROTO_ONLOAD: return OnModulesLoaded(0, 0);
case EV_PROTO_ONEXIT: return OnShutdown(0, 0);
- case EV_PROTO_ONOPTIONS: return OnOptionsInit(wParam, lParam);
case EV_PROTO_ONMENU:
CListCreateMenu(2000060000, 500085000, TRUE, gdiMenuItems, MAIN_MENU_ITEMS_COUNT, hMainMenuItems);
diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index c5e4678e97..94d2486d7e 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -964,9 +964,6 @@ int __cdecl CMsnProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM l
case EV_PROTO_ONEXIT:
return OnPreShutdown(0, 0);
- case EV_PROTO_ONOPTIONS:
- return OnOptionsInit(wParam, lParam);
-
case EV_PROTO_ONMENU:
MsnInitMainMenu();
break;
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index b57cf5d452..966d749c86 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -180,8 +180,8 @@ int TwitterProto::SetStatus(int new_status)
int TwitterProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
{
switch (event) {
- case EV_PROTO_ONLOAD: return OnModulesLoaded(wParam, lParam);
- case EV_PROTO_ONOPTIONS: return OnOptionsInit(wParam, lParam);
+ case EV_PROTO_ONLOAD:
+ return OnModulesLoaded(wParam, lParam);
}
return 1;
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index cdb207555a..867329bdec 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -534,9 +534,6 @@ int CVkProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
case EV_PROTO_ONEXIT:
return OnPreShutdown(wParam, lParam);
- case EV_PROTO_ONOPTIONS:
- return OnOptionsInit(wParam, lParam);
-
case EV_PROTO_ONCONTACTDELETED:
return OnContactDeleted(wParam, lParam);
}
diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index b370c80072..7c36c04fb3 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -1144,7 +1144,7 @@ void OpenAccountOptions(PROTOACCOUNT *pa)
return;
OptionsPageList arPages(1);
- pa->ppro->OnEvent(EV_PROTO_ONOPTIONS, (WPARAM)&arPages, 0);
+ CallObjectEventHook(pa->ppro, hOptionsInitEvent, (WPARAM)&arPages, 0);
if (arPages.getCount() == 0)
return;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 19:47:08 +0000