summaryrefslogtreecommitdiff
path: root/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
diff options
context:
space:
mode:
authorRené Schümann <white06tiger@gmail.com>2014-04-11 17:11:23 +0000
committerRené Schümann <white06tiger@gmail.com>2014-04-11 17:11:23 +0000
commit99e1f60a6570c12fd02a9a2ebe8915680d2bfcec (patch)
tree847576f3018a23689c951734200c58707d116825 /plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
parente80eac0d78daff0f041078d21218850f31c5315e (diff)
SendSS:
*+ improved "Result"-Dialog (resource.rc/h, CSend, mir_icolib) added thumbnail link added copy buttons w/ images (copy raw, BBCode image, BBCode image with link) also improved handling. Now plays sound before dialog opens (was on close before) * CSend got new member variables. m_URL and m_URLthumb to hold image URLs (used by FTP,HTTP and ImageShack as of now) - removed m_URL and similar from CSendFTPFile and CSendHTTPServer git-svn-id: http://svn.miranda-ng.org/main/trunk@8957 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp')
-rw-r--r--plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
index cc705ba0e0..e0726c82e1 100644
--- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
@@ -39,14 +39,12 @@ CSendHTTPServer::CSendHTTPServer(HWND Owner, MCONTACT hContact, bool /*bAsync*/)
m_EnableItem = SS_DLG_DESCRIPTION ; //| SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND;
m_pszSendTyp = LPGENT("HTTPServer transfer");
m_pszFileName = NULL;
- m_URL = NULL;
m_fsi_pszSrvPath = NULL;
m_fsi_pszRealPath = NULL;
}
CSendHTTPServer::~CSendHTTPServer(){
mir_free(m_pszFileName);
- mir_free(m_URL);
mir_free(m_fsi_pszSrvPath);
mir_free(m_fsi_pszRealPath);
}
@@ -85,12 +83,12 @@ int CSendHTTPServer::Send()
void CSendHTTPServer::SendThread() {
INT_PTR ret;
- mir_freeAndNil(m_URL);
if (ServiceExists(MS_HTTP_GET_LINK)) {
//patched plugin version
ret = CallService(MS_HTTP_ADD_CHANGE_REMOVE, (WPARAM)m_hContact, (LPARAM)&m_fsi);
if (!ret) {
+ mir_free(m_URL);
m_URL = (char*)CallService(MS_HTTP_GET_LINK, (WPARAM)m_fsi.pszSrvPath, NULL);
}
}
@@ -110,7 +108,7 @@ void CSendHTTPServer::SendThread() {
//Share the file by HTTP Server plugin, SendSS does not own the file anymore = auto-delete won't work
m_bDeleteAfterSend = false;
- if (m_URL && m_URL[0]!= NULL) {
+ if (m_URL && *m_URL) {
svcSendMsgExit(m_URL); return;
}
Exit(ACKRESULT_FAILED);