From 06674b5480da404d7a9b28738ea595430c234180 Mon Sep 17 00:00:00 2001
From: Till Adam <adam@kde.org>
Date: Sun, 9 Jan 2005 00:05:51 +0000
Subject: [PATCH] and the rest of the updating fix

svn path=/trunk/kdepim/; revision=376673
---
 kmmainwidget.cpp | 42 +++++++++++++++++++++++++-----------------
 kmmainwidget.h   |  2 ++
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 4cc5f61e7..341577934 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -352,7 +352,8 @@ void KMMainWidget::readConfig(void)
 
   if (mMsgView)
     mMsgView->readConfig();
-  slotSetEncoding();
+
+  readCurrentOverrideCodec();
 
   mHeaders->readConfig();
   mHeaders->restoreLayout(KMKernel::config(), "Header-Geometry");
@@ -675,7 +676,7 @@ void KMMainWidget::activatePanners(void)
 void KMMainWidget::slotSetEncoding()
 {
   GlobalSettings::setOverrideCharacterEncoding( 
-      KGlobal::charsets()->encodingForName( mEncoding->currentText()).latin1() );
+      KGlobal::charsets()->encodingForName( mEncoding->currentText() ) );
     if (mEncoding->currentItem() == 0) // Auto
     {
       mCodec = 0;
@@ -2375,22 +2376,8 @@ void KMMainWidget::setupActions()
   //----- Message-Encoding Submenu
   mEncoding = new KSelectAction( i18n( "&Set Encoding" ), "charset", 0, this,
 		      SLOT( slotSetEncoding() ), actionCollection(), "encoding" );
-  QStringList encodings = KMMsgBase::supportedEncodings(FALSE);
-  encodings.prepend( i18n( "Auto" ) );
-  mEncoding->setItems( encodings );
-  mEncoding->setCurrentItem(0);
 
-  QStringList::Iterator it;
-  int i = 0;
-  for( it = encodings.begin(); it != encodings.end(); ++it)
-  {
-    if ( KGlobal::charsets()->encodingForName(*it ) == GlobalSettings::overrideCharacterEncoding() )
-    {
-      mEncoding->setCurrentItem( i );
-      break;
-    }
-    i++;
-  }
+  readCurrentOverrideCodec();
 
   mEditAction = new KAction( i18n("&Edit Message"), "edit", Key_T, this,
                             SLOT(slotEditMsg()), actionCollection(), "edit" );
@@ -2724,6 +2711,27 @@ void KMMainWidget::setupActions()
   updateMessageActions();
 }
 
+void KMMainWidget::readCurrentOverrideCodec()
+{
+  QStringList encodings = KMMsgBase::supportedEncodings( false );
+  encodings.prepend( i18n( "Auto" ) );
+  mEncoding->setItems( encodings );
+  mEncoding->setCurrentItem(0);
+  QStringList::ConstIterator it( encodings.begin() );
+  QStringList::ConstIterator end( encodings.end() );
+  int i = 0;
+  for( ; it != end; ++it)
+  {
+    if ( KGlobal::charsets()->encodingForName(*it ) == GlobalSettings::overrideCharacterEncoding() )
+    {
+      mEncoding->setCurrentItem( i );
+      break;
+    }
+    i++;
+  }
+}
+
+
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotEditNotifications()
 {
diff --git a/kmmainwidget.h b/kmmainwidget.h
index 667be6da5..878b89643 100644
--- a/kmmainwidget.h
+++ b/kmmainwidget.h
@@ -145,6 +145,8 @@ public:
 
   void modifyFolder( KMFolderTreeItem* folderItem );
 
+  void readCurrentOverrideCodec();
+
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);
   void slotTrashMsg();   // move to trash