From cc0e4e17fed98c990d319bae4aa5987515b8c5d4 Mon Sep 17 00:00:00 2001
From: Allen Winter <winter@kde.org>
Date: Thu, 2 Apr 2009 15:08:41 +0000
Subject: [PATCH] Merged revisions 947478 via svnmerge from
 https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r947478 | mlaurent | 2009-03-31 11:30:23 -0400 (Tue, 31 Mar 2009) | 2 lines

  Fix kolab issue 2687
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=948213
---
 kmheaders.h  | 6 +++---
 kmkernel.cpp | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/kmheaders.h b/kmheaders.h
index 092e19cf1..35427687c 100644
--- a/kmheaders.h
+++ b/kmheaders.h
@@ -206,6 +206,9 @@ public:
   */
   bool isMessageCut( quint32 serNum ) const;
 
+  /** Write global config options. */
+  virtual void writeConfig(void);
+
 signals:
   /** emitted when the list view item corresponding to this message
       has been selected */
@@ -329,9 +332,6 @@ protected:
   /** Write per-folder config options. */
   virtual void writeFolderConfig(void);
 
-  /** Write global config options. */
-  virtual void writeConfig(void);
-
   /** Handle shift and control selection */
   virtual void contentsMousePressEvent(QMouseEvent*);
   virtual void contentsMouseReleaseEvent(QMouseEvent* e);
diff --git a/kmkernel.cpp b/kmkernel.cpp
index c4b805e09..c5d9543c3 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -16,6 +16,7 @@ using KPIM::BroadcastStatus;
 #include "kmacctcachedimap.h"
 #include "kmfiltermgr.h"
 #include "kmfilteraction.h"
+#include "kmheaders.h"
 #define REALLY_WANT_KMSENDER
 #include "kmsender.h"
 #undef REALLY_WANT_KMSENDER
@@ -1918,8 +1919,8 @@ void KMKernel::slotShowConfigurationDialog()
     win->show();
 
   }
-
-  if( mConfigureDialog->isHidden() ) {
+  if ( mConfigureDialog->isHidden() ) {
+    getKMMainWidget()->headers()->writeConfig();
     mConfigureDialog->show();
   } else {
     mConfigureDialog->raise();