print fix

1 files changed, 5 insertions, 1 deletions

diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 764c495..292951b 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -800,208 +800,212 @@ void KDEPIMConfigWidget::updateClientWidgets()
        enabled = false;
 	 }
 	 else
 	 {
        enabled = true;
 	 }
 
 
   mChannel->setReadOnly(readonly);
   mMessage->setReadOnly(readonly);
   mParameters->setReadOnly(readonly); 
   if ( mMessage2 )
   mMessage2->setReadOnly(readonly);
     if ( mParameters2 )
   mParameters2->setReadOnly(readonly);
 
   mChannel->setEnabled(enabled);
   mMessage->setEnabled(enabled);
   mParameters->setEnabled(enabled);
   if ( mMessage2 )
   mMessage2->setEnabled(enabled);
     if ( mParameters2 )
   mParameters2->setEnabled(enabled);
 
 
 
   mClient->setCurrentItem(mCurrentClient);
 
 
   // enable/disable the extra message/parameter field
   if (mCurrentApp == ExternalAppHandler::EMAIL)
   {
   }
   else
   {
   if ( mMessage2 )
     mMessage2->setText( "" );
     if ( mParameters2 )
     mParameters2->setText( "" );
   }
 
   if (enabled == true) {
   if ( mMessage2 )
     mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
     if ( mParameters2 )
     mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
   }
 
 
   blockSignals( blocked );
 
 }
 
 void KDEPIMConfigWidget::usrReadConfig()
 {
   KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance();
 
   bool blocked = signalsBlocked();
   blockSignals( true );
 
   if (KPimGlobalPrefs::instance()->mBackupUseDefaultDir )
       mBackupUrl->setURL( KGlobalSettings::backupDataDir() );
   else {
       mBackupUrl->setURL(prefs->mBackupDatadir);
 
   }
   mBackupNumbersSpin->setValue( prefs->mBackupNumbers );
   mBackupDayCountSpin->setValue( prefs->mBackupDayCount);
 
   QString dummy = prefs->mUserDateFormatLong;
   mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") ));
   dummy = prefs->mUserDateFormatShort;
   mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") ));
 
   QDate current ( 2001, 1,1);
   mStartDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingStart-1));
   mEndDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingEnd-1));
   setCombo(mTimeZoneCombo,i18n(prefs->mTimeZoneId));
 
   mEmailClient = prefs->mEmailClient;
   mEmailOtherChannel = prefs->mEmailOtherChannel;
   mEmailOtherMessage = prefs->mEmailOtherMessage;
   mEmailOtherMessageParameters = prefs->mEmailOtherMessageParameters;
   mEmailOtherMessage2 = prefs->mEmailOtherMessage2;
   mEmailOtherMessageParameters2 = prefs->mEmailOtherMessageParameters2;
 
   mPhoneClient = prefs->mPhoneClient;
   mPhoneOtherChannel = prefs->mPhoneOtherChannel;
   mPhoneOtherMessage = prefs->mPhoneOtherMessage;
   mPhoneOtherMessageParameters = prefs->mPhoneOtherMessageParameters;
 
   mFaxClient = prefs->mFaxClient;
   mFaxOtherChannel = prefs->mFaxOtherChannel;
   mFaxOtherMessage = prefs->mFaxOtherMessage;
   mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters;
 
   mSMSClient = prefs->mSMSClient;
   mSMSOtherChannel = prefs->mSMSOtherChannel;
   mSMSOtherMessage = prefs->mSMSOtherMessage;
   mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters;
 
   mPagerClient = prefs->mPagerClient;
   mPagerOtherChannel = prefs->mPagerOtherChannel;
   mPagerOtherMessage = prefs->mPagerOtherMessage;
   mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters;
 
   mSipClient = prefs->mSipClient;
   mSipOtherChannel = prefs->mSipOtherChannel;
   mSipOtherMessage = prefs->mSipOtherMessage;
   mSipOtherMessageParameters = prefs->mSipOtherMessageParameters;
 
   mCurrentApp = ExternalAppHandler::EMAIL;
   mCurrentClient = mEmailClient;
 
   updateClientWidgets();
 
   blockSignals( blocked );
 
 }
 
 void KDEPIMConfigWidget::usrWriteConfig()
 {
   KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance();
 
   saveEditFieldSettings();
 
   prefs->mBackupNumbers  = mBackupNumbersSpin->value();
   prefs->mBackupDayCount = mBackupDayCountSpin->value();
-  prefs->mBackupDatadir = mBackupUrl->url();
+  QString bup_url = mBackupUrl->url();
+  if ( bup_url.right(1) != "/" && bup_url.right(1) != "\\" )
+    bup_url += "/";
+
+  prefs->mBackupDatadir = bup_url;
 
   prefs->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") );
   prefs->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") );
 
   prefs->mTimeZoneId = mTimeZoneCombo->currentText();
   QDate date;
   date = mStartDateSavingEdit->date();
   int sub = 0;
   if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 )
       sub = 1;
   prefs->mDaylightsavingStart = date.dayOfYear()-sub;
   date = mEndDateSavingEdit->date();
   if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59  )
       sub = 1;
   else 
       sub = 0;
   prefs->mDaylightsavingEnd = date.dayOfYear()-sub;
 
 
   prefs->mEmailClient = mEmailClient;
   prefs->mEmailOtherChannel = mEmailOtherChannel;
   prefs->mEmailOtherMessage = mEmailOtherMessage;
   prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters;
   prefs->mEmailOtherMessage2 = mEmailOtherMessage2;
   prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2;
 
   prefs->mPhoneClient = mPhoneClient;
   prefs->mPhoneOtherChannel = mPhoneOtherChannel;
   prefs->mPhoneOtherMessage = mPhoneOtherMessage;
   prefs->mPhoneOtherMessageParameters = mPhoneOtherMessageParameters;
 
   prefs->mFaxClient = mFaxClient;
   prefs->mFaxOtherChannel = mFaxOtherChannel;
   prefs->mFaxOtherMessage = mFaxOtherMessage;
   prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters;
 
   prefs->mSMSClient = mSMSClient;
   prefs->mSMSOtherChannel = mSMSOtherChannel;
   prefs->mSMSOtherMessage = mSMSOtherMessage;
   prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters;
 
   prefs->mPagerClient = mPagerClient;
   prefs->mPagerOtherChannel = mPagerOtherChannel;
   prefs->mPagerOtherMessage = mPagerOtherMessage;
   prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters;
 
 
   prefs->mSipClient = mSipClient;
   prefs->mSipOtherChannel = mSipOtherChannel;
   prefs->mSipOtherMessage = mSipOtherMessage;
   prefs->mSipOtherMessageParameters = mSipOtherMessageParameters;
 
   //release the cache that other views can access the changed values instantanious
   ExternalAppHandler::instance()->loadConfig();
   KPimGlobalPrefs::instance()->setGlobalConfig();
 }
 
 
 void KDEPIMConfigWidget::setCombo(QComboBox *combo, const QString & text,
                                const QStringList *tags)
 {
   if (tags) {
     int i = tags->findIndex(text);
     if (i > 0) combo->setCurrentItem(i);
   } else {
     for(int i=0;i<combo->count();++i) {
       if (combo->text(i) == text) {
         combo->setCurrentItem(i);
         break;
       }
     }
   }
 }
 
 
 void KDEPIMConfigWidget::textChanged( const QString& text )
 {
   emit changed( true );
 }