diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_accs.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_internal.cpp | 5 | ||||
| -rw-r--r-- | src/mir_app/src/proto_utils.cpp | 8 |
5 files changed, 6 insertions, 13 deletions
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 6dd0b637d3..aeaf4a8748 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -49,7 +49,6 @@ Skin_GetIconName @24 ?GetCaps@PROTO_INTERFACE@@UAEHHI@Z @49 NONAME
?GetInfo@PROTO_INTERFACE@@UAEHIH@Z @50 NONAME
?GetProtoInterface@CProtoIntDlgBase@@QAEPAUPROTO_INTERFACE@@XZ @51 NONAME
-?OnEvent@PROTO_INTERFACE@@UAEHW4PROTOEVENTTYPE@@IJ@Z @52 NONAME
?OnProtoActivate@CProtoIntDlgBase@@MAEXIJ@Z @53 NONAME
?OnProtoCheckOnline@CProtoIntDlgBase@@MAEXIJ@Z @54 NONAME
?OnProtoRefresh@CProtoIntDlgBase@@MAEXIJ@Z @55 NONAME
@@ -586,3 +585,4 @@ Proto_GetStatus @601 Contact_GetStatus @609
?OnContactDeleted@PROTO_INTERFACE@@UAEXI@Z @610 NONAME
?OnBuildProtoMenu@PROTO_INTERFACE@@UAEXXZ @611 NONAME
+?OnErase@PROTO_INTERFACE@@UAEXXZ @612 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index d702a1bae5..e6e57acbb1 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -49,7 +49,6 @@ Skin_GetIconName @24 ?GetCaps@PROTO_INTERFACE@@UEAA_JHI@Z @49 NONAME
?GetInfo@PROTO_INTERFACE@@UEAAHIH@Z @50 NONAME
?GetProtoInterface@CProtoIntDlgBase@@QEAAPEAUPROTO_INTERFACE@@XZ @51 NONAME
-?OnEvent@PROTO_INTERFACE@@UEAAHW4PROTOEVENTTYPE@@_K_J@Z @52 NONAME
?OnProtoActivate@CProtoIntDlgBase@@MEAAX_K_J@Z @53 NONAME
?OnProtoCheckOnline@CProtoIntDlgBase@@MEAAX_K_J@Z @54 NONAME
?OnProtoRefresh@CProtoIntDlgBase@@MEAAX_K_J@Z @55 NONAME
@@ -586,3 +585,4 @@ Proto_GetStatus @601 Contact_GetStatus @609
?OnContactDeleted@PROTO_INTERFACE@@UEAAXI@Z @610 NONAME
?OnBuildProtoMenu@PROTO_INTERFACE@@UEAAXXZ @611 NONAME
+?OnErase@PROTO_INTERFACE@@UEAAXXZ @612 NONAME
diff --git a/src/mir_app/src/proto_accs.cpp b/src/mir_app/src/proto_accs.cpp index 2dd3787ded..141f14c706 100644 --- a/src/mir_app/src/proto_accs.cpp +++ b/src/mir_app/src/proto_accs.cpp @@ -355,7 +355,7 @@ static int DeactivationThread(DeactivationThreadParam* param) KillObjectEventHooks(p); // untie an object from the outside world
if (param->bErase)
- p->OnEvent(EV_PROTO_ONERASE, 0, 0);
+ p->OnErase();
if (param->fnUninit)
param->fnUninit(p);
diff --git a/src/mir_app/src/proto_internal.cpp b/src/mir_app/src/proto_internal.cpp index 7218e2b2f1..4454e80439 100644 --- a/src/mir_app/src/proto_internal.cpp +++ b/src/mir_app/src/proto_internal.cpp @@ -280,11 +280,6 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE CCSDATA ccs = { hContact, PSS_USERISTYPING, hContact, type };
return ProtoCallService(m_szModuleName, PSS_USERISTYPING, 0, (LPARAM)&ccs);
}
-
- virtual int OnEvent(PROTOEVENTTYPE, WPARAM, LPARAM) override
- {
- return 1;
- }
};
// creates the default protocol container for compatibility with the old plugins
diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp index f7fd336010..08c7032a5d 100644 --- a/src/mir_app/src/proto_utils.cpp +++ b/src/mir_app/src/proto_utils.cpp @@ -182,6 +182,9 @@ void PROTO_INTERFACE::OnBuildProtoMenu() void PROTO_INTERFACE::OnContactDeleted(MCONTACT)
{}
+void PROTO_INTERFACE::OnErase()
+{}
+
void PROTO_INTERFACE::OnModulesLoaded()
{}
@@ -576,8 +579,3 @@ int PROTO_INTERFACE::UserIsTyping(MCONTACT, int) {
return 1; // error
}
-
-int PROTO_INTERFACE::OnEvent(PROTOEVENTTYPE, WPARAM, LPARAM)
-{
- return 1; // not an error, vitally important
-}
|