summaryrefslogtreecommitdiff
authorandyq <andyq>2002-11-21 18:11:40 (UTC)
committer andyq <andyq>2002-11-21 18:11:40 (UTC)
commit5e806f161bc0bde64d5058dab4850c45aeba2cdf (patch) (side-by-side diff)
treee93f10fe052da154b1cfe42bdbf5f29ef8749bc4
parent5b0e9483f45967da95dc05d770197c631b959070 (diff)
downloadopie-5e806f161bc0bde64d5058dab4850c45aeba2cdf.zip
opie-5e806f161bc0bde64d5058dab4850c45aeba2cdf.tar.gz
opie-5e806f161bc0bde64d5058dab4850c45aeba2cdf.tar.bz2
Fixed bug where installed and local ipkg servers weren't shown (hopefully)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.cpp3
-rw-r--r--noncore/settings/aqpkg/server.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 0814121..cf94628 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -80,25 +80,26 @@ void NetworkPackageManager :: timerEvent ( QTimerEvent * )
killTimer( timerId );
// Add server names to listbox
updateData();
}
void NetworkPackageManager :: updateData()
{
- serversList->clear();
+ serversList->clear();
packagesList->clear();
vector<Server>::iterator it;
int activeItem = -1;
int i;
for ( i = 0, it = dataMgr->getServerList().begin() ; it != dataMgr->getServerList().end() ; ++it, ++i )
{
+ cout << "Adding " << it->getServerName() << " to combobox" << endl;
if ( !it->isServerActive() )
{
i--;
continue;
}
serversList->insertItem( it->getServerName() );
if ( it->getServerName() == currentlySelectedServer )
activeItem = i;
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 726cf00..58407d5 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -40,16 +40,17 @@ using namespace std;
#include "global.h"
Server :: Server( const char *name, const char *url )
{
serverName = name;
serverUrl = url;
packageFile = IPKG_DIR;
+ active = true;
packageFile += "lists/" + serverName;
}
Server :: ~Server()
{
cleanUp();
}