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

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
@@ -758,2 +758,3 @@ void MainWindow :: updateServer()
     connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
+        reloadDocuments = FALSE;
     stack->addWidget( dlg, 3 );
@@ -788,2 +789,3 @@ void MainWindow :: upgradePackages()
         connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
+                reloadDocuments = TRUE;
         stack->addWidget( dlg, 3 );
@@ -930,2 +932,3 @@ void MainWindow :: downloadRemotePackage()
     connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
+        reloadDocuments = TRUE;
     stack->addWidget( dlg, 3 );
@@ -969,2 +972,3 @@ void MainWindow :: applyChanges()
     connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
+        reloadDocuments = TRUE;
     stack->addWidget( dlg, 3 );
@@ -1108,8 +1112,11 @@ 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
@@ -90,2 +90,3 @@ private:
     bool downloadEnabled;
+        bool reloadDocuments;