* 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

@@ -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 );

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