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

List:       kde-commits
Subject:    KDE/kdepim/runtime/resources/imap
From:       Andreas Holzammer <andy () kdab ! com>
Date:       2010-12-03 16:48:27
Message-ID: 20101203164827.CB3B9AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1203338 by aholzammer:

take out kwallet hack for wince, because there is now a fakewallet in kdelibs

 M  +0 -12     imapaccount.cpp  
 M  +0 -6      imapaccount.h  
 M  +0 -3      imapresource.kcfg  
 M  +0 -12     sessionpool.cpp  
 M  +0 -11     settings.cpp  
 M  +0 -2      settings.h  
 M  +0 -4      settingspasswordrequester.cpp  
 M  +0 -4      setupserver.cpp  
 M  +0 -4      subscriptiondialog.cpp  


--- trunk/KDE/kdepim/runtime/resources/imap/imapaccount.cpp #1203337:1203338
@@ -68,18 +68,6 @@
   return m_userName;
 }
 
-#ifdef Q_OS_WINCE
-void ImapAccount::setPassword( const QString &password )
-{
-  m_password = password;
-}
-
-QString ImapAccount::password() const
-{
-  return m_password;
-}
-#endif
-
 void ImapAccount::setEncryptionMode( KIMAP::LoginJob::EncryptionMode mode)
 {
   m_encryption = mode;
--- trunk/KDE/kdepim/runtime/resources/imap/imapaccount.h #1203337:1203338
@@ -43,11 +43,6 @@
   void setUserName( const QString &userName );
   QString userName() const;
 
-#ifdef Q_OS_WINCE
-  void setPassword( const QString &password );
-  QString password() const;
-#endif
-
   void setEncryptionMode( KIMAP::LoginJob::EncryptionMode mode );
   KIMAP::LoginJob::EncryptionMode encryptionMode() const;
 
@@ -65,7 +60,6 @@
   QString m_server;
   quint16 m_port;
   QString m_userName;
-  QString m_password;
   int m_timeout;
   KIMAP::LoginJob::EncryptionMode m_encryption;
   KIMAP::LoginJob::AuthenticationMode m_authentication;
--- trunk/KDE/kdepim/runtime/resources/imap/imapresource.kcfg #1203337:1203338
@@ -16,9 +16,6 @@
     <entry name="UserName" type="String">
       <label>Username</label>
     </entry>
-    <entry name="Password" type="String">
-      <label>Password</label>
-    </entry>
     <entry name="Safety" type="String">
       <label>Defines the encryption type to use</label>
       <default>SSL</default>
--- trunk/KDE/kdepim/runtime/resources/imap/sessionpool.cpp #1203337:1203338
@@ -95,7 +95,6 @@
   m_networkAccessHelper->establishConnection();
 
   m_account = account;
-#ifndef Q_OS_WINCE
   if ( m_account->authenticationMode() == KIMAP::LoginJob::GSSAPI ) {
     // for GSSAPI we don't have to ask for username/password, because it uses \
                session wide tickets
     QMetaObject::invokeMethod( this, "onPasswordRequestDone", Qt::QueuedConnection,
@@ -104,11 +103,6 @@
   } else {
     m_passwordRequester->requestPassword();
   }
-#else
-    QMetaObject::invokeMethod( this, "onPasswordRequestDone", Qt::QueuedConnection,
-                               Q_ARG( int, \
                PasswordRequesterInterface::PasswordRetrieved ),
-                               Q_ARG( QString, m_account->password() ) );
-#endif
 
   return true;
 }
@@ -251,13 +245,7 @@
 
   } else if ( m_idlePool.size() + m_reservedPool.size() < m_maxPoolSize ) {
     // We didn't reach the max pool size yet so create a new one
-#ifndef Q_OS_WINCE
     m_passwordRequester->requestPassword();
-#else
-    QMetaObject::invokeMethod( this, "onPasswordRequestDone", Qt::QueuedConnection,
-                               Q_ARG( int, \
                PasswordRequesterInterface::PasswordRetrieved ),
-                               Q_ARG( QString, m_account->password() ) );
-#endif
 
   } else {
     // No session available, and max pool size reached
--- trunk/KDE/kdepim/runtime/resources/imap/settings.cpp #1203337:1203338
@@ -154,20 +154,13 @@
 {
   if ( result == QDialog::Accepted ) {
     KPasswordDialog *dlg = qobject_cast<KPasswordDialog*>( sender() );
-#ifdef Q_OS_WINCE
-    // no wallet.
-    SettingsBase::setPassword( dlg->password() );
-    writeConfig();
-#else
     setPassword( dlg->password() );
-#endif
     emit passwordRequestCompleted( dlg->password(), false );
   } else {
     emit passwordRequestCompleted( QString(), true );
   }
 }
 
-#ifndef Q_OS_WINCE
 QString Settings::password(bool *userRejected) const
 {
     if ( userRejected != 0 ) {
@@ -211,7 +204,6 @@
     }
     delete wallet;
 }
-#endif
 
 void Settings::loadAccount( ImapAccount *account ) const
 {
@@ -221,9 +213,6 @@
   }
 
   account->setUserName( userName() );
-#ifdef Q_OS_WINCE
-  account->setPassword( password() );
-#endif
   account->setSubscriptionEnabled( subscriptionEnabled() );
 
   QString encryption = safety();
--- trunk/KDE/kdepim/runtime/resources/imap/settings.h #1203337:1203338
@@ -51,11 +51,9 @@
 signals:
     void passwordRequestCompleted( const QString &password, bool userRejected );
 
-#ifndef Q_OS_WINCE
 public slots:
     Q_SCRIPTABLE QString password( bool *userRejected = 0 ) const;
     Q_SCRIPTABLE void setPassword( const QString &password );
-#endif
 
 private slots:
     void onWalletOpened( bool success );
--- trunk/KDE/kdepim/runtime/resources/imap/settingspasswordrequester.cpp \
#1203337:1203338 @@ -39,17 +39,13 @@
 
 void SettingsPasswordRequester::requestPassword( RequestType request, const QString \
&serverError )  {
-#ifndef Q_OS_WINCE
   if ( request == WrongPasswordRequest ) {
-#endif
     QMetaObject::invokeMethod( this, "askUserInput", Qt::QueuedConnection, \
                Q_ARG(QString, serverError) );
-#ifndef Q_OS_WINCE
   } else {
     connect( Settings::self(), SIGNAL(passwordRequestCompleted(QString, bool)),
              this, SLOT(onPasswordRequestCompleted(QString, bool)) );
     Settings::self()->requestPassword();
   }
-#endif
 }
 
 void SettingsPasswordRequester::askUserInput( const QString &serverError )
--- trunk/KDE/kdepim/runtime/resources/imap/setupserver.cpp #1203337:1203338
@@ -332,7 +332,6 @@
   kDebug() << "read IMAP auth mode: " << authenticationModeString( \
(MailTransport::Transport::EnumAuthenticationType::type) i );  setCurrentAuthMode( \
m_ui->authenticationCombo, (MailTransport::Transport::EnumAuthenticationType::type) i \
);  
-#ifndef Q_OS_WINCE
   bool rejected = false;
   QString password = Settings::self()->password( &rejected );
   if ( rejected ) {
@@ -346,9 +345,6 @@
   } else {
     m_ui->password->insert( password );
   }
-#else
-  m_ui->password->insert( Settings::self()->password() );
-#endif
 
   m_ui->subscriptionEnabled->setChecked( Settings::self()->subscriptionEnabled() );
 
--- trunk/KDE/kdepim/runtime/resources/imap/subscriptiondialog.cpp #1203337:1203338
@@ -147,11 +147,7 @@
 
   KIMAP::LoginJob *login = new KIMAP::LoginJob( m_session );
   login->setUserName( account.userName() );
-#ifndef Q_OS_WINCE
   login->setPassword( password );
-#else
-  login->setPassword( account.password() );
-#endif
   login->setEncryptionMode( account.encryptionMode() );
   login->setAuthenticationMode( account.authenticationMode() );
 


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