diff options
| author | George Hazan <ghazan@miranda.im> | 2019-03-05 21:10:22 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-05 21:10:22 +0300 |
| commit | d9fddc0cfa9066eb1b5ad3f4807b37426ae6ca88 (patch) | |
| tree | f09baaf9b91477d009cedc5bd77449b0fa3e3af7 /plugins/SendScreenshotPlus | |
| parent | 8a1ff32e54b39ceef22df61bda17bbfda94918fc (diff) | |
Popup:
- wiping out checks for service presence;
- code cleaning
Diffstat (limited to 'plugins/SendScreenshotPlus')
| -rw-r--r-- | plugins/SendScreenshotPlus/src/Main.cpp | 1 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/dlg_msgbox.cpp | 3 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/stdafx.h | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 9e9237a3f5..fc9d77978f 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -227,7 +227,6 @@ CMPlugin::CMPlugin() : int hook_ModulesLoaded(WPARAM, LPARAM) { - g_myGlobals.PopupExist = ServiceExists(MS_POPUP_ADDPOPUPW); g_myGlobals.PopupActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS); g_myGlobals.PluginHTTPExist = ServiceExists(MS_HTTP_ACCEPT_CONNECTIONS); g_myGlobals.PluginFTPExist = ServiceExists(MS_FTPFILE_UPLOAD); diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp index 028ebd61e8..ee80a0a07a 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp @@ -576,7 +576,7 @@ static INT_PTR CALLBACK MsgBoxPop(HWND hDlg, UINT uMsg, WPARAM, LPARAM lParam) } // create popup - CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&pd, APF_NEWDATA); + PUAddPopupW(&pd, APF_NEWDATA); if (MB_TYPE(pMsgBox->uType) == MB_OK) EndDialog(hDlg, IDOK); } @@ -652,7 +652,6 @@ INT_PTR MsgBoxService(WPARAM, LPARAM lParam) if (PtrIsValid(pMsgBox) && pMsgBox->cbSize == sizeof(MSGBOX)) { // Shall the MessageBox displayed as popup? if (!(pMsgBox->uType & (MB_INFOBAR | MB_NOPOPUP)) // message box can be a popup? - && ServiceExists(MS_POPUP_ADDPOPUPW) // popups exist? && myGlobals.PopupActionsExist == 1 // popup support ext stuct? && (db_get_dw(0, "Popup", "Actions", 0) & 1) // popup++ actions on? && db_get_b(0, MODNAME, SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX)) // user likes popups? diff --git a/plugins/SendScreenshotPlus/src/stdafx.h b/plugins/SendScreenshotPlus/src/stdafx.h index a615d173bb..d6be2e6898 100644 --- a/plugins/SendScreenshotPlus/src/stdafx.h +++ b/plugins/SendScreenshotPlus/src/stdafx.h @@ -102,7 +102,6 @@ using namespace std; typedef struct _MGLOBAL { DWORD mirandaVersion; // mirandaVersion - BOOLEAN PopupExist : 1; // Popup or MS_POPUP_ADDPOPUP exist BOOLEAN PopupActionsExist : 1; // Popup++ or MS_POPUP_REGISTERACTIONS exist BOOLEAN PluginHTTPExist : 1; // HTTPServer or MS_HTTP_ACCEPT_CONNECTIONS exist BOOLEAN PluginFTPExist : 1; // FTPFile or MS_FTPFILE_UPLOAD exist |