SVN_MERGE

Merged revisions 1074996,1075004 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

........
  r1074996 | mlaurent | 2010-01-15 11:01:12 +0100 (Fri, 15 Jan 2010) | 3 lines
  
  Fix enable/disable lineedit
  TODO need to backport to akonadi-port
........
  r1075004 | mlaurent | 2010-01-15 11:20:04 +0100 (Fri, 15 Jan 2010) | 3 lines
  
  Fix default value
  TODO: NEED TO MERGE IN AKONADI-PORT
........

svn path=/branches/work/akonadi-ports/kdepim/; revision=1075184

vacation.cpp

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

vacationdialog.cpp

@@ -195,6 +195,14 @@ namespace KMail {
     }
   }
 
+  bool VacationDialog::domainCheck() const {
+    return mDomainCheck->isChecked();
+  }
+
+  void VacationDialog::setDomainCheck( bool check ) {
+    mDomainCheck->setChecked( check );
+  }
+
   bool VacationDialog::sendForSpam() const {
     return !mSpamCheck->isChecked();
   }
@@ -207,7 +215,7 @@ namespace KMail {
   /* virtual*/
   void KMail::VacationDialog::enableDomainAndSendForSpam( bool enable ) {
       mDomainCheck->setEnabled( enable );
-      mDomainEdit->setEnabled( enable );
+      mDomainEdit->setEnabled( enable && mDomainCheck->isChecked() );
       mSpamCheck->setEnabled( enable );
   }
 

vacationdialog.h

@@ -46,6 +46,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 );