| author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
| commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (side-by-side diff) | |
| tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/networkinterface.cpp | |
| parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
| download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 | |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
Diffstat (limited to 'library/networkinterface.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | library/networkinterface.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/library/networkinterface.cpp b/library/networkinterface.cpp index 56a0e5b..2b5c77e 100644 --- a/library/networkinterface.cpp +++ b/library/networkinterface.cpp @@ -1,10 +1,10 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** @@ -42,13 +42,15 @@ bool NetworkInterface::isActive( Config& cfg ) const char devname[80]; while ( fgets( line, 1024, f ) ) { if ( sscanf(line," %[^:]:", devname)==1 ) { if ( devname == dev || devname == dev0 ) { fclose(f); +#ifdef QWS Network::writeProxySettings( cfg ); +#endif return TRUE; } } } fclose(f); } |