From dcea0e50a00ed9efb988ded5abf5d39de1bea393 Mon Sep 17 00:00:00 2001
From: tille <tille>
Date: Mon, 15 Jul 2002 16:03:13 +0000
Subject: oipkg works with ipkg 0.99.20

---
diff --git a/noncore/unsupported/oipkg/opie-oipkg.control b/noncore/unsupported/oipkg/opie-oipkg.control
index 1cff44e..ff1c6ca 100644
--- a/noncore/unsupported/oipkg/opie-oipkg.control
+++ b/noncore/unsupported/oipkg/opie-oipkg.control
@@ -4,6 +4,6 @@ Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@almana.ch>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), ipkg (>0.9)
+Depends: opie-base ($QPE_VERSION), ipkg (>0.99.20)
 Description: Opie Projects advanced gui ipkg installer
  A GUI front-end to ipkg for the Opie environment.
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 71e9b88..2ed86ee 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -39,7 +39,7 @@
 //#define OPROCESS
 
 PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p,  const char * name, WFlags f )
-  	: QObject ( p ),  shellWarning(true)
+  	: QObject ( p )
 {
   settings = s;
  	runwindow = new RunWindow( p, name, true, f );
@@ -156,12 +156,6 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
      }
   }
   pclose(fp);
-  if (!ret && shellWarning)
-	{
-		shellWarning = false;
-		QMessageBox::critical( runwindow, tr("install failure"),
-  			tr("<p>Did you start me from the command line?</p>"));				
-	}
 #endif
   //out( "Finished!");
   pvDebug(2,QString(ret?"success\n":"failure\n"));
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index 662800a..c84acfa 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -53,7 +53,6 @@ public slots:
 	void getIpkgOutput(OProcess *proc, char *buffer, int buflen);
 
 private:
-	bool shellWarning;
 	OProcess *ipkgProcess;
   PackageManagerSettings* settings;
   RunWindow *runwindow;
--
cgit v0.9.0.2