From 6d02559b3c3cb05cfc6a0ade5c4815dda4427834 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Fri, 4 Mar 2016 16:59:35 +0000 Subject: Dropbox: removed old service git-svn-id: http://svn.miranda-ng.org/main/trunk@16420 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Dropbox/src/dropbox_transfers.cpp | 45 ++++--------------------------- 1 file changed, 5 insertions(+), 40 deletions(-) (limited to 'plugins/Dropbox/src/dropbox_transfers.cpp') diff --git a/plugins/Dropbox/src/dropbox_transfers.cpp b/plugins/Dropbox/src/dropbox_transfers.cpp index 15fd919598..4b54e4cd55 100644 --- a/plugins/Dropbox/src/dropbox_transfers.cpp +++ b/plugins/Dropbox/src/dropbox_transfers.cpp @@ -144,9 +144,12 @@ UINT CDropbox::UploadToDropbox(void *owner, void *arg) size = 0; char path[MAX_PATH]; - const TCHAR *serverPath = ftp->GetServerPath(); - if (serverPath) + const TCHAR *serverFolder = ftp->GetServerFolder(); + if (serverFolder) { + TCHAR serverPath[MAX_PATH] = { 0 }; + mir_sntprintf(serverPath, _T("%s\\%s"), serverFolder, fileName); PreparePath(serverPath, path); + } else PreparePath(fileName, path); instance->FinishUploadSession(data, size, sessionId, offset, path); @@ -170,44 +173,6 @@ UINT CDropbox::UploadToDropbox(void *owner, void *arg) return ACKRESULT_SUCCESS; } -UINT CDropbox::SendFilesAndReportAsync(void *owner, void *arg) -{ - CDropbox *instance = (CDropbox*)owner; - FileTransferParam *ftp = (FileTransferParam*)arg; - - int res = UploadToDropbox(owner, arg); - if (res == ACKRESULT_SUCCESS) - instance->Report(ftp->GetHContact(), ftp->GetData()); - - instance->transfers.remove(ftp); - delete ftp; - - return res; -} - -UINT CDropbox::SendFilesAndEventAsync(void *owner, void *arg) -{ - CDropbox *instance = (CDropbox*)owner; - FileTransferParam *ftp = (FileTransferParam*)arg; - - int res = UploadToDropbox(owner, arg); - - T2Utf data(ftp->GetData()); - char *pdata = data; - - TRANSFERINFO ti = { 0 }; - ti.hProcess = (HANDLE)ftp->GetId(); - ti.status = res; - ti.data = &pdata; - - NotifyEventHooks(instance->hFileSentEventHook, ftp->GetHContact(), (LPARAM)&ti); - - instance->transfers.remove(ftp); - delete ftp; - - return res; -} - UINT CDropbox::UploadAndReportProgress(void *owner, void *arg) { CDropbox *instance = (CDropbox*)owner; -- cgit v1.2.3