Fix for bug #887 - do not perform documents update when doing a 'ipkg update'

2 files changed, 8 insertions, 0 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
@@ -755,8 +755,9 @@ void MainWindow :: updateServer()
 
     InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Refreshing server package lists" ),
                                               tr( "Update lists" ) );
     connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
+        reloadDocuments = FALSE;
     stack->addWidget( dlg, 3 );
     stack->raiseWidget( dlg );
 
 //  delete progDlg;
@@ -785,8 +786,9 @@ void MainWindow :: upgradePackages()
 
         InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Upgrading installed packages" ),
                                                   tr ( "Upgrade" ) );
         connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
+                reloadDocuments = TRUE;
         stack->addWidget( dlg, 3 );
         stack->raiseWidget( dlg );
     }
 }
@@ -927,8 +929,9 @@ void MainWindow :: downloadRemotePackage()
     workingPackages.append( item );
 
     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 );
 }
 
@@ -966,8 +969,9 @@ void MainWindow :: applyChanges()
 
     // do the stuff
     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 );
 }
 
@@ -1105,14 +1109,17 @@ void MainWindow :: reloadData( InstallDlgImpl *dlg )
     mgr->reloadServerData();
     serverSelected( -1, FALSE );
 
 #ifdef QWS
+    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
 
     stack->raiseWidget( networkPkgWindow );
 }
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
@@ -87,8 +87,9 @@ private:
     bool showUninstalledPkgs;
     bool showInstalledPkgs;
     bool showUpgradedPkgs;
     bool downloadEnabled;
+        bool reloadDocuments;
 
     void initMainWidget();
     void updateData();
     void serverSelected( int index, bool showProgress );