diff options
Diffstat (limited to 'plugins/Dbx_mdbx/src/dbintf.cpp')
| -rw-r--r-- | plugins/Dbx_mdbx/src/dbintf.cpp | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/plugins/Dbx_mdbx/src/dbintf.cpp b/plugins/Dbx_mdbx/src/dbintf.cpp index 56c092ff36..e2bb33d12c 100644 --- a/plugins/Dbx_mdbx/src/dbintf.cpp +++ b/plugins/Dbx_mdbx/src/dbintf.cpp @@ -57,14 +57,14 @@ CDbxMDBX::~CDbxMDBX() if (m_crypto)
m_crypto->destroy();
- DestroyHookableEvent(hContactDeletedEvent);
- DestroyHookableEvent(hContactAddedEvent);
- DestroyHookableEvent(hSettingChangeEvent);
- DestroyHookableEvent(hEventMarkedRead);
+ DestroyHookableEvent(g_hevEventDeleted);
+ DestroyHookableEvent(g_hevEventAdded);
+ DestroyHookableEvent(g_hevSettingChanged);
+ DestroyHookableEvent(g_hevMarkedRead);
- DestroyHookableEvent(hEventAddedEvent);
- DestroyHookableEvent(hEventDeletedEvent);
- DestroyHookableEvent(hEventFilterAddedEvent);
+ DestroyHookableEvent(g_hevEventAdded);
+ DestroyHookableEvent(g_hevEventDeleted);
+ DestroyHookableEvent(g_hevEventFiltered);
mir_free(m_tszProfileName);
}
@@ -133,20 +133,6 @@ int CDbxMDBX::Load() if (InitModules()) return EGROKPRF_DAMAGED;
if (InitCrypt()) return EGROKPRF_DAMAGED;
- // everything is ok, go on
- if (!m_bReadOnly) {
- // retrieve the event handles
- hContactDeletedEvent = CreateHookableEvent(ME_DB_CONTACT_DELETED);
- hContactAddedEvent = CreateHookableEvent(ME_DB_CONTACT_ADDED);
- hSettingChangeEvent = CreateHookableEvent(ME_DB_CONTACT_SETTINGCHANGED);
- hEventMarkedRead = CreateHookableEvent(ME_DB_EVENT_MARKED_READ);
-
- hEventAddedEvent = CreateHookableEvent(ME_DB_EVENT_ADDED);
- hEventEditedEvent = CreateHookableEvent(ME_DB_EVENT_EDITED);
- hEventDeletedEvent = CreateHookableEvent(ME_DB_EVENT_DELETED);
- hEventFilterAddedEvent = CreateHookableEvent(ME_DB_EVENT_FILTER_ADD);
- }
-
FillContacts();
return EGROKPRF_NOERROR;
|