* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 14 insertions, 1 deletions

diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index fd8f67394..ab8dc756d 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -93,6 +93,15 @@ namespace Kleo {
                         bool modal=true );
     KeySelectionDialog( const TQString & title,
                         const TQString & text,
+                        const TQString & initialPattern,
+			const std::vector<GpgME::Key> & selectedKeys,
+                        unsigned int keyUsage=AllKeys,
+                        bool extendedSelection=false,
+			bool rememberChoice=false,
+                        TQWidget * parent=0, const char * name=0,
+                        bool modal=true );
+    KeySelectionDialog( const TQString & title,
+                        const TQString & text,
 			const TQString & initialPattern,
                         unsigned int keyUsage=AllKeys,
                         bool extendedSelection=false,
@@ -129,7 +138,10 @@ namespace Kleo {
 
   private slots:
     void slotRereadKeys();
-    void slotStartCertificateManager();
+    void slotStartCertificateManager( const TQString &query = TQString() );
+    void slotStartSearchForExternalCertificates() {
+      slotStartCertificateManager( mInitialQuery );
+    }
     void slotKeyListResult( const GpgME::KeyListResult & );
     void slotSelectionChanged();
     void slotCheckSelection() { slotCheckSelection( 0 ); }
@@ -170,6 +182,7 @@ namespace Kleo {
     TQTimer * mStartSearchTimer;
     // cross-eventloop temporaries:
     TQString mSearchText;
+    const TQString mInitialQuery;
     Kleo::KeyListViewItem * mCurrentContextMenuItem;
     int mTruncated, mListJobCount, mSavedOffsetY;
   };