summaryrefslogtreecommitdiff
authordrw <drw>2004-01-13 21:46:50 (UTC)
committer drw <drw>2004-01-13 21:46:50 (UTC)
commit4dae04411e1cd75237b89dee6b5d6ba74089505d (patch) (side-by-side diff)
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 @@
+Makefile*
+moc*
+.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
@@ -194,13 +194,13 @@ void InstallDlg::slotDisplayAvailSpace( const QString &destination )
long avail = fs.f_bavail * mult / div;
space = tr( "%1 Kb" ).arg( avail );
}
}
- // Display available space (if known)
+ // Display available space
m_availSpace->setText( space );
}
void InstallDlg::slotBtnStart()
{
QString btnText = m_btnStart->text();
@@ -224,13 +224,16 @@ void InstallDlg::slotBtnStart()
// Start was clicked, execute first command
m_btnOptions->setEnabled( false );
m_btnStart->setText( tr( "Abort" ) );
m_btnStart->setIconSet( Resource::loadPixmap( "close" ) );
- m_packman->executeCommand( m_command[ 0 ], m_packages[ 0 ], m_destination->currentText(), this,
+ QString dest;
+ if ( m_destination )
+ dest = m_destination->currentText();
+ m_packman->executeCommand( m_command[ 0 ], m_packages[ 0 ], dest, this,
SLOT(slotOutput(OProcess*,char*,int)), SLOT(slotErrors(OProcess*,char*,int)),
SLOT(slotFinished(OProcess*)), true );
}
void InstallDlg::slotBtnOptions()
{