summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/kmtransport.cpp2
-rw-r--r--kmail/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 690329715..a5bf6b9ce 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -670,7 +670,7 @@ void KMTransportDialog::enableAuthMethods( unsigned int auth ) {
// LOGIN doesn't offer anything over PLAIN, requires more server
// roundtrips and is not an official SASL mechanism, but a MS-ism,
// so only enable it if PLAIN isn't available:
- mSmtp.authLogin->setEnabled( auth & LOGIN && !(auth & PLAIN));
+ mSmtp.authLogin->setEnabled( auth & LOGIN /*&& !(auth & PLAIN)*/);
mSmtp.authCramMd5->setEnabled( auth & CRAM_MD5 );
mSmtp.authDigestMd5->setEnabled( auth & DIGEST_MD5 );
mSmtp.authNTLM->setEnabled( auth & NTLM );
diff --git a/kmail/main.cpp b/kmail/main.cpp
index 640fdc6f0..b06bf8a45 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
kmsetSignalHandler(kmsignalHandler);
kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
- kmkernel->setStartingUp( false ); // Starting up is finished
+ kmailKernel.setStartingUp( false ); // Starting up is finished
// Go!
int ret = kapp->exec();
// clean up