3 files changed, 27 insertions, 19 deletions

diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index fd75450..526de5e 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -55,9 +55,9 @@ QString Package :: toString()
 
     return ret;
 }
 
-void Package :: setStatus( QString &s )
+void Package :: setStatus( const QString &s )
 {
     status = s;
 
     if ( status.find( "installed" ) != -1 )
@@ -74,9 +74,9 @@ void Package :: setLocalPackage( Package *p )
         else
             differentVersionAvailable = false;
 }
 
-void Package :: setVersion( QString &v )
+void Package :: setVersion( const QString &v )
 {
     version = v;
 
     if ( localPackage )
@@ -85,19 +85,19 @@ void Package :: setVersion( QString &v )
         else
             differentVersionAvailable = false;
 }
 
-void Package :: setPackageName( QString &name )
+void Package :: setPackageName( const QString &name )
 {
     packageName = name;
 }
 
-void Package :: setDescription( QString &d )
+void Package :: setDescription( const QString &d )
 {
     description = d;
 }
 
-void Package :: setFilename( QString &f )
+void Package :: setFilename( const QString &f )
 {
 	filename = f;
 }
 
diff --git a/noncore/settings/aqpkg/package.h b/noncore/settings/aqpkg/package.h
index 7545818..f5a132f 100644
--- a/noncore/settings/aqpkg/package.h
+++ b/noncore/settings/aqpkg/package.h
@@ -34,19 +34,19 @@ public:
 	Package( char *name );
 	~Package();
 
     void setLocalPackage( Package *p );
-    void setPackageName( QString &name );
-    void setVersion( QString &v );
-    void setStatus( QString &s );
-    void setDescription( QString &d );
-    void setFilename( QString &f );
+    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( QString size )         { packageSize = size; }
-    void setSection( QString sect)              { section = sect; }
+    void setPackageSize( const QString &size )         { packageSize = size; }
+    void setSection( const QString &sect)              { section = sect; }
 
     Package *getLocalPackage()      { return localPackage; }
     QString getPackageName()        { return packageName; }
     QString getVersion()            { return version; }
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 7c3257b..726cf00 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -246,9 +246,23 @@ void Server :: buildLocalPackages( Server *local )
         if ( name.find( ".ipk" ) != -1 )
             name = Utils::getPackageNameFromIpkFilename( packageList[i].getFilename() );
 
         if ( local )
-            packageList[i].setLocalPackage( local->getPackage( name ) );
+        {
+            Package *p = local->getPackage( name );
+            packageList[i].setLocalPackage( p );
+            if ( p )
+            {
+                // Set some default stuff like size and things
+                if ( p->getInstalledVersion() == packageList[i].getVersion() )
+                {
+                    p->setPackageSize( packageList[i].getPackageSize() );
+                    p->setSection( packageList[i].getSection() );
+                    p->setDescription( packageList[i].getDescription() );
+                }
+            }
+            
+        }
         else
             packageList[i].setLocalPackage( 0 );
     }
 
@@ -282,15 +296,9 @@ QString Server :: toString()
         ret += "\n   " + packageList[i].toString();
 
 
     return ret;
-}                     /*
-void addAvailableSection( QString section )
-{
-  if ( DataManager::availableCategories.find( value ) == -1 )
-//                DataManager::availableCategories += "#" + value;
 }
-*/
 
 vector<Package> &Server::getPackageList()
 {
     return packageList;