1 files changed, 58 insertions, 11 deletions

diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index ed9ea10..eb07a61 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -30,8 +30,9 @@
 */
 
 #include "oipkg.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <qdir.h>
@@ -45,19 +46,35 @@ const QString IPKG_PKG_PATH    = "/usr/lib/ipkg/lists"; // Directory containing
 const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location
 
 OIpkg *oipkg;
 
-int fIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg )
+// Ipkg callback functions
+
+int fsignalIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg )
 {
-    oipkg->ipkgOutput( msg );
+    oipkg->ipkgMessage( msg );
     return 0;
 }
 
-char* fIpkgResponse( char */*question*/ )
+char *fIpkgResponse( char */*question*/ )
 {
     return 0x0;
 }
 
+int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ )
+{
+    oipkg->ipkgStatus( desc );
+    return 0;
+}
+
+int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/,
+                void */*userdata*/ )
+{
+printf( "*****List*****\n%s\n", desc );
+    oipkg->ipkgList( desc );
+    return 0;
+}
+
 OIpkg::OIpkg( Config *config, QObject *parent, const char *name )
     : QObject( parent, name )
     , m_config( config )
     , m_confInfo( NULL )
@@ -66,9 +83,9 @@ OIpkg::OIpkg( Config *config, QObject *parent, const char *name )
 {
     oipkg = this;
 
     // Initialize libipkg
-    if ( ipkg_init( &fIpkgMessage, &fIpkgResponse, &m_ipkgArgs ) )
+    if ( ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ) )
         QMessageBox::critical( 0, tr( "OIpkg" ), tr( "Error initialing libipkg" ) );
 
     // Default ipkg run-time arguments
     m_ipkgArgs.noaction = false;
@@ -296,54 +313,84 @@ bool OIpkg::executeCommand( OPackage::Command command, QStringList *parameters,
     else
         m_ipkgArgs.dest = 0x0;
 
     // Connect output signal to widget
+
     if ( rawOutput )
     {
-        if ( slotOutput )
-            connect( this, SIGNAL(execOutput(char *)), receiver, slotOutput );
+//        if ( slotOutput )
+//            connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput );
     }
     else
     {
-        // TODO - connect to local slot and parse output before emitting execOutput
+        // TODO - connect to local slot and parse output before emitting signalIpkgMessage
     }
 
     switch( command )
     {
-        case OPackage::Update : ipkg_lists_update( &m_ipkgArgs );
+        case OPackage::Update : {
+                connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput );
+                ipkg_lists_update( &m_ipkgArgs );
+            };
             break;
-        case OPackage::Upgrade : ipkg_packages_upgrade( &m_ipkgArgs );
+        case OPackage::Upgrade : {
+                connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput );
+                ipkg_packages_upgrade( &m_ipkgArgs );
+            };
             break;
         case OPackage::Install : {
+                connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput );
                 for ( QStringList::Iterator it = parameters->begin(); it != parameters->end(); ++it )
                 {
                     ipkg_packages_install( &m_ipkgArgs, (*it) );
                 }
             };
             break;
         case OPackage::Remove : {
+                connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput );
                 for ( QStringList::Iterator it = parameters->begin(); it != parameters->end(); ++it )
                 {
                     ipkg_packages_remove( &m_ipkgArgs, (*it), true );
                 }
             };
             break;
         case OPackage::Download : {
+                connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput );
                 for ( QStringList::Iterator it = parameters->begin(); it != parameters->end(); ++it )
                 {
                     ipkg_packages_download( &m_ipkgArgs, (*it) );
                 }
             };
             break;
+        case OPackage::Info : {
+                connect( this, SIGNAL(signalIpkgStatus(char *)), receiver, slotOutput );
+                ipkg_packages_info( &m_ipkgArgs, (*parameters->begin()), &fIpkgStatus, 0x0 );
+            };
+            break;
+        case OPackage::Files : {
+                connect( this, SIGNAL(signalIpkgList(char *)), receiver, slotOutput );
+                ipkg_package_files( &m_ipkgArgs, (*parameters->begin()), &fIpkgFiles, 0x0 );
+            };
+            break;
         default : break;
     };
 
     return true;
 }
 
-void OIpkg::ipkgOutput( char *msg )
+void OIpkg::ipkgMessage( char *msg )
+{
+    emit signalIpkgMessage( msg );
+}
+
+void OIpkg::ipkgStatus( char *status )
+{
+    emit signalIpkgStatus( status );
+}
+
+void OIpkg::ipkgList( char *filelist )
 {
-    emit execOutput( msg );
+    emit signalIpkgList( filelist );
 }
 
 void OIpkg::loadConfiguration()
 {