author | drw <drw> | 2003-04-20 23:58:21 (UTC) |
---|---|---|
committer | drw <drw> | 2003-04-20 23:58:21 (UTC) |
commit | 9163bfcc25b78477a75a153f2a75be30ad297c6a (patch) (unidiff) | |
tree | 668e10a9bb0ca7937e3f630a62d3afbbbbf06438 /noncore/settings/aqpkg/mainwin.cpp | |
parent | 6b78c023f67433b8f38d9e77598b8530988bfec8 (diff) | |
download | opie-9163bfcc25b78477a75a153f2a75be30ad297c6a.zip opie-9163bfcc25b78477a75a153f2a75be30ad297c6a.tar.gz opie-9163bfcc25b78477a75a153f2a75be30ad297c6a.tar.bz2 |
Finally fixed it so that packages are not incorrectly marked as having an update available
Diffstat (limited to 'noncore/settings/aqpkg/mainwin.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 6 |
1 files changed, 2 insertions, 4 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 | |||
@@ -636,14 +636,13 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) | |||
636 | if ( showInstalledPkgs && !package->isInstalled() ) | 636 | if ( showInstalledPkgs && !package->isInstalled() ) |
637 | continue; | 637 | continue; |
638 | 638 | ||
639 | // Apply show only new installed packages filter | 639 | // Apply show only new installed packages filter |
640 | if ( showUpgradedPkgs ) | 640 | if ( showUpgradedPkgs ) |
641 | { | 641 | { |
642 | if ( !package->isInstalled() || | 642 | if ( !package->isInstalled() || !package->getNewVersionAvailable() ) |
643 | compareVersions( package->getInstalledVersion(), package->getVersion() ) != 1 ) | ||
644 | continue; | 643 | continue; |
645 | } | 644 | } |
646 | 645 | ||
647 | // Apply the section filter | 646 | // Apply the section filter |
648 | if ( categoryFilterEnabled && categoryFilter != "" ) | 647 | if ( categoryFilterEnabled && categoryFilter != "" ) |
649 | { | 648 | { |
@@ -660,14 +659,13 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) | |||
660 | QCheckListItem::CheckBox ); | 659 | QCheckListItem::CheckBox ); |
661 | 660 | ||
662 | if ( package->isInstalled() ) | 661 | if ( package->isInstalled() ) |
663 | { | 662 | { |
664 | // If a different version of package is available, show update available icon | 663 | // If a different version of package is available, show update available icon |
665 | // Otherwise, show installed icon | 664 | // Otherwise, show installed icon |
666 | if ( package->getVersion() != package->getInstalledVersion() && | 665 | if ( package->getNewVersionAvailable()) |
667 | compareVersions( package->getInstalledVersion(), package->getVersion() ) == 1) | ||
668 | { | 666 | { |
669 | 667 | ||
670 | item->setPixmap( 0, updatedIcon ); | 668 | item->setPixmap( 0, updatedIcon ); |
671 | } | 669 | } |
672 | else | 670 | else |
673 | { | 671 | { |