From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Sep 2010 00:37:02 +0000
Subject: * 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
---
 certmanager/lib/ui/keyselectiondialog.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'certmanager/lib/ui/keyselectiondialog.h')

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
@@ -91,6 +91,15 @@ namespace Kleo {
 			bool rememberChoice=false,
                         TQWidget * parent=0, const char * name=0,
                         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,
@@ -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;
   };
-- 
cgit v1.2.1