diff options
| author |  Fabio Bas | 2008-07-18 15:14:04 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-07-18 15:14:04 +0000 |
| commit | a89f8a7085d0b39621ec44e0809b344132ffe956 (patch) | |
| tree | a431b7cd545837e7e62a0f0d4036e72ddb980e96 /src/modules/dcc/descriptor.cpp | |
| parent | Added modified version of FindSubversion.cmake, allowing getting revision num... (diff) | |
| download | KVIrc-a89f8a7085d0b39621ec44e0809b344132ffe956.tar.gz KVIrc-a89f8a7085d0b39621ec44e0809b344132ffe956.tar.bz2 KVIrc-a89f8a7085d0b39621ec44e0809b344132ffe956.zip | |
upported fix for dcc resend to trunk
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2091 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc/descriptor.cpp')
| -rw-r--r-- | src/modules/dcc/descriptor.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
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() { |