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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdepim/libkdenetwork
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-02-09 17:54:05
Message-ID: 20040209175405.5EB8A9321 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

> From aegypten_branch: Don't disable sign/encrypt if we're using S/MIME and no \
> OpenPGP key has been specified for this identity. (missing part of the patch to \
> make KMail compile again)


  M +8 -0      cryptplugwrapper.cpp   1.33.4.1
  M +2 -0      cryptplugwrapper.h   1.34.6.1


--- kdepim/libkdenetwork/cryptplugwrapper.h  #1.34:1.34.6.1
@@ -538,4 +538,6 @@ public:
     virtual ~CryptPlugWrapper();
 
+    QString protocol() const;
+
     /*! \ingroup groupAdmin
         \brief Set this CRYPTPLUG wrapper's internal \c active flag.

--- kdepim/libkdenetwork/cryptplugwrapper.cpp  #1.33:1.33.4.1
@@ -449,4 +449,12 @@ QString CryptPlugWrapper::libName() cons
 }
 
+QString CryptPlugWrapper::protocol() const
+{
+  if ( _libName.contains( "smime" ) )
+    return "smime";
+  if ( _libName.contains( "openpgp" ) )
+    return "openpgp";
+  return QString::null;
+}
 
 void CryptPlugWrapper::setDisplayName( const QString& name )


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