Make sure that the kmail config is reloaded when the kcms signal that

things changed, even from the part, which means from inside Kontact.

svn path=/branches/KDE/3.5/kdepim/; revision=490368
wilder-work
Till Adam 21 years ago
parent 192378c477
commit a6f10ac2fa
  1. 16
      kmail_part.cpp
  2. 2
      kmail_part.h

@ -50,6 +50,8 @@ using KRecentAddress::RecentAddresses;
#include <dcopclient.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <ksettings/dispatcher.h>
#include <qlayout.h>
@ -82,15 +84,15 @@ KMailPart::KMailPart(QWidget *parentWidget, const char *widgetName,
kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
//local, do the init
KMKernel *kmailKernel = new KMKernel();
kmailKernel->init();
kmailKernel->setXmlGuiInstance( KMailFactory::instance() );
KMKernel *mKMailKernel = new KMKernel();
mKMailKernel->init();
mKMailKernel->setXmlGuiInstance( KMailFactory::instance() );
// and session management
kmailKernel->doSessionManagement();
mKMailKernel->doSessionManagement();
// any dead letters?
kmailKernel->recoverDeadLetters();
mKMailKernel->recoverDeadLetters();
kmsetSignalHandler(kmsignalHandler);
kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
@ -141,6 +143,9 @@ KMailPart::KMailPart(QWidget *parentWidget, const char *widgetName,
KGlobal::iconLoader()->addAppDir( "kmail" );
setXMLFile( "kmail_part.rc" );
#endif
KSettings::Dispatcher::self()->registerInstance( KMailFactory::instance(), mKMailKernel,
SLOT( slotConfigChanged() ) );
}
KMailPart::~KMailPart()
@ -237,6 +242,5 @@ KMainWindow * KMailStatusBarExtension::mainWindow() const
return static_cast<KMainWindow*>( mParent->parentWidget() );
}
#include "kmail_part.moc"

@ -78,7 +78,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
virtual void guiActivateEvent(KParts::GUIActivateEvent *e);
private:
KMKernel *kmailKernel;
KMKernel *mKMailKernel;
KMMainWidget *mainWidget;
ActionManager *mActionManager;
KMailStatusBarExtension *mStatusBar;

Loading…
Cancel
Save