author | andyq <andyq> | 2002-11-01 12:41:03 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-01 12:41:03 (UTC) |
commit | 0e34499726f7fa275363988ea466d13aab09f544 (patch) (side-by-side diff) | |
tree | 20403963ae3c1b315c2d1fd4b23a33754289287c /noncore/settings | |
parent | 4c5a56dbaddb3ac6b587c61a8ba6841987cf60fa (diff) | |
download | opie-0e34499726f7fa275363988ea466d13aab09f544.zip opie-0e34499726f7fa275363988ea466d13aab09f544.tar.gz opie-0e34499726f7fa275363988ea466d13aab09f544.tar.bz2 |
Fixed a bug where if a package was removed from the local view the packages didn't get relinked properly
-rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 22 | ||||
-rw-r--r-- | noncore/settings/aqpkg/datamgr.h | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 22 |
3 files changed, 25 insertions, 21 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,10 +137,10 @@ 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( ) +{ + vector<Server>::iterator it = serverList.begin(); + for ( it = serverList.begin() ; it != serverList.end() ; ++it ) { - Server *s = getServer( serverName ); // Now we've read the config file in we need to read the servers @@ -150,9 +150,9 @@ void DataManager :: reloadServerData( const char *serverName ) // 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 ) ); + if ( it->getServerName() == LOCAL_SERVER ) + it->readStatusFile( destList ); + else if ( it->getServerName() == LOCAL_IPKGS ) + it->readLocalIpks( getServer( LOCAL_SERVER ) ); else - s->readPackageFile( getServer( LOCAL_SERVER ) ); - + 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,2 +267,8 @@ void NetworkPackageManager :: serverSelected( int ) + if ( serverName == LOCAL_SERVER ) + { + new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() ); + } + else + { new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() ); @@ -272,2 +279,3 @@ void NetworkPackageManager :: serverSelected( int ) } + } packagesList->insertItem( item ); @@ -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); |