yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the crash when clicking twice on configure layout in kcmtabbox.

Browse source 
BUG: 208301

svn path=/trunk/KDE/kdebase/workspace/; revision=1042347
This commit is contained in:
Martin Gräßlin 2009-10-29 17:03:12 +00:00
parent 93ac3e14e3
commit ed92917ebb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcmkwin/kwintabbox/main.cpp
View file

@ -70,8 +70,6 @@ KWinTabBoxConfig::KWinTabBoxConfig( QWidget* parent, const QVariantList& args )
layout->addWidget( infoLabel ); layout->addWidget( infoLabel );
layout->addWidget( tabWidget ); layout->addWidget( tabWidget );
m_configForm = new TabBox::LayoutConfig();
m_editor = new KShortcutsEditor( m_primaryTabBoxUi, KShortcutsEditor::GlobalAction ); m_editor = new KShortcutsEditor( m_primaryTabBoxUi, KShortcutsEditor::GlobalAction );
// Shortcut config. The shortcut belongs to the component "kwin"! // Shortcut config. The shortcut belongs to the component "kwin"!
m_actionCollection = new KActionCollection( this, KComponentData("kwin") ); m_actionCollection = new KActionCollection( this, KComponentData("kwin") );
@ -590,6 +588,7 @@ void KWinTabBoxConfig::slotConfigureLayoutClicked()
dialog->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default ); dialog->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
connect( dialog, SIGNAL(okClicked()), this, SLOT(slotLayoutChanged())); connect( dialog, SIGNAL(okClicked()), this, SLOT(slotLayoutChanged()));
m_configForm = new TabBox::LayoutConfig( dialog );
m_configForm->setConfig( m_tabBoxConfig ); m_configForm->setConfig( m_tabBoxConfig );
dialog->setMainWidget( m_configForm ); dialog->setMainWidget( m_configForm );
@ -610,6 +609,7 @@ void KWinTabBoxConfig::slotConfigureLayoutClickedAlternative()
dialog->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default ); dialog->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
connect( dialog, SIGNAL(okClicked()), this, SLOT(slotLayoutChangedAlternative())); connect( dialog, SIGNAL(okClicked()), this, SLOT(slotLayoutChangedAlternative()));
m_configForm = new TabBox::LayoutConfig( dialog );
m_configForm->setConfig( m_tabBoxAlternativeConfig ); m_configForm->setConfig( m_tabBoxAlternativeConfig );
dialog->setMainWidget( m_configForm ); dialog->setMainWidget( m_configForm );