author | tille <tille> | 2002-05-12 12:07:14 (UTC) |
---|---|---|
committer | tille <tille> | 2002-05-12 12:07:14 (UTC) |
commit | 06e723cc7942af2691828e7fdc6a6ec47b44edab (patch) (side-by-side diff) | |
tree | f96bd547911c4fdc2aa8db95bd6175ebae02b027 /noncore | |
parent | 026a99ad2360a9abc2964cbdc3b71b49adcd66e6 (diff) | |
download | opie-06e723cc7942af2691828e7fdc6a6ec47b44edab.zip opie-06e723cc7942af2691828e7fdc6a6ec47b44edab.tar.gz opie-06e723cc7942af2691828e7fdc6a6ec47b44edab.tar.bz2 |
fixed crash when remove dest
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 10 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 6 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.cpp | 6 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/settings.cpp | 2 |
5 files changed, 18 insertions, 8 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index 19a1420..a23c900 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp @@ -59,7 +59,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : //opie is hardcoded default ;) - pvDebug(9,"section->setCurrentItem"); - for (int i=0;i<section->count();i++) - if (section->text(i)=="opie") - section->setCurrentItem(i); - sectionChanged(); +// pvDebug(9,"section->setCurrentItem"); +// for (int i=0;i<section->count();i++) +// if (section->text(i)=="opie") +// section->setCurrentItem(i); +// sectionChanged(); diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp index c947c64..4542e42 100644 --- a/noncore/unsupported/oipkg/package.cpp +++ b/noncore/unsupported/oipkg/package.cpp @@ -36,2 +36,3 @@ void Package::init( PackageManagerSettings *s ) _versions=0; + _version=""; } @@ -237,2 +238,7 @@ void Package::copyValues( Package* pack ) if (_name.isEmpty() && !pack->_name.isEmpty()) _name = QString( pack->_name ); + if (_dest.isEmpty() && !pack->_dest.isEmpty()) _dest= QString( pack->_dest ); + if (_displayName.isEmpty()&& !pack->_displayName.isEmpty()) _displayName = QString( pack->_displayName ); + if (_fileName.isEmpty() && !pack->_fileName.isEmpty()) _fileName = QString( pack->_fileName ); + if (_version.isEmpty() && !pack->_version.isEmpty()) _version = QString( pack->_version ); + if (_values.isEmpty() && !pack->_values.isEmpty())_values = QDict<QString>( pack->_values ); if (!installed() && _status.isEmpty() && !pack->_status.isEmpty()) _status = QString( pack->_status ); diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp index 24c7beb..09975b0 100644 --- a/noncore/unsupported/oipkg/pksettings.cpp +++ b/noncore/unsupported/oipkg/pksettings.cpp @@ -171,4 +171,4 @@ void PackageManagerSettings::removeDestination() disconnect( destinationurl, SIGNAL(textChanged(const QString&)), this, SLOT(destUrlChanged(const QString&)) ); - destinationname->setText(destinations->text(editedserver)); - destinationurl->setText(*destinationurlDic[editedserver]); + destinationname->setText(""); + destinationurl->setText(""); disconnect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) ); @@ -177,2 +177,3 @@ void PackageManagerSettings::removeDestination() activeLinkDestination->removeItem(editeddestination); + editeddestination=0; connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) ); @@ -356,2 +357,3 @@ bool PackageManagerSettings::readIpkgConfig(const QString& conffile) activeServers->clear(); + destinations->clear(); activeDestination->clear(); diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 6ef6d19..0401a5b 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp @@ -270,4 +270,6 @@ void PmIpkg::remove() to_remove.at(i)->processed(); + pvDebug(4,"link "+QString::number(i)); if ( to_remove.at(i)->link() ) processFileList( fileList, to_remove.at(i)->dest() ); + pvDebug(4,"take "+QString::number(i)); to_remove.take( i ); diff --git a/noncore/unsupported/oipkg/settings.cpp b/noncore/unsupported/oipkg/settings.cpp index 8f91995..85daa98 100644 --- a/noncore/unsupported/oipkg/settings.cpp +++ b/noncore/unsupported/oipkg/settings.cpp @@ -183,3 +183,3 @@ void PackageManagerSettings::writeIpkgConfig(const QString& conffile) QTextStream s(&conf); - s << "# Written by qpie Package Manager\n"; + s << "# "+tr("Written by Opie Package Manager")+"\n"; for (int i=0; i<(int)activeServers->count(); i++) |