Merge from BRANCH_1_0

5 files changed, 30 insertions, 5 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 45a6663..42093cf 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -1013,4 +1013,9 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
         InstallData *newitem = new InstallData();
         newitem->option = "D";
+        
+        // If local file, remove using package name, not filename
+        if ( p->isPackageStoredLocally() )
+            name = item->text();
+        
         if ( !p->isPackageStoredLocally() )
             newitem->packageName = p->getInstalledPackageName();
@@ -1042,4 +1047,8 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
             // Version available is older - remove only
             newitem->option = "D";
+           
+            // If local file, remove using package name, not filename
+            if ( p->isPackageStoredLocally() )
+                name = item->text();
         }
         else
@@ -1081,4 +1090,7 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
                     case 1: // Remove
                         newitem->option = "D";
+                        // If local file, remove using package name, not filename
+                        if ( p->isPackageStoredLocally() )
+                            name = item->text();
                         break;
                     case 2: // Reinstall or Upgrade
diff --git a/noncore/settings/aqpkg/opie-aqpkg.control b/noncore/settings/aqpkg/opie-aqpkg.control
index b8ad1e8..46bffdd 100644
--- a/noncore/settings/aqpkg/opie-aqpkg.control
+++ b/noncore/settings/aqpkg/opie-aqpkg.control
@@ -3,5 +3,4 @@ Files: bin/aqpkg pics/aqpkg apps/Settings/aqpkg.desktop
 Priority: optional
 Section: Settings
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Replaces: aqpkg
@@ -10,2 +9,3 @@ Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
 Description: A Package Manager
 
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index adda832..5a521d3 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -117,4 +117,5 @@ void Package :: setVersion( const QString &v )
 {
     version = v;
+            differentVersionAvailable = false;
 
     if ( localPackage )
diff --git a/noncore/settings/aqpkg/packagewin.cpp b/noncore/settings/aqpkg/packagewin.cpp
index 9553cd1..499d647 100644
--- a/noncore/settings/aqpkg/packagewin.cpp
+++ b/noncore/settings/aqpkg/packagewin.cpp
@@ -45,9 +45,10 @@ PackageWindow::PackageWindow( Package *package, const QString &server )
 	if ( package )
 	{
+        Package *local = package->getLocalPackage();
 		setCaption( package->getPackageName() );
 		QString destName;
-		if ( package->getLocalPackage() )
+		if ( local )
 		{
-			if ( package->getLocalPackage()->getInstalledTo() )
+			if ( local->getInstalledTo() )
 				destName = package->getLocalPackage()->getInstalledTo()->getDestinationName();
 		}
@@ -87,5 +88,5 @@ PackageWindow::PackageWindow( Package *package, const QString &server )
 			str.append( tr( "<p><b>Version Available</b> - " ) );
 			str.append( package->getVersion() );
-			if ( package->getLocalPackage() )
+			if ( local )
 			{
 				if ( package->isInstalled() )
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 4693db1..0282236 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -120,5 +120,5 @@ void Server :: readLocalIpks( Server *local )
 
         // Changed to display the filename (excluding the path)
-        QString packageName = Utils::getFilenameFromIpkFilename( file );
+        QString packageName = Utils::getPackageNameFromIpkFilename( file );      
         QString ver = Utils::getPackageVersionFromIpkFilename( file );
         Package *package = new Package( packageName );
@@ -245,4 +245,7 @@ void Server :: buildLocalPackages( Server *local )
     Package *curr;
     QListIterator<Package> it( packageList );
+    
+    QList<Package> *locallist = &local->getPackageList();
+    
     for ( ; it.current(); ++it )
     {
@@ -260,4 +263,12 @@ void Server :: buildLocalPackages( Server *local )
             if ( p )
             {
+                // Replace local version 
+                if ( curr->getVersion() > p->getVersion() )
+                {
+                    int pos = locallist->at();
+                    locallist->remove( p );
+                    locallist->insert( pos, curr );
+                }
+                
                 // Set some default stuff like size and things
                 if ( p->getInstalledVersion() == curr->getVersion() )