diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2016-08-28 14:24:23 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2016-08-28 14:24:23 +0000 |
| commit | ab4ac1ba8910c3974b4cfb2af3434e5263cdc8bd (patch) | |
| tree | f4086801f255d43339757578e5edc421e85147c3 | |
| parent | 0702373629c3f8d96ce0b7e744d3a262ca1f6bb3 (diff) | |
SendScreenshot:
- Fixed FTPFile support
git-svn-id: http://svn.miranda-ng.org/main/trunk@17215 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/ExternalAPI/m_ftpfile.h | 6 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/Main.cpp | 2 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/stdafx.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/plugins/ExternalAPI/m_ftpfile.h b/plugins/ExternalAPI/m_ftpfile.h index a51e1cd037..691cd5f384 100644 --- a/plugins/ExternalAPI/m_ftpfile.h +++ b/plugins/ExternalAPI/m_ftpfile.h @@ -110,10 +110,4 @@ __inline static INT_PTR FTPFileShowManager() return CallService(MS_FTPFILE_SHOWMANAGER, 0, 0);
}
-//
-// OBSOLOTE SERVICE (used by Send Screenshot plugin)
-// Do NOT use it!
-//
-#define MS_FTPFILE_SHAREFILE "FTPFile/ShareFiles"
-
#endif
\ No newline at end of file diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 045bcbff2c..2b5804e009 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -228,7 +228,7 @@ int hook_ModulesLoaded(WPARAM, LPARAM) g_myGlobals.PopupExist = ServiceExists(MS_POPUP_ADDPOPUPT); g_myGlobals.PopupActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS); g_myGlobals.PluginHTTPExist = ServiceExists(MS_HTTP_ACCEPT_CONNECTIONS); - g_myGlobals.PluginFTPExist = ServiceExists(MS_FTPFILE_SHAREFILE); + g_myGlobals.PluginFTPExist = ServiceExists(MS_FTPFILE_UPLOAD); g_myGlobals.PluginDropboxExist = ServiceExists(MS_DROPBOX_UPLOAD); // Netlib register NETLIBUSER nlu = { sizeof(nlu) }; diff --git a/plugins/SendScreenshotPlus/src/stdafx.h b/plugins/SendScreenshotPlus/src/stdafx.h index 2b003979e8..5a079657bf 100644 --- a/plugins/SendScreenshotPlus/src/stdafx.h +++ b/plugins/SendScreenshotPlus/src/stdafx.h @@ -105,7 +105,7 @@ typedef struct _MGLOBAL { 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_SHAREFILE exist + BOOLEAN PluginFTPExist : 1; // FTPFile or MS_FTPFILE_UPLOAD exist BOOLEAN PluginDropboxExist : 1; // Dropbox or MS_DROPBOX_SEND_FILE exists } MGLOBAL, *LPMGLOBAL; |