no need to exclude the key selectors anymore, builds fine on Maemo now

svn path=/branches/work/komo/kdepim/; revision=1133336

identitydialog.cpp

@@ -181,7 +181,6 @@ namespace KMail {
     glay->setColumnStretch( 1, 1 );
 
     // "OpenPGP Signature Key" requester and label:
-#ifndef KCM_KPIMIDENTITIES_STANDALONE
     ++row;
     mPGPSigningKeyRequester = new Kleo::SigningKeyRequester( false, Kleo::SigningKeyRequester::OpenPGP, tab );
     mPGPSigningKeyRequester->dialogButton()->setText( i18n("Chang&e...") );
@@ -285,7 +284,6 @@ namespace KMail {
 
     label->setEnabled( smimeProtocol );
     mSMIMEEncryptionKeyRequester->setEnabled( smimeProtocol );
-#endif
 
     // "Preferred Crypto Message Format" combobox and label:
     ++row;
@@ -494,12 +492,10 @@ namespace KMail {
       // set the configured email address as initial query of the key
       // requesters:
       const QString email = mEmailEdit->text().trimmed();
-#ifndef KCM_KPIMIDENTITIES_STANDALONE
       mPGPEncryptionKeyRequester->setInitialQuery( email );
       mPGPSigningKeyRequester->setInitialQuery( email );
       mSMIMEEncryptionKeyRequester->setInitialQuery( email );
       mSMIMESigningKeyRequester->setInitialQuery( email );
-#endif
     }
   }
 
@@ -576,7 +572,6 @@ namespace KMail {
 
     const QString email = validationJob->property( "email" ).toString();
 
-#ifndef KCM_KPIMIDENTITIES_STANDALONE
     const std::vector<GpgME::Key> &pgpSigningKeys =
       mPGPSigningKeyRequester->keys();
     const std::vector<GpgME::Key> &pgpEncryptionKeys =
@@ -628,7 +623,6 @@ namespace KMail {
         return;
       }
     }
-#endif
 
 
     if ( mSignatureConfigurator->isSignatureEnabled() &&
@@ -667,12 +661,10 @@ namespace KMail {
     mEmailEdit->setText( ident.emailAddr() );
 
     // "Cryptography" tab:
-#ifndef KCM_KPIMIDENTITIES_STANDALONE
     mPGPSigningKeyRequester->setFingerprint( ident.pgpSigningKey() );
     mPGPEncryptionKeyRequester->setFingerprint( ident.pgpEncryptionKey() );
     mSMIMESigningKeyRequester->setFingerprint( ident.smimeSigningKey() );
     mSMIMEEncryptionKeyRequester->setFingerprint( ident.smimeEncryptionKey() );
-#endif
 
     mPreferredCryptoMessageFormat->setCurrentIndex( format2cb(
        Kleo::stringToCryptoMessageFormat( ident.preferredCryptoMessageFormat() ) ) );
@@ -747,7 +739,6 @@ namespace KMail {
     ident.setOrganization( mOrganizationEdit->text() );
     QString email = mEmailEdit->text();
     ident.setEmailAddr( email );
-#ifndef KCM_KPIMIDENTITIES_STANDALONE
     // "Cryptography" tab:
     ident.setPGPSigningKey( mPGPSigningKeyRequester->fingerprint().toLatin1() );
     ident.setPGPEncryptionKey( mPGPEncryptionKeyRequester->fingerprint().toLatin1() );
@@ -755,7 +746,6 @@ namespace KMail {
     ident.setSMIMEEncryptionKey( mSMIMEEncryptionKeyRequester->fingerprint().toLatin1() );
     ident.setPreferredCryptoMessageFormat(
        Kleo::cryptoMessageFormatToString(cb2format( mPreferredCryptoMessageFormat->currentIndex() ) ) );
-#endif
     // "Advanced" tab:
     ident.setReplyToAddr( mReplyToEdit->text() );
     ident.setBcc( mBccEdit->text() );