fixed install/remove segfault

4 files changed, 17 insertions, 27 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
@@ -245,32 +245,33 @@ MainWindow::~MainWindow()
   Config cfg( "oipkg", Config::User );
   cfg.setGroup( "gui" );
   cfg.writeEntry( "findBar", !findBar->isHidden() );
   cfg.writeEntry( "searchBar", !searchBar->isHidden() );
   cfg.writeEntry( "sectionBar", !sectionBar->isHidden() );
   cfg.writeEntry( "destBar", !destBar->isHidden() );
         
 }
 
 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();
 }
 
 void MainWindow::updateList()
 {
         //wait->show();
         QTimer *t = new QTimer( this );
   connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
   t->start( 0, false );
         packageListServers.clear();
         packageListSearch.clear();
@@ -407,55 +408,41 @@ void MainWindow::destClose()
   destAction->setOn( false );
 }
 
 void MainWindow::rotateUpdateIcon()
 {
         pvDebug(2, "MainWindow::rotateUpdateIcon");
  if ( updateIcon )
         updateAction->setIconSet( Resource::loadIconSet( "oipkg/update" ) );
  else
         updateAction->setIconSet( Resource::loadIconSet( "oipkg/update2" ) );
  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&)) );
 }
 
 
 
 void MainWindow::receive(const QCString &msg, const QByteArray &arg)
 {
         pvDebug(3, "QCop "+msg+" "+QCString(arg));
         if ( msg == "installFile(QString)" )
          {
           ipkg->installFile( QString(arg) );
         }else if( msg == "removeFile(QString)" )
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
@@ -51,33 +51,32 @@ public slots:
   void findShow(bool);
   void searchClose();
   void searchShow(bool);
   void destClose();
   void destShow(bool);
   void filterList();
   void createLinks();
   void removeLinks();
         void receive (const QCString &, const QByteArray &);
         void setDocument (const QString &);
   void remotePackageQuery();
 
 private:
   void makeMenu();
   void setSections();
   void setSubSections();
-        void installFile(const QString &);
   bool updateIcon;
 
   PmIpkg* ipkg;
   PackageManagerSettings *settings;
   PackageListLocal  packageListServers;
   PackageListRemote packageListSearch;
   PackageListDocLnk packageListDocLnk;
   PackageListView *listViewPackages;
   QAction *runAction;
   QAction *updateAction;
   QAction *findAction;
   QPEToolBar *findBar;
   QLineEdit *findEdit;
   QAction *searchAction;
   QAction *searchCommit;
   QPEToolBar *searchBar;
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
@@ -228,95 +228,96 @@ void PmIpkg::commit()
   for (uint i=0; i < to_install.count(); i++)
   {
           sizecount += to_install.at(i)->size().toInt();
     installDialog->toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_install.at(i),settings) );
   }
   runwindow->progress->setTotalSteps(sizecount);
   qDebug("Install size %i",sizecount);
   installDialog->showMaximized();
   installDialog->show();
   if ( installDialog->exec() )
   {
           doIt();
           runwindow->showMaximized();
           runwindow->show();
   }
          installDialog->close();
+  delete installDialog;
   out(tr("\nAll done."));
 }
 
 void PmIpkg::doIt()
 {
         runwindow->progress->setProgress(0);
         show();
          remove();
   install();
 }
 
 
 void PmIpkg::remove()
 {
          if ( to_remove.count() == 0 ) return;
 
         out(tr("Removing")+"\n"+tr("please wait")+"\n\n");
 
         QStringList *fileList;
   for (uint i=0; i < to_remove.count(); i++)
   {
                         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");
+             out(tr("Error while removing ")+to_remove.at(i)->name()+"\n");
                   if ( to_remove.at(i)->link() )
                 processFileList( fileList, to_remove.at(i)->dest() );
     }
           if ( to_remove.at(i)->link() )
                 processFileList( fileList, to_remove.at(i)->dest() );
           if ( to_remove.at(i)->link() )delete fileList;
   }
   to_remove.clear();
   out("\n");
 }
 
 
 void PmIpkg::install()
 {
          if ( to_install.count() == 0 ) return;
                 out(tr("Installing")+"\n"+tr("please wait")+"\n"); 
   for (uint i=0; i < to_install.count(); i++)
   {
           qDebug("install loop %i of %i installing %s",i,to_install.count(),to_install.at(i)->installName().latin1()); //pvDebug
           if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ))
                         {    
             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) );
     }
    }
    out("\n");
    to_install.clear();
 }
 
 void PmIpkg::createLinks( const QString &dest )
 {
         pvDebug(2,"PmIpkg::createLinks "+dest);
         linkOpp=createLink;
@@ -347,49 +348,50 @@ void PmIpkg::out( QString o )
 {
                 runwindow->outPut->append(o);
          runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE);
 }
 
 
 
 
 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();
   to_remove.clear();
         pvDebug( 2,"PmIpkg::installFile "+ fileName);
          Package *p = new Package(fileName,settings);
   if ( dest!="") p->setDest( dest );
         to_install.append( p );
         commit();
          delete p;
 }
 
 void PmIpkg::removeFile(const QString &fileName, const QString &dest)
 {
 
         to_install.clear();
   to_remove.clear();
         pvDebug( 2,"PmIpkg::removeFile "+ fileName);
          Package *p = new Package(fileName,settings);
   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
@@ -15,32 +15,34 @@
 #define createLink 0
 #define removeLink 1
 
 class Package;
 class PmIpkg : public QObject
 {
   Q_OBJECT
 public:
   PmIpkg( PackageManagerSettings* , QWidget* p=0,  const char * name=0, WFlags f=0 );
   ~PmIpkg();
 
   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="");
   void removeFile(const QString &fileName, const QString &dest="");
   void createLinks( const QString &dest );
   void removeLinks( const QString &dest );
 
 private:
   PackageManagerSettings* settings;
   RunWindow *runwindow;
   InstallDialog *installDialog;
   QList<Package> to_remove;
   QList<Package> to_install;