diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-01-28 16:04:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-01-28 16:04:16 +0000 |
| commit | bb5aff746c50564ded61159c5ae28e6218d0a49d (patch) | |
| tree | 0ec2ef5c4b6b6b9cf6c3bb4a606cf632e69b6d31 /protocols/GTalkExt | |
| parent | 1042a84dd1f01c249a946ec708d3dae2881ecfab (diff) | |
another atavism removed: old stub services for clist events
git-svn-id: http://svn.miranda-ng.org/main/trunk@16181 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/GTalkExt')
| -rw-r--r-- | protocols/GTalkExt/src/GTalkExt.cpp | 2 | ||||
| -rw-r--r-- | protocols/GTalkExt/src/notifications.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/protocols/GTalkExt/src/GTalkExt.cpp b/protocols/GTalkExt/src/GTalkExt.cpp index 6d0eb2f435..506e59af32 100644 --- a/protocols/GTalkExt/src/GTalkExt.cpp +++ b/protocols/GTalkExt/src/GTalkExt.cpp @@ -28,6 +28,7 @@ #include "Version.h"
#include "inbox.h"
+CLIST_INTERFACE *pcli;
int hLangpack;
HICON g_hPopupIcon = 0;
@@ -79,6 +80,7 @@ LRESULT CALLBACK WndProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
+ mir_getCLI();
WNDCLASS cls = { 0 };
cls.lpfnWndProc = WndProc;
diff --git a/protocols/GTalkExt/src/notifications.cpp b/protocols/GTalkExt/src/notifications.cpp index 6978e81507..9c0d1e409c 100644 --- a/protocols/GTalkExt/src/notifications.cpp +++ b/protocols/GTalkExt/src/notifications.cpp @@ -70,13 +70,13 @@ void MarkEventRead(MCONTACT hCnt, MEVENT hEvt) ReadCheckbox(0, IDC_PSEUDOCONTACTENABLED, settings) &&
ReadCheckbox(0, IDC_MARKEVENTREAD, settings) &&
db_event_markRead(hCnt, hEvt) != -1)
- CallService(MS_CLIST_REMOVEEVENT, hCnt, hEvt);
+ pcli->pfnRemoveEvent(hCnt, hEvt);
}
int OnEventDeleted(WPARAM hContact, LPARAM hDbEvent, LPARAM wnd)
{
if (db_get_b((MCONTACT)hContact, SHORT_PLUGIN_NAME, PSEUDOCONTACT_FLAG, 0)) {
- CallService(MS_CLIST_REMOVEEVENT, hContact, hDbEvent);
+ pcli->pfnRemoveEvent(hContact, hDbEvent);
PostMessage((HWND)wnd, EVENT_DELETED_MSG, hContact, hDbEvent);
}
@@ -116,7 +116,7 @@ LRESULT CALLBACK PopupProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) if (ppdh->MarkRead && ppdh->hDbEvent && (acc = GetJidAcc(ppdh->jid))) {
ReadNotificationSettings(acc);
MarkEventRead(ppdh->hContact, ppdh->hDbEvent);
- CallService(MS_CLIST_REMOVEEVENT, (WPARAM)ppdh->hContact, (LPARAM)ppdh->hDbEvent);
+ pcli->pfnRemoveEvent(ppdh->hContact, ppdh->hDbEvent);
}
RemoveProp(wnd, PLUGIN_DATA_PROP_NAME);
free(ppdh);
|