From 13108dbc1a2a30548c7c3cd448c6d41501f34bbc Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@kde.org>
Date: Thu, 9 Jan 2003 08:57:57 +0000
Subject: [PATCH] OK, here's the deal - a vast majority wants forwarding as
 inline as default - so make it a default. Simple as that. Email standards are
 nice if they make it ease for people to communicate not the other way around
 (oh, I feel I'm gonna get a savage beating for that one :) )

svn path=/trunk/kdenetwork/kmail/; revision=198440
---
 configuredialog.cpp |  8 ++++----
 kmmainwidget.cpp    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configuredialog.cpp b/configuredialog.cpp
index 35ef2a1ab..c4141f727 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -272,7 +272,7 @@ void ConfigureDialog::apply( bool everything ) {
     // loop through the rest:
     for ( QPtrListIterator<ConfigurationPage> it( mPages ) ; it.current() ; ++it )
       if ( it.current() != mPageWithProfiles )
-	it.current()->apply();
+        it.current()->apply();
   }
 
   //
@@ -4048,7 +4048,7 @@ GroupwarePage::GroupwarePage( QWidget * parent, const char * name )
 
   mLegacyMangleFromTo = new QCheckBox( i18n( "Legac&y mode: Mangle From:/To: headers in replies to invitations" ), mBox );
   QToolTip::add( mLegacyMangleFromTo, i18n( "Turn this option on in order to make Outlook(tm) understand your answers to invitations" ) );
-  
+
   QLabel* dummy = new QLabel( this );
   vlay->addWidget( dummy, 2 );
 }
@@ -4070,7 +4070,7 @@ void GroupwarePage::setup()
 
   mAutoResCB->setChecked( options.readBoolEntry( "AutoAccept", false ) );
   mAutoDeclConflCB->setChecked( options.readBoolEntry( "AutoDeclConflict", false ) );
-  
+
   mLegacyMangleFromTo->setChecked( options.readBoolEntry( "LegacyMangleFromToHeaders", false ) );
 }
 
@@ -4089,7 +4089,7 @@ void GroupwarePage::apply()
   options.writeEntry( "AutoAccept", mAutoResCB->isChecked() );
   options.writeEntry( "AutoDeclConflict", mAutoDeclConflCB->isChecked() );
   options.writeEntry( "LegacyMangleFromToHeaders", mLegacyMangleFromTo->isChecked() );
-  
+
 #if 0
   kernel->groupware().readConfig();
 #endif
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 3a7e0491e..2529699fb 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -1999,7 +1999,7 @@ void KMMainWidget::setupActions()
 					"mail_forward", mActionCollection,
 					"message_forward" );
   connect( mForwardActionMenu, SIGNAL(activated()), this,
-	   SLOT(slotForwardAttachedMsg()) );
+	   SLOT(slotForwardMsg()) );
   mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
 				       "mail_forward", Key_F, this,
 					SLOT(slotForwardAttachedMsg()), mActionCollection,
@@ -2843,14 +2843,14 @@ void KMMainWidget::slotSubscriptionDialog()
 
   if (mFolder->protocol() == "imap")
   {
-    SubscriptionDialog * dialog = new SubscriptionDialog(this, 
-        i18n("Subscription"), 
+    SubscriptionDialog * dialog = new SubscriptionDialog(this,
+        i18n("Subscription"),
         static_cast<KMFolderImap*>(mFolder)->account());
     dialog->show();
   } else if (mFolder->protocol() == "cachedimap")
   {
-    SubscriptionDialog * dialog = new SubscriptionDialog(this, 
-        i18n("Subscription"), 
+    SubscriptionDialog * dialog = new SubscriptionDialog(this,
+        i18n("Subscription"),
         static_cast<KMFolderCachedImap*>(mFolder)->account());
     dialog->show();
   }