fixed install/remove segfault

4 files changed, 16 insertions, 26 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index a23c900..1c56aae 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -255,12 +255,13 @@ void MainWindow::runIpkg()
 {
   packageListServers.allPackages();
   ipkg->loadList( &packageListSearch );
   ipkg->loadList( &packageListDocLnk );
   ipkg->loadList( &packageListServers );
   ipkg->commit();
+  ipkg->clearLists();
   // ##### If we looked in the list of files, we could send out accurate
   // ##### messages. But we don't bother yet, and just do an "all".
   QCopEnvelope e("QPE/System", "linkChanged(QString)");
   QString lf = QString::null;
   e << lf;
   displayList();
@@ -417,35 +418,21 @@ void MainWindow::rotateUpdateIcon()
  updateIcon = !updateIcon;
 }
 
 
 void MainWindow::setDocument(const QString &fileName)
 {
-  installFile(fileName);
-  // ##### If we looked in the list of files, we could send out accurate
-  // ##### messages. But we don't bother yet, and just do an "all".
-  QCopEnvelope e("QPE/System", "linkChanged(QString)");
-  QString lf = QString::null;
-  e << lf;
- // displayList();
-         exit;
-}
-
-void MainWindow::installFile(const QString &fileName)
-{
-        pvDebug(3, "MainWindow::installFile "+fileName);
          if ( !QFile::exists( fileName ) ) return;
         ipkg->installFile( fileName );
-  // ##### If we looked in the list of files, we could send out accurate
-  // ##### messages. But we don't bother yet, and just do an "all".
   QCopEnvelope e("QPE/System", "linkChanged(QString)");
   QString lf = QString::null;
   e << lf;
-  displayList();
+         exit;
 }
 
+
 void MainWindow::makeChannel()
         {   
         channel = new QCopChannel( "QPE/Application/oipkg", this );
         connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
                 this, SLOT(receive(const QCString&, const QByteArray&)) );
 }
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index 7c93dad..ce3e761 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -61,13 +61,12 @@ public slots:
   void remotePackageQuery();
 
 private:
   void makeMenu();
   void setSections();
   void setSubSections();
-        void installFile(const QString &);
   bool updateIcon;
 
   PmIpkg* ipkg;
   PackageManagerSettings *settings;
   PackageListLocal  packageListServers;
   PackageListRemote packageListSearch;
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 0401a5b..30777c2 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -238,12 +238,13 @@ void PmIpkg::commit()
   {
           doIt();
           runwindow->showMaximized();
           runwindow->show();
   }
          installDialog->close();
+  delete installDialog;
   out(tr("\nAll done."));
 }
 
 void PmIpkg::doIt()
 {
         runwindow->progress->setProgress(0);
@@ -265,17 +266,17 @@ void PmIpkg::remove()
                         if ( to_remove.at(i)->link() )fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() );     
     if ( runIpkg("remove " + to_remove.at(i)->installName(), to_remove.at(i)->dest() ))
     {
       runwindow->progress->setProgress( 1 );
              linkOpp = removeLink;
             to_remove.at(i)->processed();
-             pvDebug(4,"link "+QString::number(i));
+             pvDebug(3,"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 );
+             //pvDebug(3,"take "+QString::number(i)+" of "+QString::number(to_remove.count()));
+             //if ( to_remove.at(i) ) to_remove.take( i );
                   
       out("\n");
                 }else{
              out(tr("Error while removing")+to_remove.at(i)->name()+"\n");
                   if ( to_remove.at(i)->link() )
                 processFileList( fileList, to_remove.at(i)->dest() );
@@ -300,13 +301,13 @@ void PmIpkg::install()
                         {    
             runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress());
              to_install.at(i)->processed();
             linkOpp = createLink;
                   if ( to_install.at(i)->link() )
                   makeLinks( to_install.at(i) );
-      to_install.take( i );
+   //   to_install.take( i );
       out("\n");
           }else{
              out(tr("Error while installing")+to_install.at(i)->name()+"\n");
             linkOpp = createLink;
                   if ( to_install.at(i)->link() )
                   makeLinks( to_install.at(i) );
@@ -357,17 +358,12 @@ void PmIpkg::show()
         if (!runwindow->isVisible())
          {
           runwindow->showMaximized();
           runwindow->show();
   }
   runwindow->outPut->setText("");
-        //showButtons(b);
-        //if ( !b )
-        //      runwindow->progress->hide();
-//  else
-        //      runwindow->progress->show();
 }
 
 void PmIpkg::installFile(const QString &fileName, const QString &dest)
 {
 
         to_install.clear();
@@ -390,6 +386,12 @@ void PmIpkg::removeFile(const QString &fileName, const QString &dest)
   if ( dest!="") p->setDest( dest );
         to_remove.append( p );
         commit();
          delete p;
 }
 
+
+void PmIpkg::clearLists()
+{
+        to_remove.clear();
+         to_install.clear();
+}
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index c543304..d53a74d 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -25,12 +25,14 @@ public:
 
   int linkOpp;
   void loadList( PackageList* );
   void commit();
   void update();
   void show();
+  /** No descriptions */
+  void clearLists();
 
 public slots:
         void doIt();
          void install();
   void remove();
   void installFile(const QString &fileName, const QString &dest="");