Fixed a bug where if a package was removed from the local view the packages didn't get relinked properly

3 files changed, 36 insertions, 32 deletions

diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index 089c3e3..f342aff 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -137,22 +137,22 @@ void DataManager :: loadServers()
 
-    vector<Server>::iterator it;
-    for ( it = serverList.begin() ; it != serverList.end() ; ++it )
-        reloadServerData( it->getServerName() );
+    reloadServerData( );
 }
 
-void DataManager :: reloadServerData( const char *serverName )
+void DataManager :: reloadServerData( )
 {
-    Server *s = getServer( serverName );
-    // Now we've read the config file in we need to read the servers
-    // The local server is a special case. This holds the contents of the
-    // status files the number of which depends on how many destinations
-    // we've set up
-    // The other servers files hold the contents of the server package list
-    if ( s->getServerName() == LOCAL_SERVER )
-        s->readStatusFile( destList );
-    else if ( s->getServerName() == LOCAL_IPKGS )
-    	s->readLocalIpks( getServer( LOCAL_SERVER ) );
-    else
-        s->readPackageFile( getServer( LOCAL_SERVER ) );
-
+	vector<Server>::iterator it = serverList.begin();
+    for ( it = serverList.begin() ; it != serverList.end() ; ++it )
+    {
+    	// Now we've read the config file in we need to read the servers
+    	// The local server is a special case. This holds the contents of the
+    	// status files the number of which depends on how many destinations
+    	// we've set up
+    	// The other servers files hold the contents of the server package list
+    	if ( it->getServerName() == LOCAL_SERVER )
+        	it->readStatusFile( destList );
+    	else if ( it->getServerName() == LOCAL_IPKGS )
+    		it->readLocalIpks( getServer( LOCAL_SERVER ) );
+    	else
+        	it->readPackageFile( getServer( LOCAL_SERVER ) );
+	}
 }
diff --git a/noncore/settings/aqpkg/datamgr.h b/noncore/settings/aqpkg/datamgr.h
index eb802b5..8c6fb0d 100644
--- a/noncore/settings/aqpkg/datamgr.h
+++ b/noncore/settings/aqpkg/datamgr.h
@@ -51,3 +51,3 @@ public:
     void loadServers();
-    void reloadServerData( const char *sn );
+    void reloadServerData( );
 
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 02e4e73..b5d7352 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -217,3 +217,2 @@ void NetworkPackageManager :: serverSelected( int )
     Server *s = dataMgr->getServer( serverName );
-//    dataMgr->setActiveServer( serverName );
 
@@ -223,2 +222,3 @@ void NetworkPackageManager :: serverSelected( int )
     {
+
         QString text = "";
@@ -237,2 +237,3 @@ void NetworkPackageManager :: serverSelected( int )
             {
+
                 if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 )
@@ -266,7 +267,14 @@ void NetworkPackageManager :: serverSelected( int )
         
-        new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() );
-        if ( it->getLocalPackage() )
-        {
-			if ( it->isInstalled() )
-	            new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() );
+		if ( serverName == LOCAL_SERVER )
+		{
+        	new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() );
+		}
+		else
+		{
+        	new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() );
+        	if ( it->getLocalPackage() )
+        	{
+				if ( it->isInstalled() )
+	            	new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() );
+			}
 		}
@@ -319,3 +327,3 @@ void NetworkPackageManager :: updateServer()
     // Reload data
-    dataMgr->reloadServerData( serversList->currentText() );
+    dataMgr->reloadServerData();
     serverSelected(-1);
@@ -348,5 +356,3 @@ void NetworkPackageManager :: upgradePackages()
         // Reload data
-        dataMgr->reloadServerData( LOCAL_SERVER );
-
-        dataMgr->reloadServerData( serversList->currentText() );
+        dataMgr->reloadServerData();
         serverSelected(-1);
@@ -438,3 +444,3 @@ void NetworkPackageManager :: downloadPackage()
 
-    dataMgr->reloadServerData( LOCAL_IPKGS );
+    dataMgr->reloadServerData();
     serverSelected( -1 );
@@ -479,5 +485,3 @@ void NetworkPackageManager :: applyChanges()
     // Reload data
-    dataMgr->reloadServerData( LOCAL_SERVER );
-
-    dataMgr->reloadServerData( serversList->currentText() );
+    dataMgr->reloadServerData();
     serverSelected(-1);