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

List:       kde-commits
Subject:    kdelibs/kio
From:       Helge Deller <deller () kde ! org>
Date:       2004-06-04 8:53:46
Message-ID: 20040604085346.141E320B6 () office ! kde ! org
[Download RAW message or body]

CVS commit by deller: 

minor changes and add DCOP function deleteHomeCertificateByName(QString name);
CCMAIL: George Staikos <staikos@kde.org>


  M +7 -1      kssl/ksslcertificatehome.cc   1.15
  M +1 -0      kssl/ksslcertificatehome.h   1.18
  M +6 -2      misc/kssld/kssld.cpp   1.27
  M +5 -3      misc/kssld/kssld.h   1.15


--- kdelibs/kio/misc/kssld/kssld.h  #1.14:1.15
@@ -122,9 +122,11 @@ k_dcop:
   bool addHomeCertificateFile(QString filename, QString password, bool storePass /*=false*/);
 
-  bool addHomeCertificatePKCS12(QString bas64cert, QString passToStore);
+  bool addHomeCertificatePKCS12(QString base64cert, QString passToStore);
 
-  bool deleteHomeCertificateFile(QString filename, QString password);
+  bool deleteHomeCertificateByFile(QString filename, QString password);
 
-  bool deleteHomeCertificatePKCS12(QString base64cert, QString password);
+  bool deleteHomeCertificateByPKCS12(QString base64cert, QString password);
+
+  bool deleteHomeCertificateByName(QString name);
 
 private:

--- kdelibs/kio/misc/kssld/kssld.cpp  #1.26:1.27
@@ -905,9 +905,9 @@ bool KSSLD::addHomeCertificatePKCS12(QSt
 }
 
-bool KSSLD::deleteHomeCertificateFile(QString filename, QString password) {
+bool KSSLD::deleteHomeCertificateByFile(QString filename, QString password) {
         return KSSLCertificateHome::deleteCertificate(filename, password);
 }
 
-bool KSSLD::deleteHomeCertificatePKCS12(QString base64cert, QString password) {
+bool KSSLD::deleteHomeCertificateByPKCS12(QString base64cert, QString password) {
         bool ok;
         KSSLPKCS12 *pkcs12 = KSSLPKCS12::fromString(base64cert, password);
@@ -917,4 +917,8 @@ bool KSSLD::deleteHomeCertificatePKCS12(
 }
 
+bool KSSLD::deleteHomeCertificateByName(QString name) {
+        return KSSLCertificateHome::deleteCertificateByName(name);
+}
+
 
 

--- kdelibs/kio/kssl/ksslcertificatehome.h  #1.17:1.18
@@ -74,4 +74,5 @@ public:
         static bool deleteCertificate(const QString &filename, const QString &password);
         static bool deleteCertificate(KSSLPKCS12 *cert);
+        static bool deleteCertificateByName(const QString &name);
  
         /*

--- kdelibs/kio/kssl/ksslcertificatehome.cc  #1.14:1.15
@@ -98,7 +98,13 @@ bool KSSLCertificateHome::deleteCertific
    if (!cert) return false;
    
+   return deleteCertificateByName(cert->name());
+}
+
+bool KSSLCertificateHome::deleteCertificateByName(const QString &name) {
+   if (name.isEmpty()) return false;
+
 KSimpleConfig cfg("ksslcertificates", false);
 
-   bool ok = cfg.deleteGroup(cert->name());
+   bool ok = cfg.deleteGroup(name);
    cfg.sync();
 


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