Disconnect signals after command executes to prevent bug where messages show up multiple times in install dialog

1 files changed, 7 insertions, 0 deletions

diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index 417ee95..127204d 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -254,443 +254,450 @@ OPackageList *OIpkg::availablePackages( const QString &server )
     // Open package list file
     QFile f( listsDir + "/" + server );
     if ( !f.open( IO_ReadOnly ) )
         return NULL;
     QTextStream t( &f );
 
     // Process all information in package list file
     OPackage *package = NULL;
     QString line = t.readLine();
     while ( !t.eof() )
     {
         // Determine key/value pair
         int pos = line.find( ':', 0 );
         QString key;
         if ( pos > -1 )
             key = line.mid( 0, pos );
         else
             key = QString::null;
         QString value = line.mid( pos+2, line.length()-pos );
 
         // Allocate new package and insert into list
         if ( package == NULL  && !key.isEmpty() )
         {
             package = new OPackage( value );
             package->setSource( server );
             pl->append( package );
         }
 
         // Update package data
         if ( key == "Package" )
                 package->setName( value );
         else if ( key == "Version" )
             package->setVersion( value );
         else if ( key == "Section" )
             package->setCategory( value );
             //DataManager::setAvailableCategories( value );
         else if ( key.isEmpty() && value.isEmpty() )
             package = NULL;
 
         // Skip past all description lines
         if ( key == "Description" )
         {
             line = t.readLine();
             while ( !line.isEmpty() && line.find( ':', 0 ) == -1 && !t.eof() )
                 line = t.readLine();
         }
         else
             line = t.readLine();
     }
 
     f.close();
 
     return pl;
 }
 
 OPackageList *OIpkg::installedPackages( const QString &destName, const QString &destPath )
 {
     // Load Ipkg configuration info if not already cached
     if ( !m_confInfo )
         loadConfiguration();
 
     // Build new server list (caller is responsible for deleting)
     OPackageList *pl = new OPackageList;
 
     // Open status file
     QString path = destPath;
     if ( path.right( 1 ) != "/" )
         path.append( "/" );
     path.append( IPKG_STATUS_PATH );
 
     QFile f( path );
     if ( !f.open( IO_ReadOnly ) )
         return NULL;
     QTextStream t( &f );
 
     // Process all information in status file
     bool newPackage = false;
     QString line = t.readLine();
     QString name;
     QString version;
     QString status;
 
     while ( !t.eof() )
     {
         // Determine key/value pair
         int pos = line.find( ':', 0 );
         QString key;
         if ( pos > -1 )
             key = line.mid( 0, pos );
         else
             key = QString::null;
         QString value = line.mid( pos+2, line.length()-pos );
 
         // Allocate new package and insert into list
         if ( newPackage  && !key.isEmpty() )
         {
             // Add to list only if it has a valid name and is installed
             if ( !name.isNull() && status.contains( " installed" ) )
             {
                 pl->append( new OPackage( name, QString::null, version, QString::null, destName ) );
                 name = QString::null;
                 version = QString::null;
                 status = QString::null;
 
                 newPackage = false;
             }
         }
 
         // Update package data
         if ( key == "Package" )
             name = value;
         else if ( key == "Version" )
             version = value;
         else if ( key == "Status" )
             status = value;
         else if ( key.isEmpty() && value.isEmpty() )
             newPackage = true;
 
         // Skip past all description lines
         if ( key == "Description" )
         {
             line = t.readLine();
             while ( !line.isEmpty() && line.find( ':', 0 ) == -1 && !t.eof() )
                 line = t.readLine();
         }
         else
             line = t.readLine();
     }
 
     f.close();
 
     // Make sure to add to list last entry
     if ( !name.isNull() && status.contains( " installed" ) )
         pl->append( new OPackage( name, QString::null, version, QString::null, destName ) );
 
     return pl;
 }
 
 OConfItem *OIpkg::findConfItem( OConfItem::Type type, const QString &name )
 {
     // Find configuration item in list
     OConfItemListIterator configIt( *m_confInfo );
     OConfItem *config = 0l;
     for ( ; configIt.current(); ++configIt )
     {
         config = configIt.current();
         if ( config->type() == type && config->name() == name )
             break;
     }
 
     if ( config && config->type() == type && config->name() == name )
         return config;
 
     return 0l;
 }
 
 bool OIpkg::executeCommand( OPackage::Command command, const QStringList &parameters, const QString &destination,
                             const QObject *receiver, const char *slotOutput, bool rawOutput )
 {
     if ( command == OPackage::NotDefined )
         return false;
 
     // Set ipkg run-time options/arguments
     m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS );
     m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL );
     // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE );
     m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE );
     m_ipkgArgs.verbosity = m_ipkgExecVerbosity;
     if ( m_ipkgArgs.dest )
         free( m_ipkgArgs.dest );
     if ( !destination.isNull() )
     {
         int len = destination.length() + 1;
         m_ipkgArgs.dest = (char *)malloc( len );
         strncpy( m_ipkgArgs.dest, destination, destination.length() );
         m_ipkgArgs.dest[ len - 1 ] = '\0';
     }
     else
         m_ipkgArgs.dest = 0l;
 
     // Connect output signal to widget
 
     if ( !rawOutput )
     {
         // TODO - connect to local slot and parse output before emitting signalIpkgMessage
     }
 
     switch( command )
     {
         case OPackage::Update : {
                 connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
                 ipkg_lists_update( &m_ipkgArgs );
+                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
             };
             break;
         case OPackage::Upgrade : {
                 connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
                 ipkg_packages_upgrade( &m_ipkgArgs );
 
                 // Re-link non-root destinations to make sure everything is in sync
                 OConfItemList *destList = destinations();
                 OConfItemListIterator it( *destList );
                 for ( ; it.current(); ++it )
                 {
                     OConfItem *dest = it.current();
                     if ( dest->name() != "root" )
                         linkPackageDir( dest->name() );
                 }
                 delete destList;
+                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
             };
             break;
         case OPackage::Install : {
                 connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
                 for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it )
                 {
                     ipkg_packages_install( &m_ipkgArgs, (*it) );
                 }
                 if ( destination != "root" )
                     linkPackageDir( destination );
+                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
             };
             break;
         case OPackage::Remove : {
                 connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
 
                 // Get list of destinations for unlinking of packages not installed to root
                 OConfItemList *destList = destinations();
 
                 for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it )
                 {
                     unlinkPackage( (*it), destList );
                     ipkg_packages_remove( &m_ipkgArgs, (*it), true );
                 }
 
                 delete destList;
+                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
             };
             break;
         case OPackage::Download : {
                 connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
                 for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it )
                 {
                     ipkg_packages_download( &m_ipkgArgs, (*it) );
                 }
+                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
             };
             break;
         case OPackage::Info : {
                 connect( this, SIGNAL(signalIpkgStatus(const QString &)), receiver, slotOutput );
                 ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0l );
+                disconnect( this, SIGNAL(signalIpkgStatus(const QString &)), 0, 0 );
             };
             break;
         case OPackage::Files : {
                 connect( this, SIGNAL(signalIpkgList(const QString &)), receiver, slotOutput );
                 ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0l );
+                disconnect( this, SIGNAL(signalIpkgList(const QString &)), 0, 0 );
             };
             break;
         default : break;
     };
 
     return true;
 }
 
 void OIpkg::ipkgMessage( char *msg )
 {
     emit signalIpkgMessage( msg );
 }
 
 void OIpkg::ipkgStatus( char *status )
 {
     emit signalIpkgStatus( status );
 }
 
 void OIpkg::ipkgList( char *filelist )
 {
     emit signalIpkgList( filelist );
 }
 
 void OIpkg::loadConfiguration()
 {
     if ( m_confInfo )
         delete m_confInfo;
 
     // Load configuration item list
     m_confInfo = new OConfItemList();
 
     QStringList confFiles;
     QDir confDir( IPKG_CONF_DIR );
     if ( confDir.exists() )
     {
         confDir.setNameFilter( "*.conf" );
         confDir.setFilter( QDir::Files );
         confFiles = confDir.entryList( "*.conf", QDir::Files );
     }
     confFiles << IPKG_CONF;
 
     QStringList::Iterator lastFile = confFiles.end();
     for ( QStringList::Iterator it = confFiles.begin(); it != lastFile; ++it )
     {
         // Create absolute file path if necessary
         QString absFile = (*it);
         if ( !absFile.startsWith( "/" ) )
             absFile.prepend( QString( IPKG_CONF_DIR ) + "/" );
 
         // Read in file
         QFile f( absFile );
         if ( f.open( IO_ReadOnly ) )
         {
             QTextStream s( &f );
             while ( !s.eof() )
             {
 
                 QString line = s.readLine().simplifyWhiteSpace();
 
                 // Parse line and save info to the conf options list
                 if ( !line.isEmpty() )
                 {
                     // Strip leading comment marker if exists
                     bool comment = false;
                     if ( line.startsWith( "#" ) )
                     {
                         line.remove( 0, 1 );
                         line = line.simplifyWhiteSpace();
                         comment = true;
                     }
 
                     bool recognizedOption = true;
                     int pos = line.find( ' ', 1 )  + 1;
                     int endpos = line.find( ' ', pos );
 
                     // Name
                     QString name = line.mid( pos, endpos - pos );
 
                     // Value
                     QString value = "";
                     if ( endpos > -1 )
                         value = line.right( line.length() - endpos - 1 );
 
                     // Active
                     bool active = !comment;
 
                     // Type
                     // For options w/type = Other, the mapping is as follows:
                     //    name = typeStr (e.g. "lists_dir")
                     //    value = value
                     //    features = name (from configuration file)
 
                     QString typeStr = line.left( pos - 1 );
                     OConfItem::Type type;
                     QString features;
                     if ( typeStr == "src" )
                         type = OConfItem::Source;
                     else if ( typeStr == "src/gz" )
                     {
                         type = OConfItem::Source;
                         features = "Compressed";
                     }
                     else if ( typeStr == "dest" )
                         type = OConfItem::Destination;
                     else if ( typeStr == "option" )
                         type = OConfItem::Option;
                     else if ( typeStr == "arch" )
                         type = OConfItem::Arch;
                     else if ( typeStr == "lists_dir" )
                     {
                         type = OConfItem::Other;
                         features = name;
                         name = typeStr;
 
                         // Default value when not defined
                         if ( value == QString::null || value == "" )
                             value = IPKG_PKG_PATH;
                     }
                     else
                         recognizedOption = false;
 
                     // Add to list
                     if ( recognizedOption )
                         m_confInfo->append( new OConfItem( type, name, value, features, active ) );
                 }
             }
 
             f.close();
         }
     }
 
     // Load Ipkg execution options from application configuration file
     if ( m_config )
     {
         m_config->setGroup( "Ipkg" );
         m_ipkgExecOptions = m_config->readNumEntry( "ExecOptions", m_ipkgExecOptions );
         m_ipkgExecVerbosity = m_config->readNumEntry( "Verbosity", m_ipkgExecVerbosity );
     }
 }
 
 OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter )
 {
     // Load Ipkg configuration info if not already cached
     if ( !m_confInfo )
         loadConfiguration();
 
     // Build new server list (caller is responsible for deleting)
     OConfItemList *sl = new OConfItemList;
 
     // If typefilter is empty, retrieve all items
     bool retrieveAll = ( typefilter == OConfItem::NotDefined );
 
     // Parse configuration info for servers
     OConfItemListIterator it( *m_confInfo );
     for ( ; it.current(); ++it )
     {
         OConfItem *item = it.current();
         if ( retrieveAll || item->type() == typefilter )
         {
             sl->append( item );
         }
     }
 
     return sl;
 }
 
 const QString &OIpkg::rootPath()
 {
     if ( m_rootPath.isEmpty() )
     {
         OConfItem *rootDest = findConfItem( OConfItem::Destination, "root" );
         rootDest ? m_rootPath = rootDest->value()
                  : m_rootPath = '/';
         if ( m_rootPath.right( 1 ) == '/' )
             m_rootPath.truncate( m_rootPath.length() - 1 );
     }
     return m_rootPath;
 }
 
 void OIpkg::linkPackageDir( const QString &dest )
 {
     if ( !dest.isNull() )
     {
         OConfItem *destConfItem = findConfItem( OConfItem::Destination, dest );
 
         emit signalIpkgMessage( tr( "Linking packages installed in: %1" ).arg( dest ) );
 
         // Set package destination directory
         QString destDir = destConfItem->value();
         QString destInfoDir = destDir;
         if ( destInfoDir.right( 1 ) != '/' )
             destInfoDir.append( '/' );