From a89f8a7085d0b39621ec44e0809b344132ffe956 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Fri, 18 Jul 2008 15:14:04 +0000
Subject: upported fix for dcc resend to trunk

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2091 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/dcc/descriptor.cpp | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'src/modules/dcc/descriptor.cpp')

diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp
index 859e7d33c..640791d0c 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/descriptor.cpp
@@ -39,12 +39,10 @@ KviPointerHashTable<int,KviDccDescriptor> * KviDccDescriptor::descriptorDict()
 	return g_pDescriptorDict;
 }
 
-/*
 KviDccDescriptor::KviDccDescriptor(const KviDccDescriptor & src)
 {
 	copyFrom(src);
 }
-*/
 
 KviDccDescriptor::KviDccDescriptor(KviConsole * pConsole)
 {
@@ -149,12 +147,22 @@ KviDccDescriptor * KviDccDescriptor::find(unsigned int uId)
 	return g_pDescriptorDict->find((long)uId);
 }
 
-/*
 void KviDccDescriptor::copyFrom(const KviDccDescriptor &src)
 {
+	m_uId = g_uNextDescriptorId;
+	g_uNextDescriptorId++;	
+	m_szId.setNum(m_uId);
+
+	if(!g_pDescriptorDict)
+	{
+		g_pDescriptorDict = new KviPointerHashTable<int,KviDccDescriptor>;
+		g_pDescriptorDict->setAutoDelete(false);
+	}
+	g_pDescriptorDict->replace((long)m_uId,this);
+	m_bCreationEventTriggered=false;
+
 	m_pDccWindow          = src.m_pDccWindow;
 	m_pDccTransfer        = src.m_pDccTransfer;
-	m_uId                 = src.m_uId;
 	szType                = src.szType;
 	szNick                = src.szNick;
 	szUser                = src.szUser;
@@ -183,11 +191,15 @@ void KviDccDescriptor::copyFrom(const KviDccDescriptor &src)
 	bShowMinimized        = src.bShowMinimized;
 	bAutoAccept           = src.bAutoAccept;
 	bIsIncomingAvatar     = src.bIsIncomingAvatar;
+	szLocalFileName       = src.szLocalFileName;
+	szLocalFileSize       = src.szLocalFileSize;
 #ifdef COMPILE_SSL_SUPPORT
 	bIsSSL                = src.bIsSSL;
 #endif
+	// dcc voice only
+	szCodec               = src.szCodec;
+	iSampleRate           = src.iSampleRate;
 }
-*/
 
 bool KviDccDescriptor::isFileUpload()
 {
-- 
cgit v1.3.1-10-gc9f91