From 98229e01acc37562671b546a8aa955415a0f5843 Mon Sep 17 00:00:00 2001
From: tille <tille>
Date: Sun, 12 May 2002 12:49:58 +0000
Subject: fixed install/remove segfault

---
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
@@ -258,6 +258,7 @@ void MainWindow::runIpkg()
   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)");
@@ -420,29 +421,15 @@ void MainWindow::rotateUpdateIcon()
 
 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 );
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
@@ -64,7 +64,6 @@ private:
   void makeMenu();
   void setSections();
   void setSubSections();
-	void installFile(const QString &);
   bool updateIcon;
 
   PmIpkg* ipkg;
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
@@ -241,6 +241,7 @@ void PmIpkg::commit()
   	runwindow->show();
   }
  	installDialog->close();
+  delete installDialog;
   out(tr("\nAll done."));
 }
 
@@ -268,15 +269,15 @@ void PmIpkg::remove()
       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() );
     }
@@ -303,7 +304,7 @@ void PmIpkg::install()
 	    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");
@@ -360,11 +361,6 @@ void PmIpkg::show()
 	  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)
@@ -393,3 +389,9 @@ void PmIpkg::removeFile(const QString &fileName, const QString &dest)
  	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
@@ -28,6 +28,8 @@ public:
   void commit();
   void update();
   void show();
+  /** No descriptions */
+  void clearLists();
 
 public slots:
 	void doIt();
--
cgit v0.9.0.2