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

List:       kde-commits
Subject:    branches/KDE/3.4/kdenetwork/kopete/protocols/msn
From:       Michaël Larouche <shock () shockdev ! ca ! tc>
Date:       2005-07-16 17:49:47
Message-ID: 1121536187.455315.22537.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 435358 by mlarouche:

Backport the MSNSecureLoginHandler class.

Should fix crash related to OpenSSL and lag when login.



 M  +1 -1      Makefile.am  
 M  +12 -13    msnnotifysocket.cpp  
 M  +2 -2      msnnotifysocket.h  
 A             msnsecureloginhandler.cpp   [License: GPL (v2+)]
 A             msnsecureloginhandler.h   [License: GPL (v2+)]
 D             sslloginhandler.cpp  
 D             sslloginhandler.h  


--- branches/KDE/3.4/kdenetwork/kopete/protocols/msn/Makefile.am #435357:435358
@@ -15,7 +15,7 @@
 	msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \
 	msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp \
msninvitation.cpp \  msnp2p.cpp msnp2pdisplatcher.cpp msnp2pincoming.cpp \
                msnp2poutgoing.cpp sha1.cpp \
-	sslloginhandler.cpp
+	msnsecureloginhandler.cpp
 
 libkopete_msn_shared_la_LIBADD  = ./ui/libkopetemsnui.la \
../../libkopete/libkopete.la $(LIB_KIO)  libkopete_msn_shared_la_LDFLAGS = \
                -version-info 0:0:0 -no-undefined $(all_libraries)
--- branches/KDE/3.4/kdenetwork/kopete/protocols/msn/msnnotifysocket.cpp \
#435357:435358 @@ -23,7 +23,7 @@
 #include "msnnotifysocket.h"
 #include "msncontact.h"
 #include "msnaccount.h"
-#include "sslloginhandler.h"
+#include "msnsecureloginhandler.h"
 
 #include <qregexp.h>
 
@@ -49,7 +49,7 @@
 : MSNSocket( account )
 {
 	m_newstatus = MSNProtocol::protocol()->NLN;
-	m_sslLoginHandler=0l;
+	m_secureLoginHandler=0L;
 
 	m_isHotmailAccount=false;
 	m_ping=false;
@@ -65,7 +65,7 @@
 
 MSNNotifySocket::~MSNNotifySocket()
 {
-	delete m_sslLoginHandler;
+	delete m_secureLoginHandler;
 	kdDebug(14140) << k_funcinfo << endl;
 }
 
@@ -269,15 +269,13 @@
 	{
 		if( data.section( ' ', 1, 1 ) == "S" )
 		{
-			m_sslLoginHandler = new SslLoginHandler();
-			QObject::connect( m_sslLoginHandler, SIGNAL(       loginFailed()        ),
-					 this,            SLOT  (    sslLoginFailed()        ) );
-			QObject::connect( m_sslLoginHandler, SIGNAL(    loginIncorrect()        ),
-					 this,            SLOT  ( sslLoginIncorrect()        ) );
-			QObject::connect( m_sslLoginHandler, SIGNAL(    loginSucceeded(QString) ),
-					 this,            SLOT  ( sslLoginSucceeded(QString) ) );
+			m_secureLoginHandler = new MSNSecureLoginHandler(m_account->accountId(), \
m_password, data.section( ' ' , 2 , 2 ));  
-			m_sslLoginHandler->login( data.section( ' ' , 2 , 2 ), m_account->accountId() , \
m_password ); +			QObject::connect(m_secureLoginHandler, SIGNAL(loginFailed()), this, \
SLOT(sslLoginFailed())); +			QObject::connect(m_secureLoginHandler, \
SIGNAL(loginSuccesful(QString )), this, SLOT(sslLoginSucceeded(QString ))); +
+			m_secureLoginHandler->login();
+
 		}
 		else
 		{
@@ -593,8 +591,9 @@
 void MSNNotifySocket::sslLoginSucceeded(QString a)
 {
 	sendCommand("USR" , "TWN S " + a);
-	m_sslLoginHandler->deleteLater();
-	m_sslLoginHandler=0;
+
+	m_secureLoginHandler->deleteLater();
+	m_secureLoginHandler = 0L;
 }
 
 
--- branches/KDE/3.4/kdenetwork/kopete/protocols/msn/msnnotifysocket.h #435357:435358
@@ -29,7 +29,7 @@
 class MSNDispatchSocket;
 class MSNAccount;
 class KTempFile;
-class SslLoginHandler;
+class MSNSecureLoginHandler;
 
 #include <kio/job.h>
 
@@ -168,7 +168,7 @@
 	QString m_sid;
 	QString m_loginTime;
 	QString m_localIP;
-	SslLoginHandler *m_sslLoginHandler;
+	MSNSecureLoginHandler *m_secureLoginHandler;
 
 	QTimer *m_keepaliveTimer;
 


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