[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kmail-devel
Subject:    [PATCH] Fix loose ends in crypto support: pt.1/??: fixing up
From:       Marc Mutz <marc () klaralvdalens-datakonsult ! se>
Date:       2004-05-30 12:49:27
Message-ID: 40B51544000D0F58 () dpo2w1p ! servers ! epost ! de (added by
[Download RAW message or body]

Hi!

This patch does two things:
1. It removes the (newly added) references to KMComposer::mNever{Encrypt,Sign}
   They are an internal implementation detail of KMComposeWin, used for
   supressing crypto operation during autosave/dead letter writing. If you
   want to forbid the user to sign/encrypt, you should make that visible in
   the GUI, by disabling the resp. actions _and_ disabling crypto operations
   and not by silently ignoring the user's request.for signing/encrypting.
   (this patch is needed, since, in ae_b, both variables are gone).
2. It fixes usage of KPIM::Identity by aviding the copy-ctor and by calling
   isNull() instead of comparing to Identity::null.

This patch depends on: (nothing)

Next up are the composer changes, which is the largest patch in this patch set 
series.

Marc

-- 
Marc Mutz -- marc@klaralvdalens-datakonsult.se, mutz@kde.org
Klarälvdalens Datakonsult AB, Platform-independent software solutions

["fix-callback_cpp.diff" (text/x-diff)]

Index: callback.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/callback.cpp,v
retrieving revision 1.6
diff -u -3 -p -r1.6 callback.cpp
--- callback.cpp	14 May 2004 11:44:36 -0000	1.6
+++ callback.cpp	30 May 2004 12:02:02 -0000
@@ -77,8 +77,11 @@ bool Callback::mailICal( const QString& 
   cWin->addAttach( msgPart );
 
   cWin->slotWordWrapToggled( false );
-  cWin->mNeverSign = true;
-  cWin->mNeverEncrypt = true;
+  // 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;
 
   // This is commented out, since there is no other visual indication of
   // the fact that a message has been sent. Also, there is no way
@@ -99,10 +102,10 @@ QString Callback::receiver() const
 
   mReceiverSet = true;
 
-  KPIM::Identity ident =
+  const KPIM::Identity & ident =
     kmkernel->identityManager()->identityForAddress( mMsg->to() );
 
-  if( ident != KPIM::Identity::null ) {
+  if( !ident.isNull() ) {
     // That was easy
     mReceiver = ident.emailAddr();
   } else {


_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel


[prev in list] [next in list] [prev in thread] [next in thread]