[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Konversation] d05fd45: Some fixes around DCC
From:       Shintaro Matsuoka <shin () shoegazed ! org>
Date:       2010-07-01 13:27:46
Message-ID: 20100701132746.B66A9BB56BE () projects ! kde ! org
[Download RAW message or body]

commit d05fd45e1fca596fe487840d28a3ea8dfe3e433c
Author: Shintaro Matsuoka <shin@shoegazed.org>
Date:   Tue Aug 3 02:54:05 2004 +0000

    Some fixes around DCC
    
    svn path=/trunk/kdeextragear-2/konversation/; revision=335379

diff --git a/konversation/prefspagedccsettings.cpp \
b/konversation/prefspagedccsettings.cpp index 0525e56..fa86e96 100644
--- a/konversation/prefspagedccsettings.cpp
+++ b/konversation/prefspagedccsettings.cpp
@@ -66,13 +66,13 @@ PrefsPageDccSettings::PrefsPageDccSettings(QFrame* \
newParent,Preferences* newPre  connect(dccSpecificSendPorts, \
SIGNAL(stateChanged(int)), this, SLOT(specificSendPortsStateChanged(int)));  \
dccSendPortsFirstLabel=new QLabel(i18n("First DCC send port:"),parentFrame);  \
                dccSendPortsFirstLabel->setAlignment(Qt::AlignRight | \
                Qt::AlignVCenter);
-  dccSendPortsFirstSpin=new \
QSpinBox(0,65536,1,parentFrame,"dcc_send_ports_first_spin"); +  \
dccSendPortsFirstSpin=new \
QSpinBox(0,65535,1,parentFrame,"dcc_send_ports_first_spin");  \
connect(dccSendPortsFirstSpin, SIGNAL(valueChanged(int)), this, \
SLOT(sendPortsFirstSpinValueChanged(int)));  \
dccSendPortsFirstSpin->setMaximumWidth(100);  \
dccSendPortsFirstLabel->setBuddy(dccSendPortsFirstSpin);  dccSendPortsLastLabel=new \
QLabel(i18n("Last DCC send port:"),parentFrame);  \
                dccSendPortsLastLabel->setAlignment(Qt::AlignRight | \
                Qt::AlignVCenter);
-  dccSendPortsLastSpin=new \
QSpinBox(0,65536,1,parentFrame,"dcc_send_ports_last_spin"); +  \
dccSendPortsLastSpin=new QSpinBox(0,65535,1,parentFrame,"dcc_send_ports_last_spin");  \
connect(dccSendPortsLastSpin, SIGNAL(valueChanged(int)), this, \
SLOT(sendPortsLastSpinValueChanged(int)));  \
dccSendPortsLastSpin->setMaximumWidth(100);  \
                dccSendPortsLastLabel->setBuddy(dccSendPortsLastSpin);
diff --git a/konversation/server.cpp b/konversation/server.cpp
index c0e36a7..641057d 100644
--- a/konversation/server.cpp
+++ b/konversation/server.cpp
@@ -1421,7 +1421,7 @@ void Server::addDccSend(const QString &recipient,const QString \
&fileName)  
   QString ip;
   if(KonversationApplication::preferences.getDccGetIpFromServer())
-    ip=myIpByServer;
+    ip=ownIpByServer;
   if(ip.isEmpty())
     ip=getIp();
   
@@ -1502,7 +1502,9 @@ void Server::requestDccChat(const QString& nickname)
 
 void Server::dccSendRequest(const QString &partner, const QString &fileName, const \
QString &address, const QString &port, unsigned long size)  {
+  kdDebug() << "Server::dccSendRequest()" << endl;
   outputFilter->sendRequest(partner,fileName,address,port,size);
+  kdDebug() << "Server::dccSendRequest(): outputFilter->getServerOutput() returns: " \
<< outputFilter->getServerOutput() << endl;  queue(outputFilter->getServerOutput());
   appendStatusMessage(outputFilter->getType(),outputFilter->getOutput());
 }
@@ -2220,13 +2222,13 @@ void Server::nickJoinsChannel(const QString &channelName, \
const QString &nicknam  
 void Server::addHostmaskToNick(const QString& sourceNick, const QString& \
sourceHostmask)  {
-  // for DCC sending
-  if(!myIpByServer && sourceNick==nickname)  // myself
+  // remember my IP for DCC sending
+  if(ownIpByServer.isEmpty() && sourceNick==nickname)  // myself
   {
     QString myhost = sourceHostmask.section('@',1);
     KNetwork::KResolverResults res = KNetwork::KResolver::resolve(myhost, "");
     if(res.size() > 0)
-      myIpByServer = res.first().address().nodeName();
+      ownIpByServer = res.first().address().nodeName();
   }
   
   Channel* channel=channelList.first();
diff --git a/konversation/server.h b/konversation/server.h
index c58689b..2a2838a 100644
--- a/konversation/server.h
+++ b/konversation/server.h
@@ -430,7 +430,7 @@ class Server : public QObject
     QString inputBuffer;
     QStringList outputBuffer;
     QString nickname;
-    QString myIpByServer;
+    QString ownIpByServer;
     QString serverKey;
     QString lastDccDir;
 


[prev in list] [next in list] [prev in thread] [next in thread]