* 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, 3 insertions, 0 deletions

diff --git a/kresources/caldav/config.h b/kresources/caldav/config.h
index 746c87aca..780674281 100644
--- a/kresources/caldav/config.h
+++ b/kresources/caldav/config.h
@@ -51,6 +51,7 @@ public slots:
     virtual void saveSettings(KRES::Resource *resource);
 
     void slotSTasksToggled( bool );
+    void slotSJournalsToggled( bool );
 
 protected:
 
@@ -60,9 +61,11 @@ private:
 
     TQLineEdit *mUrl;
     TQLineEdit *mTasksUrl;
+    TQLineEdit *mJournalsUrl;
     TQLineEdit *mUsername;
     TQLineEdit *mPassword;
     TQCheckBox *mUseSTasks;
+    TQCheckBox *mUseSJournals;
     TQCheckBox *mRememberPassword;
     CalDavReloadConfig* mReloadConfig;
     CalDavSaveConfig* mSaveConfig;