4 files changed, 16 insertions, 16 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 6ea619c..fb40d52 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -630,50 +630,48 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
        // Apply show only uninstalled packages filter
        if ( showUninstalledPkgs && package->isInstalled() )
            continue;
        // Apply show only installed packages filter
        if ( showInstalledPkgs && !package->isInstalled() )
            continue;
        // Apply show only new installed packages filter
        if ( showUpgradedPkgs )
        {
-            if ( !package->isInstalled() ||
+            if ( !package->isInstalled() || !package->getNewVersionAvailable() )
-                 compareVersions( package->getInstalledVersion(), package->getVersion() ) != 1 )
                continue;
        }
        // Apply the section filter
        if ( categoryFilterEnabled && categoryFilter != "" )
        {
            if ( package->getSection() == "" || categoryFilter.find( package->getSection().lower() ) == -1 )
                continue;
        }
        // If the local server, only display installed packages
        if ( serverName == LOCAL_SERVER && !package->isInstalled() )
            continue;
        QCheckListItem *item = new QCheckListItem( packagesList, package->getPackageName(),
                                                   QCheckListItem::CheckBox );
        if ( package->isInstalled() )
        {
            // If a different version of package is available, show update available icon
            // Otherwise, show installed icon
-            if ( package->getVersion() != package->getInstalledVersion() &&
+            if ( package->getNewVersionAvailable())
-                 compareVersions( package->getInstalledVersion(), package->getVersion() ) == 1)
            {
                item->setPixmap( 0, updatedIcon );
            }
            else
            {
                item->setPixmap( 0, installedIcon );
            }
            QString destName = "";
            if ( package->getLocalPackage() )
            {
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index 83e0706..3395870 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -41,24 +41,25 @@ Package::Package( char *name )
    version = "N/A";
    description = "N/A";
    packageSize = "N/A";
    section = "N/A";
    
    localPackage = 0;
    installed = false;
    packageStoredLocally = false;
    installedToRoot = false;
    installed = false;
    installedTo = 0;
+    differentVersionAvailable = false;
 }
 Package::~Package()
 {
 }
 QString Package :: toString()
 {
    QString ret = "Package - " + getPackageName() +
           "\n              version - " + getVersion();
    if ( localPackage )
@@ -80,36 +81,36 @@ void Package :: setStatus( const QString &s )
    state_status = status.mid( three ).stripWhiteSpace( );
    if ( state_status == "installed" )
        installed = true;
 }
 void Package :: setLocalPackage( Package *p )
 {
    localPackage = p;
    if ( localPackage )
-        if ( localPackage->getVersion() != getVersion() )
+        if ( localPackage->getVersion() < getVersion() && !installed )
            differentVersionAvailable = true;
        else
            differentVersionAvailable = false;
 }
 void Package :: setVersion( const QString &v )
 {
    version = v;
    if ( localPackage )
-        if ( localPackage->getVersion() != getVersion() )
+        if ( localPackage->getVersion() < getVersion() && !installed )
            differentVersionAvailable = true;
        else
            differentVersionAvailable = false;
 }
 void Package :: setPackageName( const QString &name )
 {
    packageName = name;
 }
 void Package :: setDescription( const QString &d )
 {
diff --git a/noncore/settings/aqpkg/package.h b/noncore/settings/aqpkg/package.h
index f5a132f..110ae91 100644
--- a/noncore/settings/aqpkg/package.h
+++ b/noncore/settings/aqpkg/package.h
@@ -38,33 +38,34 @@ public:
    void setPackageName( const QString &name );
    void setVersion( const QString &v );
    void setStatus( const QString &s );
    void setDescription( const QString &d );
    void setFilename( const QString &f );
                void setPackageStoredLocally( bool local ){ packageStoredLocally = local; }
    void setInstalledToRoot( bool root )        { installedToRoot = root; }
    void setInstalledTo( Destination *d )       { installedTo = d; }
    void setDependancies( QString &deps )       { dependancies = deps; }
    void setPackageSize( const QString &size )         { packageSize = size; }
    void setSection( const QString &sect)              { section = sect; }
-    Package *getLocalPackage()      { return localPackage; }
+    Package *getLocalPackage()       { return localPackage; }
-    QString getPackageName()        { return packageName; }
+    QString getPackageName()         { return packageName; }
-    QString getVersion()            { return version; }
+    QString getVersion()             { return version; }
-    QString getStatus()             { return status; }
+    QString getStatus()              { return status; }
-    QString getDescription()        { return description; }
+    QString getDescription()         { return description; }
-    QString getFilename()           { return filename; }
+    QString getFilename()            { return filename; }
-    QString getDependancies()       { return dependancies; }
+    QString getDependancies()        { return dependancies; }
-    QString getPackageSize()        { return packageSize; }
+    QString getPackageSize()         { return packageSize; }
-    QString getSection()            { return section; }
+    QString getSection()             { return section; }
+    bool    getNewVersionAvailable() { return differentVersionAvailable; }
    bool isInstalled();
                bool isPackageStoredLocally(){ return packageStoredLocally; }
    bool isInstalledToRoot()     { return installedToRoot; }
    QString getInstalledVersion();
    QString getInstalledPackageName();
    Destination *getInstalledTo()   { return installedTo; }
    QString toString();
 private:
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 9a239a5..e2b8096 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -175,25 +175,25 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR
            currPackage = getPackage( value );
            if ( !currPackage )
            {
                Package *package = new Package( value );
                packageList.append( package );
                currPackage = package;
                currPackage->setInstalledTo( dest );
                if ( installingToRoot )
                    currPackage->setInstalledToRoot( true );
            }
            else
            {
-                if (currPackage->getStatus().find( "deinstall" ) != -1 )
+                if ( currPackage->isInstalled() )
                    currPackage->setInstalledTo( dest );
            }
        }
        else if ( key == "Version" )
        {
            if ( currPackage )
                currPackage->setVersion( value );
        }
        else if ( key == "Status" )
        {
            if ( currPackage )
                currPackage->setStatus( value );