SendSS

!*+ re-factored CSend a bit, fixes some bugs and improved re-usability
+ CSend got a new dialog to display URL created if there's no target contact (used by ImageShack when called from main menu
* m_bDeleteAfterSend is now m_bAsync
* CSend::Send now returns 1 if sent (sync, caller deletes) and 0 if sending is in progress (class self deletes, async)
* ImageShack got new method SendSilent() (we used m_SendSync before, now renamed to m_bSilent for internal use)
! fixed memory leaks and using "delete" on already deleted CSend which caused a crash
! fixed graphical issue with wrongly initialized state buttons (delete after send, add description etc)

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

1 files changed, 48 insertions, 49 deletions

diff --git a/plugins/SendScreenshotPlus/src/CSendFile.cpp b/plugins/SendScreenshotPlus/src/CSendFile.cpp
index 4fce2dc7bf..29cf1d299a 100644
--- a/plugins/SendScreenshotPlus/src/CSendFile.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendFile.cpp
@@ -1,49 +1,48 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-09 Miranda ICQ/IM project,

-

-This file is part of Send Screenshot Plus, a Miranda IM plugin.

-Copyright (c) 2010 Ing.U.Horn

-

-Parts of this file based on original sorce code

-(c) 2004-2006 Sérgio Vieira Rolanski (portet from Borland C++)

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-See the GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-*/

-

-//---------------------------------------------------------------------------

-#include "global.h"

-

-//---------------------------------------------------------------------------

-CSendFile::CSendFile(HWND Owner, MCONTACT hContact, bool bFreeOnExit)

-: CSend(Owner, hContact, bFreeOnExit){

-	m_EnableItem		= SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND | SS_DLG_DESCRIPTION;

-	m_pszSendTyp		= _T("File transfer");

-}

-

-CSendFile::~CSendFile(){

-	;

-}

-

-//---------------------------------------------------------------------------

-void	CSendFile::Send() {

-	m_bFreeOnExit = TRUE;

-	svcSendFile();

-}

-

-//---------------------------------------------------------------------------

+/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
+
+This file is part of Send Screenshot Plus, a Miranda IM plugin.
+Copyright (c) 2010 Ing.U.Horn
+
+Parts of this file based on original sorce code
+(c) 2004-2006 Sérgio Vieira Rolanski (portet from Borland C++)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+//---------------------------------------------------------------------------
+#include "global.h"
+
+//---------------------------------------------------------------------------
+CSendFile::CSendFile(HWND Owner, MCONTACT hContact, bool /*bAsync*/)
+: CSend(Owner, hContact, true){
+	m_EnableItem		= SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND | SS_DLG_DESCRIPTION;
+	m_pszSendTyp		= LPGENT("File transfer");
+}
+
+CSendFile::~CSendFile(){
+}
+
+//---------------------------------------------------------------------------
+int CSendFile::Send() {
+	svcSendFileExit();
+	return 0;
+}
+
+//---------------------------------------------------------------------------