Merge remote-tracking branch 'origin/KDE/4.9'

configuredialog.cpp

@@ -3511,13 +3511,15 @@ SecurityPageWarningTab::SecurityPageWarningTab( QWidget * parent )
   mWidget = new Ui::WarningConfiguration;
   mWidget->setupUi( this );
 
+  mWidget->chiasmusButton->hide();
+
   connect( mWidget->warnGroupBox, SIGNAL(toggled(bool)), SLOT(slotEmitChanged()) );
   connect( mWidget->mWarnUnsigned, SIGNAL(toggled(bool)), SLOT(slotEmitChanged()) );
   connect( mWidget->warnUnencryptedCB, SIGNAL(toggled(bool)), SLOT(slotEmitChanged()) );
   connect( mWidget->warnReceiverNotInCertificateCB, SIGNAL(toggled(bool)), SLOT(slotEmitChanged()) );
 
   connect( mWidget->gnupgButton, SIGNAL(clicked()), SLOT(slotConfigureGnupg()) );
-  connect( mWidget->chiasmusButton, SIGNAL(clicked()), SLOT(slotConfigureChiasmus()) );
+  //connect( mWidget->chiasmusButton, SIGNAL(clicked()), SLOT(slotConfigureChiasmus()) );
   connect( mWidget->enableAllWarningsPB, SIGNAL(clicked()), SLOT(slotReenableAllWarningsClicked()) );
 }
 
@@ -3639,6 +3641,7 @@ void SecurityPage::WarningTab::slotConfigureGnupg()
   delete dlg;
 }
 
+#if 0
 void SecurityPage::WarningTab::slotConfigureChiasmus()
 {
   using namespace Kleo;
@@ -3659,7 +3662,7 @@ void SecurityPage::WarningTab::slotConfigureChiasmus()
   else
     kDebug() << "Kleo::CryptoBackendFactory::instance() returned NULL!";
 }
-
+#endif
 ////
 
 QString SecurityPage::SMimeTab::helpAnchor() const

configuredialog_p.h

@@ -787,7 +787,7 @@ public:
 private Q_SLOTS:
   void slotReenableAllWarningsClicked();
   void slotConfigureGnupg();
-  void slotConfigureChiasmus();
+  //void slotConfigureChiasmus();
 
 private:
   virtual void doLoadFromGlobalSettings();

kmcomposewin.cpp

@@ -196,7 +196,7 @@ KMComposeWin::KMComposeWin( const KMime::Message::Ptr &aMsg, bool lastSignState,
     mDictionaryAction( 0 ), mSnippetAction( 0 ), mTranslateAction(0),
     mCodecAction( 0 ),
     mCryptoModuleAction( 0 ),
-    mEncryptChiasmusAction( 0 ),
+    //mEncryptChiasmusAction( 0 ),
     mDummyComposer( 0 ),
     mLabelWidth( 0 ),
     mComposerBase( 0 ),
@@ -1343,7 +1343,8 @@ void KMComposeWin::setupActions( void )
   mTranslateAction->setChecked(false);
   connect(mTranslateAction, SIGNAL(triggered(bool)), mTranslatorWidget,SLOT(setVisible(bool)));
 
-
+  //Chiamus not supported in kmail2
+#if 0
   if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) {
     KToggleAction *a = new KToggleAction( KIcon( "chiasmus_chi" ), i18n("Encrypt Message with Chiasmus..."), this );
     actionCollection()->addAction( "encrypt_message_chiasmus", a );
@@ -1354,6 +1355,7 @@ void KMComposeWin::setupActions( void )
   } else {
     mEncryptChiasmusAction = 0;
   }
+#endif
 
   mEncryptAction = new KToggleAction(KIcon("document-encrypt"), i18n("&Encrypt Message"), this);
   mEncryptAction->setIconText( i18n( "Encrypt" ) );
@@ -3210,6 +3212,7 @@ void KMComposeWin::slotCursorPositionChanged()
   }
 }
 
+#if 0
 namespace {
 class KToggleActionResetter {
   KToggleAction *mAction;
@@ -3295,6 +3298,7 @@ void KMComposeWin::slotEncryptChiasmusToggled( bool on )
   assert( !GlobalSettings::chiasmusKey().isEmpty() );
   resetter.disable();
 }
+#endif
 
 void KMComposeWin::recipientEditorSizeHintChanged()
 {

kmcomposewin.h

@@ -413,8 +413,8 @@ class KMComposeWin : public KMail::Composer
     void slotConfigChanged();
 
     void slotPrintComposeResult( KJob *job );
-
-    void slotEncryptChiasmusToggled( bool );
+    
+    //void slotEncryptChiasmusToggled( bool );
 
     void slotSendFailed( const QString& msg );
     void slotSendSuccessful();
@@ -646,7 +646,7 @@ class KMComposeWin : public KMail::Composer
     QSplitter *mSnippetSplitter;
     QByteArray mOriginalPreferredCharset;
 
-    KToggleAction *mEncryptChiasmusAction;
+    //KToggleAction *mEncryptChiasmusAction;
 
     Message::Composer *mDummyComposer;
     // used for auto saving, printing, etc. Not for sending, which happens in ComposerViewBase