3 files changed, 4 insertions, 3 deletions

diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO
index 9d9a650..1aa9e6b 100644
--- a/noncore/unsupported/oipkg/TODO
+++ b/noncore/unsupported/oipkg/TODO
@@ -1,13 +1,14 @@
 * Settings Class
 * tr() ;)
 * Dialog to display ipkg output live
 * parse "to install" and "to remove" from status
 * install local file dialog
 * qcop
 * error handling
 * manage links
 * dependency checking
 * create dest if it does not exist
 * allow reinstalling
 * different types of filters and searches
-        i.e. name, desc, files etc
\ No newline at end of file
+        i.e. name, desc, files etc
+* get packages from doclnk
\ No newline at end of file
diff --git a/noncore/unsupported/oipkg/opie-oipkg.control b/noncore/unsupported/oipkg/opie-oipkg.control
index 2d2b63c..1cff44e 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/
+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)
 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 1798c80..2559a51 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -217,193 +217,193 @@ void PmIpkg::loadList( PackageList pl )
           if ( pack && (pack->name() != "") && pack)
                 {
                   if ( pack->toInstall() )
               to_install.append( pack );
                   if ( pack->toRemove() )
               to_remove.append( pack );
                 }
   }
 }
 
 void PmIpkg::commit( PackageList pl )
         {   
   sizecount = 0;
   QString rem="<b>"+tr("To remove:")+"</b><br>\n";
   QString inst="<b>"+tr("To install:")+"</b><br>\n";
   loadList(pl);
   for (uint i=0; i < to_remove.count(); i++)
                sizecount += 1;
   for (uint i=0; i < to_install.count(); i++)
                sizecount += to_install.at(i)->size().toInt();
         startDialog();
 }
 
 void PmIpkg::startDialog()
 {
   installDialog = new QDialog(0,0,true);
   QGridLayout *RunWindowLayout = new QGridLayout( installDialog );
   RunWindowLayout->setSpacing( 2 );
   RunWindowLayout->setMargin( 2 );
 
     PackageListView *plv = new PackageListView(installDialog, "install",settings);
     plv->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding, plv->sizePolicy().mayShrinkVertically()) );
     RunWindowLayout->addWidget( plv, 1, 0 );
                 QCheckListItem *toRemoveItem;
                 toRemoveItem= new QCheckListItem( plv, QObject::tr("To remove") );
           toRemoveItem->setOpen( true );
     for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
           {
       toRemoveItem->insertItem( new PackageListItem(plv, it,settings) );
                 } 
                 QCheckListItem *toInstallItem;
                 toInstallItem = new QCheckListItem( plv, QObject::tr("To install") );
           toInstallItem->setOpen( true );
     for (Package *it=to_install.first(); it != 0; it=to_install.next() )
     {
       toInstallItem->insertItem( new PackageListItem(plv, it,settings) );
     }
 
     QGroupBox *GroupBox1 = new QGroupBox( installDialog, "Ipkg" );
     GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3, GroupBox1->sizePolicy().mayShrinkVertically() ) );
     GroupBox1->setTitle( tr( "Ipkg options" ) );
     GroupBox1->setColumnLayout(0, Qt::Vertical );
     GroupBox1->layout()->setSpacing( 0 );
     GroupBox1->layout()->setMargin( 0 );
     QGridLayout *GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
     GroupBox1Layout->setAlignment( Qt::AlignTop );
     GroupBox1Layout->setSpacing( 3 );
     GroupBox1Layout->setMargin( 3 );
     _force_depends = new QCheckBox( GroupBox1, "_force_depends" );
     _force_depends->setText( tr( "-force-depends" ) );
     _force_depends->setAutoResize( TRUE );
     _force_depends->setChecked(true);
     GroupBox1Layout->addWidget( _force_depends, 0, 0 );
     _force_reinstall = new QCheckBox( GroupBox1, "_force_reinstall" );
     _force_reinstall->setText( tr( "-force-reinstall" ) );
     _force_reinstall->setAutoResize( TRUE );
     GroupBox1Layout->addWidget( _force_reinstall, 1, 0 );
     _force_remove = new QCheckBox( GroupBox1, "_force_remove" );
     _force_remove->setText( tr( "-force-removal-of-essential-packages" ) );
     _force_remove->setAutoResize( TRUE );
     GroupBox1Layout->addWidget( _force_remove, 1, 0 );
     RunWindowLayout->addWidget( GroupBox1 , 3, 0 );
   installDialog->showMaximized();
   if ( installDialog->exec() ) doIt();
          installDialog->close();
   out(tr("<b>All done.</b>"));
 }
 
 void PmIpkg::doIt()
 {
         show( true );
          remove();
   install();
 }
 
 
 void PmIpkg::remove()
 {
          if ( to_remove.count() == 0 ) return;
 
         out("<b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br><hr>");
 
         QStringList *fileList;
   for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
   {
                                 if ( it->link() )fileList = getList( it->name(), it->dest() );     
-      if ( runIpkg("remove " + it->name()) == 0)
+      if ( runIpkg("remove " + it->name(), it->dest() ) == 0)
       {
         runwindow->progress->setProgress( 1 + runwindow->progress->progress() );
                linkOpp = removeLink;
                     if ( it->link() )
               {
                                         out( "<br>removing links<br>" );
                                 out( "for package "+it->name()+" in "+it->dest()+"<br>" );
                 processFileList( fileList, it->dest() );
         }
                 it->processed();
                
         out("<br><hr>");
                 }else{
               out("<b>"+tr("Error while removing")+"</b><hr>"+it->name());
       }
           if ( it->link() )delete fileList;
     }
     out("<br>");
 }
 
 
 void PmIpkg::install()
 {
          if ( to_install.count() == 0 ) return;
         out("<b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>");
          for (Package *it=to_install.first(); it != 0; it=to_install.next() )
     {
 
       if ( runIpkg("install " + it->installName(), it->dest() ) == 0 )
                           {    
               runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress());
                linkOpp = createLink;
                     if ( it->link() )
               {
                                         out( "<br>creating links<br>" );
                                 out( "for package "+it->name()+" in "+it->dest()+"<br>" );
                                         makeLinks( it );
                 }
                 it->processed();
         out("<br><hr>");
                 }else{
               out("<b>"+tr("Error while installing")+"</b><hr>"+it->name());
       }
     }
     out("<br>");
 }
 
 void PmIpkg::createLinks( const QString &dest )
 {
         pvDebug(2,"PmIpkg::createLinks "+dest);
         linkOpp=createLink;
          QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
         processLinkDir( "/", url );
 }
 
 void PmIpkg::removeLinks( const QString &dest )
 {
         pvDebug(2,"PmIpkg::removeLinks "+dest);
         linkOpp=removeLink;
          QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
         processLinkDir( "/", url );
 }
 
 void PmIpkg::update()
 {
         show( false );
         runIpkg( "update" );
          runwindow->close();
 }
 
 void PmIpkg::out( QString o )
 {
                 runwindow->outPut->append(o);
          //runwindow->outPut->setCursorPosition(0, runwindow->outPut->contentsHeight());
         //runwindow->outPut->setText( runwindow->outPut->text()+o );
   runwindow->outPut->setContentsPos(0, runwindow->outPut->contentsHeight());
 }
 
 
 void PmIpkg::showButtons(bool b)
 {
         if ( b )
          {
                 runwindow->cancelButton->hide();
                 runwindow->doItButton->hide();
           runwindow->removeButton->hide();
           runwindow->installButton->hide();
   }else{
                 runwindow->cancelButton->show();
                 runwindow->doItButton->show();
           runwindow->removeButton->show();
           runwindow->installButton->show();
 
   }