Fix crash when we change folder size in kmail config

svn path=/branches/work/akonadi-ports/kdepim/; revision=1041263
wilder-work
Laurent Montel 17 years ago
parent dbc1ed1a0e
commit 94a9bf7f31
  1. 2
      aboutdata.cpp
  2. 9
      kmmainwidget.cpp

@ -114,7 +114,7 @@ namespace KMail {
"glaurent@telegraph-road.org", 0 }, "glaurent@telegraph-road.org", 0 },
{ "Sam Magnuson", 0, { "Sam Magnuson", 0,
"sam@trolltech.com", 0 }, "sam@trolltech.com", 0 },
{ "Laurent Montel", 0, { "Laurent Montel", I18N_NOOP( "Akonadi porting" ),
"montel@kde.org", 0 }, "montel@kde.org", 0 },
{ "Matt Newell", 0, { "Matt Newell", 0,
"newellm@proaxis.com", 0 }, "newellm@proaxis.com", 0 },

@ -227,10 +227,7 @@ K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
mGUIClient = aGUIClient; mGUIClient = aGUIClient;
mOpenedImapFolder = false; mOpenedImapFolder = false;
mCustomTemplateMenus = 0; mCustomTemplateMenus = 0;
mCollectionFolderView = new FolderSelectionTreeView( this, mGUIClient ); mCollectionFolderView = 0;
connect( mCollectionFolderView->folderTreeView(), SIGNAL( currentChanged( const Akonadi::Collection &) ), this, SLOT( slotFolderChanged( const Akonadi::Collection& ) ) );
connect( mCollectionFolderView->monitorFolders(), SIGNAL( collectionRemoved( const Akonadi::Collection &) ), this, SLOT( slotCollectionRemoved( const Akonadi::Collection& ) ) );
CollectionPropertiesDialog::useDefaultPage( false ); CollectionPropertiesDialog::useDefaultPage( false );
CollectionPropertiesDialog::registerPage( new CollectionGeneralPageFactory() ); CollectionPropertiesDialog::registerPage( new CollectionGeneralPageFactory() );
@ -877,6 +874,10 @@ void KMMainWidget::createWidgets()
// //
// Create header view and search bar // Create header view and search bar
// //
mCollectionFolderView = new FolderSelectionTreeView( this, mGUIClient );
connect( mCollectionFolderView->folderTreeView(), SIGNAL( currentChanged( const Akonadi::Collection &) ), this, SLOT( slotFolderChanged( const Akonadi::Collection& ) ) );
connect( mCollectionFolderView->monitorFolders(), SIGNAL( collectionRemoved( const Akonadi::Collection &) ), this, SLOT( slotCollectionRemoved( const Akonadi::Collection& ) ) );
mCollectionFolderView->setSelectionMode( QAbstractItemView::ExtendedSelection ); mCollectionFolderView->setSelectionMode( QAbstractItemView::ExtendedSelection );
const KConfigGroup cfg( KGlobal::config(), "CollectionFolderView" ); const KConfigGroup cfg( KGlobal::config(), "CollectionFolderView" );

Loading…
Cancel
Save