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

List:       kde-commits
Subject:    KDE/kdebase/workspace/systemsettings
From:       Ben Cooksley <sourtooth () gmail ! com>
Date:       2009-12-07 0:21:58
Message-ID: 1260145318.666886.20295.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1059577 by bcooksley:

This seems to fix it...
BUG: 217656

 M  +1 -3      core/ModuleView.cpp  
 M  +1 -1      icons/IconMode.cpp  


--- trunk/KDE/kdebase/workspace/systemsettings/core/ModuleView.cpp #1059576:1059577
@@ -245,16 +245,14 @@
 
 void ModuleView::closeModules()
 {
-    blockSignals(true);
     QMap<KPageWidgetItem*, KCModuleInfo*>::iterator page = d->mModules.begin();
     QMap<KPageWidgetItem*, KCModuleInfo*>::iterator pageEnd = d->mModules.end();
-    for ( page = d->mModules.begin(); page != pageEnd; ++page ) {
+    for ( ; page != pageEnd; ++page ) {
         d->mPageWidget->removePage( page.key() );
     }
 
     d->mPages.clear();
     d->mModules.clear();
-    blockSignals(false);
 }
 
 bool ModuleView::moduleSave()
--- trunk/KDE/kdebase/workspace/systemsettings/icons/IconMode.cpp #1059576:1059577
@@ -149,8 +149,8 @@
 void IconMode::backToOverview()
 {
     if( d->moduleView->resolveChanges() ) {
+        d->mainWidget->setCurrentWidget( d->iconWidget );
         d->moduleView->closeModules();
-        d->iconWidget->show();
         d->mainWidget->setCurrentWidget( d->iconWidget );
         d->backAction->setEnabled( false );
         emit changeToolBarItems( BaseMode::Search | BaseMode::Configure );
[prev in list] [next in list] [prev in thread] [next in thread]