-rw-r--r-- | noncore/settings/packagemanager/.cvsignore | 3 | ||||
-rw-r--r-- | noncore/settings/packagemanager/installdlg.cpp | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/noncore/settings/packagemanager/.cvsignore b/noncore/settings/packagemanager/.cvsignore new file mode 100644 index 0000000..4183697 --- a/dev/null +++ b/noncore/settings/packagemanager/.cvsignore | |||
@@ -0,0 +1,3 @@ | |||
1 | Makefile* | ||
2 | moc* | ||
3 | .moc* | ||
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp index c0c03fc..980d5eb 100644 --- a/noncore/settings/packagemanager/installdlg.cpp +++ b/noncore/settings/packagemanager/installdlg.cpp | |||
@@ -196,9 +196,9 @@ void InstallDlg::slotDisplayAvailSpace( const QString &destination ) | |||
196 | space = tr( "%1 Kb" ).arg( avail ); | 196 | space = tr( "%1 Kb" ).arg( avail ); |
197 | } | 197 | } |
198 | } | 198 | } |
199 | 199 | ||
200 | // Display available space (if known) | 200 | // Display available space |
201 | m_availSpace->setText( space ); | 201 | m_availSpace->setText( space ); |
202 | } | 202 | } |
203 | 203 | ||
204 | void InstallDlg::slotBtnStart() | 204 | void InstallDlg::slotBtnStart() |
@@ -226,9 +226,12 @@ void InstallDlg::slotBtnStart() | |||
226 | m_btnOptions->setEnabled( false ); | 226 | m_btnOptions->setEnabled( false ); |
227 | m_btnStart->setText( tr( "Abort" ) ); | 227 | m_btnStart->setText( tr( "Abort" ) ); |
228 | m_btnStart->setIconSet( Resource::loadPixmap( "close" ) ); | 228 | m_btnStart->setIconSet( Resource::loadPixmap( "close" ) ); |
229 | 229 | ||
230 | m_packman->executeCommand( m_command[ 0 ], m_packages[ 0 ], m_destination->currentText(), this, | 230 | QString dest; |
231 | if ( m_destination ) | ||
232 | dest = m_destination->currentText(); | ||
233 | m_packman->executeCommand( m_command[ 0 ], m_packages[ 0 ], dest, this, | ||
231 | SLOT(slotOutput(OProcess*,char*,int)), SLOT(slotErrors(OProcess*,char*,int)), | 234 | SLOT(slotOutput(OProcess*,char*,int)), SLOT(slotErrors(OProcess*,char*,int)), |
232 | SLOT(slotFinished(OProcess*)), true ); | 235 | SLOT(slotFinished(OProcess*)), true ); |
233 | } | 236 | } |
234 | 237 | ||