[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-12-08 17:08:54
Message-ID: 20101208170854.43925AC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204684 by vkrause:

Use the identity manager from the mailcommon kernel. Fixes identity
changes getting lost when closing the application.


 M  +2 -8      identitypage.cpp  


--- trunk/KDE/kdepim/kmail/identitypage.cpp #1204683:1204684
@@ -31,6 +31,7 @@
 #include "globalsettings.h"
 #endif
 
+#include <mailcommon/mailkernel.h>
 #include <messageviewer/autoqpointer.h>
 #include <kpimidentities/identity.h>
 #include <kpimidentities/identitymanager.h>
@@ -49,11 +50,7 @@
 IdentityPage::IdentityPage( const KComponentData &instance, QWidget *parent )
   : ConfigModule( instance, parent ),
     mIdentityDialog( 0 ),
-#ifndef KCM_KPIMIDENTITIES_STANDALONE
-    mIdentityManager( KMKernel::self()->identityManager() )
-#else
-    mIdentityManager( new KPIMIdentities::IdentityManager )
-#endif
+    mIdentityManager( KernelIf->identityManager() )
 {
   mIPage.setupUi( this );
   mIPage.mIdentityList->setIdentityManager( mIdentityManager );
@@ -84,9 +81,6 @@
 
 IdentityPage::~IdentityPage()
 {
-#ifdef KCM_KPIMIDENTITIES_STANDALONE
-  delete mIdentityManager;
-#endif
 }
 
 void IdentityPage::load()
[prev in list] [next in list] [prev in thread] [next in thread]