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 /plugins/YAMN | |
| 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 'plugins/YAMN')
| -rw-r--r-- | plugins/YAMN/src/browser/mailbrowser.cpp | 14 | ||||
| -rw-r--r-- | plugins/YAMN/src/main.cpp | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp index 644c849372..ada976daa0 100644 --- a/plugins/YAMN/src/browser/mailbrowser.cpp +++ b/plugins/YAMN/src/browser/mailbrowser.cpp @@ -645,7 +645,7 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D evt.lParam = ActualAccount->hContact; evt.pszService = MS_YAMN_CLISTDBLCLICK; evt.pszTooltip = sMsg; - CallServiceSync(MS_CLIST_ADDEVENT, 0, (LPARAM)&evt); + pcli->pfnAddEvent(&evt); } db_set_s(ActualAccount->hContact, "CList", "StatusMsg", sMsg); @@ -687,9 +687,8 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D } //and remove the event - if ((nflags & YAMN_ACC_CONT) && (!(nflags & YAMN_ACC_CONTNOEVENT)) && (MN->Real.UnSeen + MN->Virtual.UnSeen == 0)) { - CallService(MS_CLIST_REMOVEEVENT, (WPARAM)ActualAccount->hContact, (LPARAM)ActualAccount->hContact); - } + if ((nflags & YAMN_ACC_CONT) && (!(nflags & YAMN_ACC_CONTNOEVENT)) && (MN->Real.UnSeen + MN->Virtual.UnSeen == 0)) + pcli->pfnRemoveEvent(ActualAccount->hContact, ActualAccount->hContact); if ((MN->Real.BrowserUC + MN->Virtual.BrowserUC == 0) && (hDlg != NULL)) { if (!IsWindowVisible(hDlg) && !(nflags & YAMN_ACC_MSG)) @@ -864,9 +863,8 @@ LRESULT CALLBACK NewMailPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa DebugLog(SynchroFile, "PopupProc:LEFTCLICK:ActualAccountSO-read enter failed\n"); #endif } - if ((Account->NewMailN.Flags & YAMN_ACC_CONT) && !(Account->NewMailN.Flags & YAMN_ACC_CONTNOEVENT)) { - CallService(MS_CLIST_REMOVEEVENT, hContact, hContact); - } + if ((Account->NewMailN.Flags & YAMN_ACC_CONT) && !(Account->NewMailN.Flags & YAMN_ACC_CONTNOEVENT)) + pcli->pfnRemoveEvent(hContact, hContact); } // fall through case WM_CONTEXTMENU: @@ -1709,7 +1707,7 @@ INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg, UINT msg, WPARAM wParam, LPAR SetTimer(hDlg, TIMER_FLASHING, 500, NULL); if (ActualAccount->hContact != NULL) - CallService(MS_CLIST_REMOVEEVENT, (WPARAM)ActualAccount->hContact, (LPARAM)"yamn new mail message"); + pcli->pfnRemoveEvent(ActualAccount->hContact, (LPARAM)"yamn new mail message"); mir_subclassWindow(GetDlgItem(hDlg, IDC_LISTMAILS), ListViewSubclassProc); } diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp index 601e2b3653..c5df153172 100644 --- a/plugins/YAMN/src/main.cpp +++ b/plugins/YAMN/src/main.cpp @@ -27,9 +27,9 @@ HANDLE hAccountFolder; HINSTANCE *hDllPlugins; static int iDllPlugins = 0; - YAMN_VARIABLES YAMNVar; +CLIST_INTERFACE *pcli; int hLangpack; PLUGININFOEX pluginInfo = { @@ -369,6 +369,9 @@ static void UnloadPlugins() extern "C" int __declspec(dllexport) Unload(void) { + mir_getLP(&pluginInfo); + mir_getCLI(); + #ifdef _DEBUG UnInitDebug(); #endif |