Forward port of ical invitation and reply handling fixes from proko2.

svn path=/trunk/kdepim/; revision=358742

callback.cpp

@@ -88,12 +88,7 @@ bool Callback::mailICal( const QString& to, const QString iCal,
   cWin->setMsg( msg, false /* mayAutoSign */ );
   // cWin->setCharset( "", true );
   cWin->slotWordWrapToggled( false );
-
-  // TODO: These are no longer available. It was an internal
-  // implementation detail of kmcomposewin, anyway. Please find
-  // another way...
-  //cWin->mNeverSign = true;
-  //cWin->mNeverEncrypt = true;
+  cWin->setSigningAndEncryptionDisabled( true );
 
   if ( options.readBoolEntry( "AutomaticSending", true ) ) {
     cWin->setAutoDeleteWindow(  true );

kmcomposewin.cpp

@@ -125,6 +125,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
     mAtmModified( false ),
     mMsg( 0 ),
     mAttachMenu( 0 ),
+    mSigningAndEncryptionExplicitlyDisabled( false ),
     mAutoRequestMDN( false ),
     mFolder( 0 ),
     mUseHTMLEditor( false ),
@@ -3104,7 +3105,8 @@ void KMComposeWin::doSend(int aSendNow, bool saveInDrafts)
 
   mDisableBreaking = saveInDrafts;
 
-  const bool neverEncrypt = saveInDrafts && mNeverEncryptWhenSavingInDrafts;
+  const bool neverEncrypt = ( saveInDrafts && mNeverEncryptWhenSavingInDrafts ) 
+                           || mSigningAndEncryptionExplicitlyDisabled;
   connect( this, SIGNAL( applyChangesDone( bool ) ),
            SLOT( slotContinueDoSend( bool ) ) );
 

kmcomposewin.h

@@ -366,6 +366,14 @@ public:
     mSubjectTextWasSpellChecked = _spell;
   }
   bool subjectTextWasSpellChecked() const { return mSubjectTextWasSpellChecked; }
+
+
+  /** Disabled signing and encryption completely for this composer window. */
+  void setSigningAndEncryptionDisabled( bool v )
+  {
+    mSigningAndEncryptionExplicitlyDisabled = v;
+  }
+
 public slots:
   void polish();
   /**
@@ -760,6 +768,7 @@ protected:
   int mOpenId, mViewId, mRemoveId, mSaveAsId, mPropertiesId;
   bool mAutoSign, mAutoPgpSign, mAutoPgpEncrypt, mAutoDeleteMsg;
   bool mNeverSignWhenSavingInDrafts, mNeverEncryptWhenSavingInDrafts;
+  bool mSigningAndEncryptionExplicitlyDisabled;
   bool mAutoRequestMDN;
   bool mLastSignActionState, mLastEncryptActionState;
   bool mLastIdentityHasSigningKey, mLastIdentityHasEncryptionKey;

kmkernel.cpp

@@ -442,8 +442,7 @@ int KMKernel::openComposer (const QString &to, const QString &cc,
                                     "charset=\"utf-8\"" ).
                            arg( attachParamValue ) );
 
-      // Don't show the composer window, if the automatic sending is checked
-      iCalAutoSend = options.readBoolEntry( "AutomaticSending", true );
+      iCalAutoSend = true; // no point in editing raw ICAL
       noWordWrap = true; // we shant word wrap inline invitations
     } else {
       // Just do what we're told to do
@@ -460,11 +459,16 @@ int KMKernel::openComposer (const QString &to, const QString &cc,
         // << attachCharset << endl;
         msgPart->setCharset( attachCharset );
       }
+      // Don't show the composer window, if the automatic sending is checked
+      KConfigGroup options(  config(), "Groupware" );
+      iCalAutoSend = options.readBoolEntry( "AutomaticSending", true );
     }
   }
 
   KMComposeWin *cWin = new KMComposeWin();
   cWin->setMsg( msg, !isICalInvitation /* mayAutoSign */ );
+  cWin->setSigningAndEncryptionDisabled( isICalInvitation 
+     && options.readBoolEntry( "LegacyBodyInvites", false ) );
   cWin->setAutoDelete( true );
   if( noWordWrap )
     cWin->slotWordWrapToggled( false );