diff options
| author | George Hazan <ghazan@miranda.im> | 2019-03-06 16:15:45 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-06 16:15:55 +0300 |
| commit | f580be3d9dcccb14831d6bed9e7dfca600f5b6f8 (patch) | |
| tree | 468913d477b9d2a9fb430df9a886d24a8cf41887 /protocols/YAMN/src/browser | |
| parent | 827dbce0a554ccc313fd0b14b45bd57dffeead95 (diff) | |
popups:
- internal implementation details & all service declarations moved to m_popup_int.h;
- all service calls removed and replaced with function calls;
- direct access to popup serttings replaced with Popup_Enable / Popup_Enabled;
Diffstat (limited to 'protocols/YAMN/src/browser')
| -rw-r--r-- | protocols/YAMN/src/browser/badconnect.cpp | 5 | ||||
| -rw-r--r-- | protocols/YAMN/src/browser/mailbrowser.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/protocols/YAMN/src/browser/badconnect.cpp b/protocols/YAMN/src/browser/badconnect.cpp index aacae630d7..29b1fd285c 100644 --- a/protocols/YAMN/src/browser/badconnect.cpp +++ b/protocols/YAMN/src/browser/badconnect.cpp @@ -13,16 +13,15 @@ LRESULT CALLBACK BadConnectPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - DWORD PluginParam; switch (msg) { case WM_COMMAND: // if clicked and it's new mail popup window - if ((HIWORD(wParam) == STN_CLICKED) && (CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&PluginParam))) { + if ((HIWORD(wParam) == STN_CLICKED) && (PUGetPluginData(hWnd))) { PROCESS_INFORMATION pi; STARTUPINFOW si; memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - HACCOUNT ActualAccount = (HACCOUNT)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, 0); + HACCOUNT ActualAccount = (HACCOUNT)PUGetPluginData(hWnd); #ifdef DEBUG_SYNCHRO DebugLog(SynchroFile, "PopupProc:LEFTCLICK:ActualAccountSO-read wait\n"); #endif diff --git a/protocols/YAMN/src/browser/mailbrowser.cpp b/protocols/YAMN/src/browser/mailbrowser.cpp index bbac178d15..d9c3af6f6c 100644 --- a/protocols/YAMN/src/browser/mailbrowser.cpp +++ b/protocols/YAMN/src/browser/mailbrowser.cpp @@ -790,8 +790,8 @@ LRESULT CALLBACK NewMailPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa INT_PTR PluginParam = 0; switch (msg) { case WM_COMMAND: - //if clicked and it's new mail popup window - if ((HIWORD(wParam) == STN_CLICKED) && (-1 != (PluginParam = CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&PluginParam)))) { + // if clicked and it's new mail popup window + if ((HIWORD(wParam) == STN_CLICKED) && (-1 != (PluginParam = (INT_PTR)PUGetPluginData(hWnd)))) { MCONTACT hContact = 0; HACCOUNT Account; if (PluginParam) { |