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

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/msn
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2003-09-08 19:22:45
[Download RAW message or body]

CVS commit by ogoffart: 

Do not ask twice for the msn password


  M +1 -1      msnaccount.cpp   1.47
  M +4 -3      msnnotifysocket.cpp   1.119
  M +2 -1      msnnotifysocket.h   1.39


--- kdenetwork/kopete/protocols/msn/msnaccount.cpp  #1.46:1.47
@@ -133,5 +133,5 @@ void MSNAccount::connect()
         }
 
-        m_notifySocket = new MSNNotifySocket( this, accountId() );
+        m_notifySocket = new MSNNotifySocket( this, accountId() , passwd);
 
         QObject::connect( m_notifySocket, SIGNAL( groupAdded( const QString&, uint ) \
),

--- kdenetwork/kopete/protocols/msn/msnnotifysocket.cpp  #1.118:1.119
@@ -42,5 +42,5 @@
 #include <ctime>
 
-MSNNotifySocket::MSNNotifySocket( MSNAccount *account, const QString& msnId )
+MSNNotifySocket::MSNNotifySocket( MSNAccount *account, const QString& msnId, const \
QString &password )  : MSNAuthSocket( msnId, account )
 {
@@ -48,4 +48,5 @@ MSNNotifySocket::MSNNotifySocket( MSNAcc
 
         m_account = account;
+        m_password=password;
         QObject::connect( this, SIGNAL( blockRead( const QString & ) ),
                 this, SLOT( slotReadMessage( const QString & ) ) );
@@ -432,5 +433,5 @@ void MSNNotifySocket::parseCommand( cons
                 QString sl = QString::number( ( unsigned long ) actualTime - \
m_loginTime.toULong() );  
-                QString md5this( m_MSPAuth + sl + m_account->password() );
+                QString md5this( m_MSPAuth + sl + m_password );
                 KMD5 md5( md5this.utf8() );
 
@@ -513,5 +514,5 @@ void MSNNotifySocket::slotAuthJobDone ( 
                 kdDebug( 14140 ) << "MSNNotifySocket::slotAuthJobDone: " << authURL \
<< "(*************)" << endl;  
-                authURL += escape( m_account->password() );
+                authURL += escape( m_password );
                 KIO::Job *job = KIO::get( authURL, false, false );
 

--- kdenetwork/kopete/protocols/msn/msnnotifysocket.h  #1.38:1.39
@@ -40,5 +40,5 @@ class MSNNotifySocket : public MSNAuthSo
 
 public:
-        MSNNotifySocket( MSNAccount* account, const QString &msnId );
+        MSNNotifySocket( MSNAccount* account, const QString &msnId, const QString \
&password );  ~MSNNotifySocket();
 
@@ -136,4 +136,5 @@ private:
 
         MSNAccount *m_account;
+        QString m_password;
 
         unsigned int mailCount;


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