1 files changed, 17 insertions, 0 deletions

diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index d929c39..089c3e3 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -1,44 +1,48 @@
 /***************************************************************************
                           datamgr.cpp  -  description
                              -------------------
     begin                : Thu Aug 29 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 #include <fstream>
 #include <iostream>
 using namespace std;
 
+#ifdef QWS
+#include <qpe/config.h>
+#endif
+
 #include <stdio.h>
 
 #include "datamgr.h"
 #include "global.h"
 
 
 DataManager::DataManager()
 {
         activeServer = "";
 }
 
 DataManager::~DataManager()
 {
 }
 
 Server *DataManager :: getServer( const char *name )
 {
         Server *s = 0;
         vector<Server>::iterator it = serverList.begin();
     while ( it != serverList.end() && s == 0 )
     {
                 if ( it->getServerName() == name )
                         s = &(*it);
 
@@ -49,90 +53,103 @@ Server *DataManager :: getServer( const char *name )
 }
 
 Destination *DataManager :: getDestination( const char *name )
 {
         Destination *d = 0;
         vector<Destination>::iterator it = destList.begin();
     while ( it != destList.end() && d == 0 )
     {
                 if ( it->getDestinationName() == name )
                         d = &(*it);
 
                 ++it;
         }
 
         return d;
 }
 
 void DataManager :: loadServers()
 {
     // First add our local server - not really a server but
     // the local config (which packages are installed)
     serverList.push_back( Server( LOCAL_SERVER, "" ) );
     serverList.push_back( Server( LOCAL_IPKGS, "" ) );
 
+#ifdef QWS
+    Config cfg( "aqpkg" );
+    cfg.setGroup( "destinations" );
+#endif
+
     // Read file from /etc/ipkg.conf
     QString ipkg_conf = IPKG_CONF;
     FILE *fp;
     fp = fopen( ipkg_conf, "r" );
     char line[130];
     QString lineStr;
     if ( fp == NULL )
     {
         cout << "Couldn't open " << ipkg_conf << "! err = " << fp << endl;
         return;
     }
     else
     {
         while ( fgets( line, sizeof line, fp) != NULL )
         {
             lineStr = line;
             if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) )
             {
                 char alias[20];
                 char url[100];
 
 
                 // Looks a little wierd but read up to the r of src (throwing it away),
                 // then read up to the next space and throw that away, the alias
                 // is next.
                 // Should Handle #src, # src, src, and combinations of
                 sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url );
                 Server s( alias, url );
                 if ( lineStr.startsWith( "src" ) )
                                 s.setActive( true );
                 else
                                 s.setActive( false );
 
                 serverList.push_back( s );
 
             }
             else if ( lineStr.startsWith( "dest" ) )
             {
                 char alias[20];
                 char path[50];
                 sscanf( lineStr, "%*[^ ] %s %s", alias, path );
                 Destination d( alias, path );
+                bool linkToRoot = true;
+#ifdef QWS
+                QString key = alias;
+                key += "_linkToRoot";
+                linkToRoot = cfg.readBoolEntry( key, true );
+#endif
+                d.linkToRoot( linkToRoot );
+                
                 destList.push_back( d );
             }
         }
     }
     fclose( fp );
 
     vector<Server>::iterator it;
     for ( it = serverList.begin() ; it != serverList.end() ; ++it )
         reloadServerData( it->getServerName() );
 }
 
 void DataManager :: reloadServerData( const char *serverName )
 {
     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