From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson 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 --- kresources/lib/folderselectdialog.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'kresources/lib/folderselectdialog.cpp') diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp index 0942f8223..c4d343598 100644 --- a/kresources/lib/folderselectdialog.cpp +++ b/kresources/lib/folderselectdialog.cpp @@ -39,7 +39,7 @@ using namespace KPIM; FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& label, const TQStringList& list ) - : KDialogBase(0, 0, true, caption, Ok, Ok, true) + : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true) { TQFrame* frame = makeMainWidget(); TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() ); @@ -81,3 +81,8 @@ void FolderSelectDialog::closeEvent(TQCloseEvent *event) { event->ignore(); } + +void FolderSelectDialog::reject() +{ +} + -- cgit v1.2.1