* 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, 5 insertions, 2 deletions

diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h
index 2ce076ff6..a971b1182 100644
--- a/kmail/vacationdialog.h
+++ b/kmail/vacationdialog.h
@@ -46,6 +46,9 @@ namespace KMail {
     bool activateVacation() const;
     virtual void setActivateVacation( bool activate );
 
+    bool domainCheck() const;
+    virtual void setDomainCheck( bool check );
+
     TQString messageText() const;
     virtual void setMessageText( const TQString & text );
 
@@ -55,14 +58,14 @@ namespace KMail {
     KMime::Types::AddrSpecList mailAliases() const;
     virtual void setMailAliases( const KMime::Types::AddrSpecList & aliases );
     virtual void setMailAliases( const TQString & aliases );
- 
+
     TQString domainName() const;
     virtual void setDomainName( const TQString & domain );
 
     bool sendForSpam() const;
     virtual void setSendForSpam( bool enable );
 
-    
+
   private slots:
     void slotIntervalSpinChanged( int value );