Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts: akonadiconsole/agentconfigmodel.h blogilo/src/composer/dialogs/addmediadialog.cpp
13 years ago · 8ed712c7e4
parent c2c2c2f88a 87c3490281
commit 8ed712c7e4
1 changed files with 1 additions and 0 deletions
--- a/identitypage.cpp
+++ b/identitypage.cpp
@ -49,6 +49,7 @@ QString IdentityPage::helpAnchor() const
 IdentityPage::IdentityPage( const KComponentData &instance, QWidget *parent )
  : ConfigModule( instance, parent ),
    mIdentityDialog( 0 ),
+    mOldNumberOfIdentities( 0 ),
    mIdentityManager( 0 )
 {
  if ( !MailCommon::Kernel::self()->kernelIsRegistered() ) {