summaryrefslogtreecommitdiff
authordrw <drw>2004-01-13 21:46:50 (UTC)
committer drw <drw>2004-01-13 21:46:50 (UTC)
commit4dae04411e1cd75237b89dee6b5d6ba74089505d (patch) (unidiff)
tree1704e1ec9dc235817436568fd9354824c3279a7e
parent4a48472bbe915852ed6eaa66284b8b8c0f3b493d (diff)
downloadopie-4dae04411e1cd75237b89dee6b5d6ba74089505d.zip
opie-4dae04411e1cd75237b89dee6b5d6ba74089505d.tar.gz
opie-4dae04411e1cd75237b89dee6b5d6ba74089505d.tar.bz2
Add .cvsignore and fix sigsev when updating and upgrading
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/.cvsignore3
-rw-r--r--noncore/settings/packagemanager/installdlg.cpp7
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 @@
1Makefile*
2moc*
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
@@ -188,25 +188,25 @@ void InstallDlg::slotDisplayAvailSpace( const QString &destination )
188 { 188 {
189 long mult = fs.f_bsize / 1024; 189 long mult = fs.f_bsize / 1024;
190 long div = 1024 / fs.f_bsize; 190 long div = 1024 / fs.f_bsize;
191 191
192 if ( !mult ) mult = 1; 192 if ( !mult ) mult = 1;
193 if ( !div ) div = 1; 193 if ( !div ) div = 1;
194 long avail = fs.f_bavail * mult / div; 194 long avail = fs.f_bavail * mult / div;
195 195
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
204void InstallDlg::slotBtnStart() 204void InstallDlg::slotBtnStart()
205{ 205{
206 QString btnText = m_btnStart->text(); 206 QString btnText = m_btnStart->text();
207 if ( btnText == tr( "Abort" ) ) 207 if ( btnText == tr( "Abort" ) )
208 { 208 {
209 // Stop execution of current command and prevent any others from executing 209 // Stop execution of current command and prevent any others from executing
210 m_packman->abortCommand(); 210 m_packman->abortCommand();
211 m_currCommand = 999; 211 m_currCommand = 999;
212 212
@@ -218,25 +218,28 @@ void InstallDlg::slotBtnStart()
218 else if ( btnText == tr( "Close" ) ) 218 else if ( btnText == tr( "Close" ) )
219 { 219 {
220 // TODO - force reload of package data 220 // TODO - force reload of package data
221 emit closeInstallDlg(); 221 emit closeInstallDlg();
222 return; 222 return;
223 } 223 }
224 224
225 // Start was clicked, execute first command 225 // Start was clicked, execute first command
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
235void InstallDlg::slotBtnOptions() 238void InstallDlg::slotBtnOptions()
236{ 239{
237 QString btnText = m_btnOptions->text(); 240 QString btnText = m_btnOptions->text();
238 if ( btnText == tr( "Options" ) ) 241 if ( btnText == tr( "Options" ) )
239 { 242 {
240 // Display configuration dialog (only options tab is enabled) 243 // Display configuration dialog (only options tab is enabled)
241 m_packman->configureDlg( true ); 244 m_packman->configureDlg( true );
242 return; 245 return;