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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim/libkleo
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-03-12 20:01:58
Message-ID: 1268424118.713744.431.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1102542 by mutz:

libkleo: add ChangePasswdJob, and an implementation based on gpgme_op_passwd

 M  +2 -0      CMakeLists.txt  
 M  +9 -0      backends/qgpgme/qgpgmebackend.cpp  
 A             backends/qgpgme/qgpgmechangepasswdjob.cpp   [License: GPL (v2+) (+Qt \
exception)]  A             backends/qgpgme/qgpgmechangepasswdjob.h   \
kleo/cryptobackend.cpp#1102337 [License: GPL (v2+) (+Qt exception)]  A             \
kleo/changepasswdjob.h   kleo/cryptobackend.cpp#1102337 [License: GPL (v2+) (+Qt \
exception)]  M  +2 -1      kleo/cryptobackend.cpp  
 M  +3 -1      kleo/cryptobackend.h  
 M  +3 -0      kleo/job.cpp  


--- branches/kdepim/enterprise4/kdepim/libkleo/CMakeLists.txt #1102541:1102542
@@ -26,6 +26,7 @@
 	backends/qgpgme/qgpgmesecretkeyexportjob.cpp
 	backends/qgpgme/qgpgmechangeexpiryjob.cpp
 	backends/qgpgme/qgpgmechangeownertrustjob.cpp
+        backends/qgpgme/qgpgmechangepasswdjob.cpp
 	backends/qgpgme/qgpgmedownloadjob.cpp
 	backends/qgpgme/qgpgmedeletejob.cpp
 	backends/qgpgme/qgpgmeencryptjob.cpp
@@ -135,6 +136,7 @@
 	kleo/exportjob.h
 	kleo/changeexpiryjob.h
 	kleo/changeownertrustjob.h
+        kleo/changepasswdjob.h
 	kleo/downloadjob.h
 	kleo/deletejob.h
 	kleo/encryptjob.h
--- branches/kdepim/enterprise4/kdepim/libkleo/backends/qgpgme/qgpgmebackend.cpp \
#1102541:1102542 @@ -53,6 +53,7 @@
 #include "qgpgmeverifyopaquejob.h"
 #include "qgpgmechangeexpiryjob.h"
 #include "qgpgmechangeownertrustjob.h"
+#include "qgpgmechangepasswdjob.h"
 #include "qgpgmeadduseridjob.h"
 
 #include <gpgme++/error.h>
@@ -246,6 +247,14 @@
       return new Kleo::QGpgMEChangeExpiryJob( context );
     }
 
+    Kleo::ChangePasswdJob * changePasswdJob() const {
+      if ( !GpgME::hasFeature( GpgME::PasswdFeature ) )
+        return 0;
+      GpgME::Context * context = GpgME::Context::createForProtocol( mProtocol );
+      if ( !context )
+        return 0;
+      return new Kleo::QGpgMEChangePasswdJob( context );
+    }
 
     Kleo::SignKeyJob * signKeyJob() const {
       if ( mProtocol != GpgME::OpenPGP )
--- branches/kdepim/enterprise4/kdepim/libkleo/kleo/cryptobackend.cpp \
#1102541:1102542 @@ -2,7 +2,7 @@
     kleo/cryptobackend.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
-    Copyright (c) 2005 Klarälvdalens Datakonsult AB
+    Copyright (c) 2005,2010 Klarälvdalens Datakonsult AB
 
     Libkleopatra is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -37,5 +37,6 @@
 
 Kleo::ChangeExpiryJob * Kleo::CryptoBackend::Protocol::changeExpiryJob() const { \
return 0; }  Kleo::ChangeOwnerTrustJob * \
Kleo::CryptoBackend::Protocol::changeOwnerTrustJob() const { return 0; } \
+Kleo::ChangePasswdJob * Kleo::CryptoBackend::Protocol::changePasswdJob() const { \
return 0; }  Kleo::SignKeyJob * Kleo::CryptoBackend::Protocol::signKeyJob() const { \
return 0; }  Kleo::AddUserIDJob * Kleo::CryptoBackend::Protocol::addUserIDJob() const \
                { return 0; }
--- branches/kdepim/enterprise4/kdepim/libkleo/kleo/cryptobackend.h #1102541:1102542
@@ -2,7 +2,7 @@
     kleo/cryptobackend.h
 
     This file is part of libkleopatra, the KDE keymanagement library
-    Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB
+    Copyright (c) 2004,2005,2010 Klarälvdalens Datakonsult AB
 
     Libkleopatra is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -55,6 +55,7 @@
   class RefreshKeysJob;
   class ChangeExpiryJob;
   class ChangeOwnerTrustJob;
+  class ChangePasswdJob;
   class AddUserIDJob;
   class SpecialJob;
 }
@@ -121,6 +122,7 @@
     virtual RefreshKeysJob      * refreshKeysJob() const = 0;
     virtual ChangeExpiryJob     * changeExpiryJob() const;
     virtual ChangeOwnerTrustJob * changeOwnerTrustJob() const;
+    virtual ChangePasswdJob     * changePasswdJob() const;
     virtual SignKeyJob          * signKeyJob() const;
     virtual AddUserIDJob        * addUserIDJob() const;
     virtual SpecialJob          * specialJob( const char * type, const \
                QMap<QString,QVariant> & args ) const = 0;
--- branches/kdepim/enterprise4/kdepim/libkleo/kleo/job.cpp #1102541:1102542
@@ -48,6 +48,7 @@
 #include "exportjob.h"
 #include "changeexpiryjob.h"
 #include "changeownertrustjob.h"
+#include "changepasswdjob.h"
 #include "downloadjob.h"
 #include "deletejob.h"
 #include "refreshkeysjob.h"
@@ -112,6 +113,7 @@
 make_job_subclass(ExportJob)
 make_job_subclass(ChangeExpiryJob)
 make_job_subclass(ChangeOwnerTrustJob)
+make_job_subclass(ChangePasswdJob)
 make_job_subclass(DownloadJob)
 make_job_subclass(DeleteJob)
 make_job_subclass(RefreshKeysJob)
@@ -138,6 +140,7 @@
 #include "exportjob.moc"
 #include "changeexpiryjob.moc"
 #include "changeownertrustjob.moc"
+#include "changepasswdjob.moc"
 #include "downloadjob.moc"
 #include "deletejob.moc"
 #include "refreshkeysjob.moc"


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