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

List:       kde-commits
Subject:    aegypten_branch: kdepim/kmail
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-03-15 18:33:58
Message-ID: 20040315183358.502D599AC () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

the certmanager doesn't need libname etc anymore - it just plain starts without args :)


  M +4 -7      kmmainwidget.cpp   1.115.2.18


--- kdepim/kmail/kmmainwidget.cpp  #1.115.2.17:1.115.2.18
@@ -71,6 +71,6 @@ using KMail::FolderJob;
 #include "mailinglist-magic.h"
 #include "kmgroupware.h"
-#include "cryptplugwrapperlist.h"
-#include "cryptplugfactory.h"
+
+#include <cryptplugfactory.h>
 
 #include <qlayout.h>
@@ -1377,8 +1377,7 @@ void KMMainWidget::slotEditVacation()
 void KMMainWidget::slotStartCertManager()
 {
-  const CryptPlugWrapper *wrapper = KMail::CryptPlugFactory::instance()->smime();
-  if ( !wrapper ) {
+  if ( !Kleo::CryptPlugFactory::instance()->smime() ) {
     KMessageBox::error( this, i18n( "Could not start certificate manager. "
-                                    "You need to configure an S/MIME plugin first." ),
+                                    "You need to configure an S/MIME backend first." ),
                                     i18n( "KMail Error" ) );
     return;
@@ -1387,6 +1386,4 @@ void KMMainWidget::slotStartCertManager(
   // there is no parent
   certManagerProc << "kgpgcertmanager";
-  certManagerProc << wrapper->displayName();
-  certManagerProc << wrapper->libName();
 
   if( !certManagerProc.start( KProcess::DontCare ) )


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