From 009631d0fc83f471d6c515e2a5001337a5a2ea21 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 7 Sep 2010 22:22:18 +0000
Subject: [PATCH] * Batch 1/2 of bugfix patches from the Chakra project

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172724 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmail/kmtransport.cpp | 2 +-
 kmail/main.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 69032971..a5bf6b9c 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 640fdc6f..b06bf8a4 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