Revision 822815

Go back to digest for 22nd June 2008

Other in KDE-PIM

Thomas McGuire committed changes in /trunk/KDE/kdepim:

Merge most of Kleopatra and libkleo from the enterprise4 branch, as discussed on the release team mailing list.

This needs an up-to-date kdepimlibs.

Surprisingly, svnmerge didn't choke on the huge list of commits, there were only two conflicts, in kleopatra/tests/gnupg_home/pubring.kbx and kleopatra/pics/kleopatra_splashscreen.png
Since those were binary files, I simply manually copied them over from the e4 branch instead.

I'm sure I'll get the price for the longest commit message for this.

File Changes

Added 58 files
  • /trunk/KDE/kdepim
  •   /kleopatra/kleopatraapplication.cpp
  •   /kleopatra/kleopatraapplication.h
  •   /kleopatra/systemtrayicon.cpp
  •   /kleopatra/systemtrayicon.h
  •   /libkleo/CMakeLists.txt
  •   /kleopatra/commands/adduseridcommand.cpp
  •   /kleopatra/commands/adduseridcommand.h
  •   /kleopatra/commands/certifycertificatecommand.cpp
  •   /kleopatra/commands/certifycertificatecommand.h
  •   /kleopatra/commands/changepassphrasecommand.cpp
  •   /kleopatra/commands/changepassphrasecommand.h
  •   /kleopatra/commands/dumpcertificatecommand.cpp
  •   /kleopatra/commands/dumpcertificatecommand.h
  •   /kleopatra/commands/exportopenpgpcertstoservercommand.cpp
  •   /kleopatra/commands/exportopenpgpcertstoservercommand.h
  •   /kleopatra/commands/exportsecretkeycommand.cpp
  •   /kleopatra/commands/exportsecretkeycommand.h
  •   /kleopatra/dialogs/adduseriddialog.cpp
  •   /kleopatra/dialogs/adduseriddialog.h
  •   /kleopatra/dialogs/adduseriddialog.ui
  •   /kleopatra/dialogs/certificatedetailsdialog.cpp
  •   /kleopatra/dialogs/certificatedetailsdialog.h
  •   /kleopatra/dialogs/certificatedetailsdialog.ui
  •   /kleopatra/dialogs/certificationoptionswidget.ui
  •   /kleopatra/dialogs/certifycertificatedialog.cpp
  •   /kleopatra/dialogs/certifycertificatedialog.h
  •   /kleopatra/dialogs/certifycertificatedialog_p.h
  •   /kleopatra/dialogs/exportcertificatesdialog.cpp
  •   /kleopatra/dialogs/exportcertificatesdialog.h
  •   /kleopatra/dialogs/exportsecretkeydialog.cpp
  •   /kleopatra/dialogs/exportsecretkeydialog.h
  •   /kleopatra/dialogs/exportsecretkeydialog.ui
  •   /kleopatra/dialogs/selectchecklevelwidget.ui
  •   /kleopatra/models/keylistmodel.cpp
  •   /kleopatra/models/useridlistmodel.cpp
  •   /kleopatra/newcertificatewizard/advancedsettingsdialog.ui
  •   /kleopatra/newcertificatewizard/chooseprotocolpage.ui
  •   /kleopatra/newcertificatewizard/enterdetailspage.ui
  •   /kleopatra/newcertificatewizard/keycreationpage.ui
  •   /kleopatra/newcertificatewizard/newcertificatewizard.h
  •   /kleopatra/newcertificatewizard/overviewpage.ui
  •   /kleopatra/tests/CMakeLists.txt
  •   /kleopatra/uiserver/uiserver.h
  •   /kleopatra/utils/classify.cpp
  •   /kleopatra/utils/dragqueen.h
  •   /libkleo/ui/directoryserviceswidget.ui
  •   /libkleo/ui/keyapprovaldialog.cpp
  •   /libkleo/ui/messagebox.cpp
  •   /libkleo/ui/messagebox_p.h
  •   /kleopatra/libkleopatraclient/core/decryptverifyfilescommand.cpp
  •   /kleopatra/libkleopatraclient/core/decryptverifyfilescommand.h
  •   /kleopatra/libkleopatraclient/core/signencryptfilescommand.cpp
  •   /kleopatra/tests/gnupg_home/dirmngr_ldapservers.conf
  •   /kleopatra/tests/gnupg_home/random_seed
  •   /libkleo/backends/chiasmus/chiasmusbackend.cpp
  •   /libkleo/backends/qgpgme/qgpgmeverifydetachedjob.h
  •   /libkleo/backends/qgpgme/qgpgmeverifyopaquejob.cpp
  •   /libkleo/backends/qgpgme/qgpgmeverifyopaquejob.h
Deleted 25 files
  • /trunk/KDE/kdepim
  •   /kleopatra/certificateinfowidget.ui
  •   /kleopatra/certificateinfowidgetimpl.cpp
  •   /kleopatra/certificateinfowidgetimpl.h
  •   /kleopatra/certificatewizard.ui
  •   /kleopatra/certificatewizardimpl.cpp
  •   /kleopatra/certificatewizardimpl.h
  •   /kleopatra/certlistview.cpp
  •   /kleopatra/certlistview.h
  •   /kleopatra/certmanager.cpp
  •   /kleopatra/certmanager.h
  •   /kleopatra/customactions.cpp
  •   /kleopatra/customactions.h
  •   /kleopatra/exportcertificatesdialog.cpp
  •   /kleopatra/exportcertificatesdialog.h
  •   /kleopatra/hierarchyanalyser.cpp
  •   /kleopatra/hierarchyanalyser.h
  •   /kleopatra/commands/signcertificatecommand.cpp
  •   /kleopatra/commands/signcertificatecommand.h
  •   /kleopatra/dialogs/signcertificatedialog.cpp
  •   /kleopatra/dialogs/signcertificatedialog.h
  •   /kleopatra/dialogs/signcertificatedialog.ui
  •   /kleopatra/crypto/gui/decryptverifyresultwidget.cpp
  •   /kleopatra/crypto/gui/decryptverifyresultwidget.h
  •   /libkleo/backends/qgpgme/qgpgmeexportjob.h
  •   /libkleo/backends/qgpgme/qgpgmeimportjob.cpp
Modified 162 files
  • /trunk/KDE/kdepim
  •   /kleopatra/aboutdata.cpp
  •   /kleopatra/CMakeLists.txt
  •   /kleopatra/kleopatra.rc
  •   /kleopatra/main.cpp
  •   /kleopatra/mainwindow.cpp
  •   /kleopatra/mainwindow.h
  •   /kleopatra/newcertificatewizard
  •   /kleopatra/qt-patch-N216530.diff
  •   /kleopatra/commands/changeexpirycommand.cpp
  •   /kleopatra/commands/changeexpirycommand.h
  •   /kleopatra/commands/changeownertrustcommand.cpp
  •   /kleopatra/commands/changeownertrustcommand.h
  •   /kleopatra/commands/command.cpp
  •   /kleopatra/commands/command.h
  •   /kleopatra/commands/command_p.h
  •   /kleopatra/commands/detailscommand.cpp
  •   /kleopatra/commands/detailscommand.h
  •   /kleopatra/commands/dumpcrlcachecommand.cpp
  •   /kleopatra/commands/exportcertificatecommand.cpp
  •   /kleopatra/commands/exportcertificatecommand.h
  •   /kleopatra/commands/gnupgprocesscommand.cpp
  •   /kleopatra/commands/gnupgprocesscommand.h
  •   /kleopatra/commands/lookupcertificatescommand.cpp
  •   /kleopatra/commands/lookupcertificatescommand.h
  •   /kleopatra/commands/refreshopenpgpcertscommand.cpp
  •   /kleopatra/commands/refreshx509certscommand.cpp
  •   /kleopatra/commands/selftestcommand.cpp
  •   /kleopatra/conf/dirservconfigpage.cpp
  •   /kleopatra/crypto/decryptverifyemailcontroller.cpp
  •   /kleopatra/crypto/decryptverifytask.cpp
  •   /kleopatra/dialogs/certificateselectiondialog.cpp
  •   /kleopatra/dialogs/lookupcertificatesdialog.cpp
  •   /kleopatra/dialogs/lookupcertificatesdialog.ui
  •   /kleopatra/dialogs/ownertrustdialog.cpp
  •   /kleopatra/dialogs/ownertrustdialog.h
  •   /kleopatra/dialogs/ownertrustdialog.ui
  •   /kleopatra/dialogs/selftestdialog.cpp
  •   /kleopatra/dialogs/selftestdialog.ui
  •   /kleopatra/kcfg/emailoperationspreferences.kcfg
  •   /kleopatra/libkleopatraclient/CMakeLists.txt
  •   /kleopatra/libkleopatraclient/tests
  •   /kleopatra/models/keycache.cpp
  •   /kleopatra/models/keycache.h
  •   /kleopatra/models/useridlistmodel.h
  •   /kleopatra/newcertificatewizard/listwidget.cpp
  •   /kleopatra/newcertificatewizard/listwidget.h
  •   /kleopatra/newcertificatewizard/listwidget.ui
  •   /kleopatra/newcertificatewizard/newcertificatewizard.cpp
  •   /kleopatra/newcertificatewizard/resultpage.ui
  •   /kleopatra/pics/kleopatra_splashscreen.png
  •   /kleopatra/selftest/gpgconfcheck.cpp
  •   /kleopatra/selftest/gpgconfcheck.h
  •   /kleopatra/selftest/uiservercheck.cpp
  •   /kleopatra/tests/test_useridlistmodels.cpp
  •   /kleopatra/uiserver/assuancommand.h
  •   /kleopatra/uiserver/assuanserverconnection.cpp
  •   /kleopatra/uiserver/assuanserverconnection.h
  •   /kleopatra/uiserver/decryptverifycommandemailbase.cpp
  •   /kleopatra/uiserver/encryptcommand.cpp
  •   /kleopatra/uiserver/prepencryptcommand.cpp
  •   /kleopatra/uiserver/signcommand.cpp
  •   /kleopatra/uiserver/uiserver.cpp
  •   /kleopatra/utils/classify.h
  •   /kleopatra/utils/dragqueen.cpp
  •   /kleopatra/utils/formatting.cpp
  •   /kleopatra/utils/formatting.h
  •   /kleopatra/utils/getpid.h
  •   /kleopatra/utils/gnupg-helper.cpp
  •   /kleopatra/utils/gnupg-helper.h
  •   /kleopatra/utils/hex.cpp
  •   /kleopatra/utils/hex.h
  •   /kleopatra/utils/input.cpp
  •   /kleopatra/utils/input.h
  •   /kleopatra/utils/output.cpp
  •   /kleopatra/utils/output.h
  •   /kleopatra/utils/stl_util.h
  •   /kleopatra/view/keylistcontroller.cpp
  •   /kleopatra/view/keylistcontroller.h
  •   /kleopatra/view/tabwidget.cpp
  •   /kleopatra/view/tabwidget.h
  •   /libkleo/kleo/adduseridjob.h
  •   /libkleo/kleo/changeexpiryjob.h
  •   /libkleo/kleo/changeownertrustjob.h
  •   /libkleo/kleo/cryptobackend.cpp
  •   /libkleo/kleo/cryptobackend.h
  •   /libkleo/kleo/cryptoconfig.h
  •   /libkleo/kleo/decryptjob.h
  •   /libkleo/kleo/decryptverifyjob.h
  •   /libkleo/kleo/deletejob.h
  •   /libkleo/kleo/downloadjob.h
  •   /libkleo/kleo/encryptjob.h
  •   /libkleo/kleo/exportjob.h
  •   /libkleo/kleo/importjob.h
  •   /libkleo/kleo/job.cpp
  •   /libkleo/kleo/keyfiltermanager.cpp
  •   /libkleo/kleo/keygenerationjob.h
  •   /libkleo/kleo/keylistjob.h
  •   /libkleo/kleo/signencryptjob.h
  •   /libkleo/kleo/signjob.h
  •   /libkleo/kleo/signkeyjob.h
  •   /libkleo/kleo/verifydetachedjob.h
  •   /libkleo/kleo/verifyopaquejob.h
  •   /libkleo/ui/cryptoconfigmodule.cpp
  •   /libkleo/ui/directoryserviceswidget.cpp
  •   /libkleo/ui/directoryserviceswidget.h
  •   /kleopatra/crypto/gui/resolverecipientspage.cpp
  •   /kleopatra/crypto/gui/resolverecipientspage.h
  •   /kleopatra/crypto/gui/resolverecipientspage_p.h
  •   /kleopatra/crypto/gui/resultitemwidget.cpp
  •   /kleopatra/crypto/gui/resultlistwidget.cpp
  •   /kleopatra/libkleopatraclient/core/CMakeLists.txt
  •   /kleopatra/libkleopatraclient/core/command.cpp
  •   /kleopatra/libkleopatraclient/core/command.h
  •   /kleopatra/libkleopatraclient/core/command_p.h
  •   /kleopatra/libkleopatraclient/core/signencryptfilescommand.h
  •   /kleopatra/tests/gnupg_home/dirmngr.conf
  •   /kleopatra/tests/gnupg_home/gpg.conf
  •   /kleopatra/tests/gnupg_home/pubring.gpg
  •   /kleopatra/tests/gnupg_home/pubring.kbx
  •   /kleopatra/tests/gnupg_home/secring.gpg
  •   /kleopatra/tests/gnupg_home/trustdb.gpg
  •   /libkleo/backends/chiasmus/obtainkeysjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmeadduseridjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmeadduseridjob.h
  •   /libkleo/backends/qgpgme/qgpgmebackend.cpp
  •   /libkleo/backends/qgpgme/qgpgmechangeexpiryjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmechangeexpiryjob.h
  •   /libkleo/backends/qgpgme/qgpgmechangeownertrustjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmechangeownertrustjob.h
  •   /libkleo/backends/qgpgme/qgpgmecryptoconfig.cpp
  •   /libkleo/backends/qgpgme/qgpgmecryptoconfig.h
  •   /libkleo/backends/qgpgme/qgpgmedecryptjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmedecryptjob.h
  •   /libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmedecryptverifyjob.h
  •   /libkleo/backends/qgpgme/qgpgmedeletejob.cpp
  •   /libkleo/backends/qgpgme/qgpgmedeletejob.h
  •   /libkleo/backends/qgpgme/qgpgmedownloadjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmedownloadjob.h
  •   /libkleo/backends/qgpgme/qgpgmeencryptjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmeencryptjob.h
  •   /libkleo/backends/qgpgme/qgpgmeexportjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmeimportjob.h
  •   /libkleo/backends/qgpgme/qgpgmejob.cpp
  •   /libkleo/backends/qgpgme/qgpgmejob.h
  •   /libkleo/backends/qgpgme/qgpgmekeygenerationjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmekeygenerationjob.h
  •   /libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmekeylistjob.h
  •   /libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  •   /libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.h
  •   /libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmesignencryptjob.h
  •   /libkleo/backends/qgpgme/qgpgmesignjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmesignjob.h
  •   /libkleo/backends/qgpgme/qgpgmesignkeyjob.cpp
  •   /libkleo/backends/qgpgme/qgpgmesignkeyjob.h
  •   /libkleo/backends/qgpgme/qgpgmeverifydetachedjob.cpp
  •   /libkleo/backends/qgpgme/threadedjobmixin.cpp
  •   /libkleo/backends/qgpgme/threadedjobmixin.h
245 files changed in total