author | drw <drw> | 2003-04-26 23:11:13 (UTC) |
---|---|---|
committer | drw <drw> | 2003-04-26 23:11:13 (UTC) |
commit | 77bed0e99aa0c912e5d86f257131c1f93afcee77 (patch) (unidiff) | |
tree | c9ecc864e802a395c066bfb7d345e16dc1fc0968 /noncore/settings/aqpkg/mainwin.cpp | |
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'
Diffstat (limited to 'noncore/settings/aqpkg/mainwin.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 7 |
1 files changed, 7 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 | |||
@@ -753,12 +753,13 @@ void MainWindow :: updateServer() | |||
753 | Ipkg *ipkg = new Ipkg; | 753 | Ipkg *ipkg = new Ipkg; |
754 | ipkg->setOption( "update" ); | 754 | ipkg->setOption( "update" ); |
755 | 755 | ||
756 | InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Refreshing server package lists" ), | 756 | InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Refreshing server package lists" ), |
757 | tr( "Update lists" ) ); | 757 | tr( "Update lists" ) ); |
758 | connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); | 758 | connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); |
759 | reloadDocuments = FALSE; | ||
759 | stack->addWidget( dlg, 3 ); | 760 | stack->addWidget( dlg, 3 ); |
760 | stack->raiseWidget( dlg ); | 761 | stack->raiseWidget( dlg ); |
761 | 762 | ||
762 | // delete progDlg; | 763 | // delete progDlg; |
763 | } | 764 | } |
764 | 765 | ||
@@ -783,12 +784,13 @@ void MainWindow :: upgradePackages() | |||
783 | Ipkg *ipkg = new Ipkg; | 784 | Ipkg *ipkg = new Ipkg; |
784 | ipkg->setOption( "upgrade" ); | 785 | ipkg->setOption( "upgrade" ); |
785 | 786 | ||
786 | InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Upgrading installed packages" ), | 787 | InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Upgrading installed packages" ), |
787 | tr ( "Upgrade" ) ); | 788 | tr ( "Upgrade" ) ); |
788 | connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); | 789 | connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); |
790 | reloadDocuments = TRUE; | ||
789 | stack->addWidget( dlg, 3 ); | 791 | stack->addWidget( dlg, 3 ); |
790 | stack->raiseWidget( dlg ); | 792 | stack->raiseWidget( dlg ); |
791 | } | 793 | } |
792 | } | 794 | } |
793 | 795 | ||
794 | void MainWindow :: downloadPackage() | 796 | void MainWindow :: downloadPackage() |
@@ -925,12 +927,13 @@ void MainWindow :: downloadRemotePackage() | |||
925 | QList<InstallData> workingPackages; | 927 | QList<InstallData> workingPackages; |
926 | workingPackages.setAutoDelete( TRUE ); | 928 | workingPackages.setAutoDelete( TRUE ); |
927 | workingPackages.append( item ); | 929 | workingPackages.append( item ); |
928 | 930 | ||
929 | InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Download" ) ); | 931 | InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Download" ) ); |
930 | connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); | 932 | connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); |
933 | reloadDocuments = TRUE; | ||
931 | stack->addWidget( dlg, 3 ); | 934 | stack->addWidget( dlg, 3 ); |
932 | stack->raiseWidget( dlg ); | 935 | stack->raiseWidget( dlg ); |
933 | } | 936 | } |
934 | 937 | ||
935 | 938 | ||
936 | void MainWindow :: applyChanges() | 939 | void MainWindow :: applyChanges() |
@@ -964,12 +967,13 @@ void MainWindow :: applyChanges() | |||
964 | return; | 967 | return; |
965 | } | 968 | } |
966 | 969 | ||
967 | // do the stuff | 970 | // do the stuff |
968 | InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Apply changes" ) ); | 971 | InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Apply changes" ) ); |
969 | connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); | 972 | connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) ); |
973 | reloadDocuments = TRUE; | ||
970 | stack->addWidget( dlg, 3 ); | 974 | stack->addWidget( dlg, 3 ); |
971 | stack->raiseWidget( dlg ); | 975 | stack->raiseWidget( dlg ); |
972 | } | 976 | } |
973 | 977 | ||
974 | // decide what to do - either remove, upgrade or install | 978 | // decide what to do - either remove, upgrade or install |
975 | // Current rules: | 979 | // Current rules: |
@@ -1103,18 +1107,21 @@ void MainWindow :: reloadData( InstallDlgImpl *dlg ) | |||
1103 | } | 1107 | } |
1104 | 1108 | ||
1105 | mgr->reloadServerData(); | 1109 | mgr->reloadServerData(); |
1106 | serverSelected( -1, FALSE ); | 1110 | serverSelected( -1, FALSE ); |
1107 | 1111 | ||
1108 | #ifdef QWS | 1112 | #ifdef QWS |
1113 | if ( reloadDocuments ) | ||
1114 | { | ||
1109 | m_status->setText( tr( "Updating Launcher..." ) ); | 1115 | m_status->setText( tr( "Updating Launcher..." ) ); |
1110 | 1116 | ||
1111 | // Finally let the main system update itself | 1117 | // Finally let the main system update itself |
1112 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); | 1118 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); |
1113 | QString lf = QString::null; | 1119 | QString lf = QString::null; |
1114 | e << lf; | 1120 | e << lf; |
1121 | } | ||
1115 | #endif | 1122 | #endif |
1116 | 1123 | ||
1117 | stack->raiseWidget( networkPkgWindow ); | 1124 | stack->raiseWidget( networkPkgWindow ); |
1118 | } | 1125 | } |
1119 | 1126 | ||
1120 | void MainWindow :: letterPushed( QString t ) | 1127 | void MainWindow :: letterPushed( QString t ) |