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

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/irc
From:       Jason Keirstead <jason () keirstead ! org>
Date:       2005-01-25 0:31:23
Message-ID: 20050125003123.C6D1B1BB0B () office ! kde ! org
[Download RAW message or body]

CVS commit by brunes: 

sendFile at least now appears to work. Hard to test by sending to myself though


  M +1 -1      ircaccount.cpp   1.130
  M +2 -2      ircusercontact.h   1.45
  M +4 -13     libkirc/kircengine_ctcp.cpp   1.8


--- kdenetwork/kopete/protocols/irc/ircaccount.cpp  #1.129:1.130
@@ -518,5 +518,5 @@ void IRCAccount::connectWithPassword(con
                                 myServer()->appendMessage( i18n("Connecting to \
%1...").arg( host->host ) );  if( host->ssl )
-                                        myServer()->appendMessage("Using SSL");
+                                        myServer()->appendMessage( i18n("Using SSL") \
);  
                                 m_engine->setPassword(password);

--- kdenetwork/kopete/protocols/irc/ircusercontact.h  #1.44:1.45
@@ -69,6 +69,4 @@ public:
         virtual const QString caption() const;
 
-        virtual void sendFile(const KURL &sourceURL, const QString&, unsigned int);
-
         void setAway(bool isAway);
 
@@ -94,4 +92,6 @@ public slots:
         virtual void updateStatus();
 
+        virtual void sendFile(const KURL &sourceURL, const QString&, unsigned int);
+
 protected slots:
         virtual void privateMessage(IRCContact *from, IRCContact *to, const QString \
&message);

--- kdenetwork/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp  #1.7:1.8
@@ -20,5 +20,6 @@
 #include "kircengine.h"
 #include "kirctransferhandler.h"
-
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <kextsock.h>
 
@@ -144,16 +145,6 @@ void Engine::CtcpRequest_dcc(const QStri
 
                         QString ip = m_sock->localAddress()->nodeName();
-                        QRegExp \
                reg("^(\\d{1,3}).(\\d{1,3}).(\\d{1,3}).(\\d{1,3})$");
-                        if (!reg.exactMatch(ip))
-                        {
-                                kdDebug(14120) << "Not an ipv4:" << ip << endl;
-                                return;
-                        }
+                        QString ipNumber = QString::number( ntohl( inet_addr( \
ip.latin1() ) ) );  
-                        // FIXME: This is very an ugly way to do it
-                        QString ipNumber = QString::number(     \
                (Q_UINT32)reg.cap(1).toUShort()*(256*256*256)+
-                                                                \
                reg.cap(2).toUShort()*(256*256)+
-                                                                \
                reg.cap(3).toUShort()*256+
-                                                                \
                reg.cap(4).toUShort());
                         kdDebug(14120) << "Starting DCC file outgoing transfer." << \
endl;  


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