diff -r 822a45792fdd -r e1d68407ed06 wlanutilities/wlanwizard/src/wlanwizard_p.cpp --- a/wlanutilities/wlanwizard/src/wlanwizard_p.cpp Fri Sep 03 09:37:37 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizard_p.cpp Thu Sep 16 12:52:33 2010 +0300 @@ -786,6 +786,10 @@ "WlanWizardPrivate::previousTriggered;this=%x", this); + // Disconnect signals from any actions until we are finished + // processing this one + disconnectActions(); + mPageTimer->stop(); int index = mStackedWidget->currentIndex(); @@ -810,6 +814,9 @@ // returned, in this case default value for int is 0 which means PageNone. updateFrame(mPages.key(page)); enableNextButton(page->showPage()); + + // Reconnect signals from actions + connectActions(); OstTrace1( TRACE_BORDER, @@ -834,6 +841,10 @@ "WlanWizardPrivate::nextTriggered;this=%x", this); + // Disconnect signals from any actions until we are finished + // processing this one + disconnectActions(); + mPageTimer->stop(); HbWidget *widget = qobject_cast(mStackedWidget->currentWidget()); @@ -843,6 +854,9 @@ int pageId = mPageMapper[widget]->nextId(removeFromStack); showPage(pageId, removeFromStack); + // Reconnect signals from actions + connectActions(); + OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_NEXTTRIGGERED_DONE, @@ -1228,7 +1242,22 @@ ok = connect(mPageTimer, SIGNAL(timeout()), this, SLOT(onTimeOut())); Q_ASSERT(ok); - ok = connect( + connectActions(); + + ok = HbStyleLoader::registerFilePath(":/css/custom.css"); + Q_ASSERT(ok); + + OstTraceFunctionExit0(WLANWIZARDPRIVATE_LOADDOCML_EXIT); +} + +/*! + Connect triggered() signals from all toolbar actions. + */ +void WlanWizardPrivate::connectActions() +{ + OstTraceFunctionEntry0(WLANWIZARDPRIVATE_CONNECTACTIONS_ENTRY); + + bool ok = connect( mActionNext, SIGNAL(triggered()), this, @@ -1248,18 +1277,15 @@ this, SLOT(finishTriggered())); Q_ASSERT(ok); - - ok = connect( + + ok =connect( mActionCancel, SIGNAL(triggered()), this, SLOT(cancelTriggered())); Q_ASSERT(ok); - - ok = HbStyleLoader::registerFilePath(":/css/custom.css"); - Q_ASSERT(ok); - - OstTraceFunctionExit0(WLANWIZARDPRIVATE_LOADDOCML_EXIT); + + OstTraceFunctionExit0(WLANWIZARDPRIVATE_CONNECTACTIONS_EXIT); } /*!