Merged revisions 1075106 via svnmerge from

https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1075106 | winterz | 2010-01-15 10:00:24 -0500 (Fri, 15 Jan 2010) | 6 lines
  
  backport SVN commit 1075004 by mlaurent:
  
  Fix default value
  
  MERGE: e4,akonadi-ports (already in trunk and 4.4)
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=1075107

vacation.cpp

@@ -673,6 +673,7 @@ namespace KMail {
     mDialog->setMailAliases( defaultMailAliases().join(", ") );
     mDialog->setSendForSpam( defaultSendForSpam() );
     mDialog->setDomainName( defaultDomainName() );
+    mDialog->setDomainCheck( false );
   }
 
   void Vacation::slotDialogOk() {

vacationdialog.cpp

@@ -192,11 +192,23 @@ namespace KMail {
     }
   }
 
-  bool VacationDialog::sendForSpam() const {
+  bool VacationDialog::domainCheck() const
+  {
+    return mDomainCheck->isChecked();
+  }
+
+  void VacationDialog::setDomainCheck( bool check )
+  {
+    mDomainCheck->setChecked( check );
+  }
+
+  bool VacationDialog::sendForSpam() const
+  {
     return !mSpamCheck->isChecked();
   }
 
-  void VacationDialog::setSendForSpam( bool enable ) {
+  void VacationDialog::setSendForSpam( bool enable )
+  {
     mSpamCheck->setChecked( !enable );
   }
 

vacationdialog.h

@@ -47,6 +47,9 @@ namespace KMail {
     bool activateVacation() const;
     virtual void setActivateVacation( bool activate );
 
+    bool domainCheck() const;
+    virtual void setDomainCheck( bool check );
+
     QString messageText() const;
     virtual void setMessageText( const QString & text );