oipkg works with ipkg 0.99.20

3 files changed, 2 insertions, 9 deletions

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
@@ -1,9 +1,9 @@
 Files: bin/oipkg apps/Settings/oipkg.desktop pics/oipkg/*
 Priority: optional
 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
@@ -36,13 +36,13 @@
 #include "mainwindow.h"
 
 
 //#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 );
 #ifdef OPROCESS
   ipkgProcess = new OProcess();
   connect ( ipkgProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
@@ -153,18 +153,12 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
                 out(lineStr);
         lineStrOld = lineStr;
                           qApp->processEvents();
      }
   }
   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"));
   return ret;
 }
 
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
@@ -50,13 +50,12 @@ public slots:
   void removeLinks( const QString &dest );
 
 //private slots:
         void getIpkgOutput(OProcess *proc, char *buffer, int buflen);
 
 private:
-        bool shellWarning;
         OProcess *ipkgProcess;
   PackageManagerSettings* settings;
   RunWindow *runwindow;
   InstallDialog *installDialog;
   QList<Package> to_remove;
   QList<Package> to_install;