| author | drw <drw> | 2003-04-26 23:11:13 (UTC) |
|---|---|---|
| committer | drw <drw> | 2003-04-26 23:11:13 (UTC) |
| commit | 77bed0e99aa0c912e5d86f257131c1f93afcee77 (patch) (side-by-side diff) | |
| tree | c9ecc864e802a395c066bfb7d345e16dc1fc0968 /noncore/settings | |
| parent | 98a9291263e167b8882ac916330e7215ebd884b4 (diff) | |
| download | opie-77bed0e99aa0c912e5d86f257131c1f93afcee77.zip opie-77bed0e99aa0c912e5d86f257131c1f93afcee77.tar.gz opie-77bed0e99aa0c912e5d86f257131c1f93afcee77.tar.bz2 | |
Fix for bug #887 - do not perform documents update when doing a 'ipkg update'
| -rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 19 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/mainwin.h | 1 |
2 files changed, 14 insertions, 6 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 58f6feb..f0e8e48 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp @@ -757,4 +757,5 @@ void MainWindow :: updateServer() tr( "Update lists" ) ); connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); + reloadDocuments = FALSE; stack->addWidget( dlg, 3 ); stack->raiseWidget( dlg ); @@ -787,4 +788,5 @@ void MainWindow :: upgradePackages() tr ( "Upgrade" ) ); connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); + reloadDocuments = TRUE; stack->addWidget( dlg, 3 ); stack->raiseWidget( dlg ); @@ -929,4 +931,5 @@ void MainWindow :: downloadRemotePackage() InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Download" ) ); connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); + reloadDocuments = TRUE; stack->addWidget( dlg, 3 ); stack->raiseWidget( dlg ); @@ -968,4 +971,5 @@ void MainWindow :: applyChanges() InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Apply changes" ) ); connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); + reloadDocuments = TRUE; stack->addWidget( dlg, 3 ); stack->raiseWidget( dlg ); @@ -1107,10 +1111,13 @@ void MainWindow :: reloadData( InstallDlgImpl *dlg ) #ifdef QWS - m_status->setText( tr( "Updating Launcher..." ) ); - - // Finally let the main system update itself - QCopEnvelope e("QPE/System", "linkChanged(QString)"); - QString lf = QString::null; - e << lf; + if ( reloadDocuments ) + { + m_status->setText( tr( "Updating Launcher..." ) ); + + // Finally let the main system update itself + QCopEnvelope e("QPE/System", "linkChanged(QString)"); + QString lf = QString::null; + e << lf; + } #endif diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h index c4548b1..f95c332 100644 --- a/noncore/settings/aqpkg/mainwin.h +++ b/noncore/settings/aqpkg/mainwin.h @@ -89,4 +89,5 @@ private: bool showUpgradedPkgs; bool downloadEnabled; + bool reloadDocuments; void initMainWidget(); |