Dropbox: service and events reworked

git-svn-id: http://svn.miranda-ng.org/main/trunk@9005 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 5 insertions, 5 deletions

diff --git a/plugins/Dropbox/src/dropbox.h b/plugins/Dropbox/src/dropbox.h
index c044a4f1b9..543b492d7c 100644
--- a/plugins/Dropbox/src/dropbox.h
+++ b/plugins/Dropbox/src/dropbox.h
@@ -44,8 +44,7 @@ private:
 	ULONG  hFileProcess;

 	ULONG  hMessageProcess;

 

-	HANDLE hFileSendFailedHook;

-	HANDLE hFileSendSuccessedHook;

+	HANDLE hFileSentEventHook;

 	

 	MCONTACT hDefaultContact;

 	MCONTACT hTransferContact;

@@ -67,8 +66,6 @@ private:
 	static int OnFileDialogCancelled(void *obj, WPARAM wParam, LPARAM lParam);

 	static int OnFileDialogSuccessed(void *obj, WPARAM wParam, LPARAM lParam);

 

-	static int OnSendSuccessed(void *obj, WPARAM wParam, LPARAM lParam);

-

 	// services

 	static HANDLE CreateProtoServiceFunctionObj(const char *szService, MIRANDASERVICEOBJ serviceProc, void *obj);

 

@@ -78,7 +75,6 @@ private:
 	static INT_PTR ProtoReceiveMessage(void *obj, WPARAM wParam, LPARAM lParam);

 

 	static INT_PTR SendFileToDropbox(void *obj, WPARAM wParam, LPARAM lParam);

-	static INT_PTR SendFilesToDropbox(void *obj, WPARAM wParam, LPARAM lParam);

 

 	// commands

 	static void CommandHelp(void *arg);

@@ -108,6 +104,8 @@ private:
 	int CreateDownloadUrl(const char *path, wchar_t *url);

 

 	static UINT SendFilesAsync(void *owner, void *arg);

+	static UINT SendFilesAndEventAsync(void *owner, void *arg);

+	static UINT SendFilesAndReportAsync(void *owner, void *arg);

 

 	// contacts

 	MCONTACT GetDefaultContact();

@@ -119,6 +117,8 @@ private:
 	void InitializeMenus();

 	static void Menu_DisableItem(HGENMENU hMenuItem, BOOL bDisable);

 

+	static INT_PTR SendFilesToDropboxCommand(void *obj, WPARAM wParam, LPARAM lParam);

+

 	// dialogs

 	static INT_PTR CALLBACK MainOptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);