diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:31 -0600 |
| commit | 06227c5420ce8eeef7bd44406a395188c61e1703 (patch) | |
| tree | c18c25b31413479e63fec92f61067b95759fc3b0 /tdecore/network | |
| parent | ce5d3d7fd554b9832a69350cffa8d79c5002753e (diff) | |
| parent | 70d7c59d2ac9ad3718f92a20c07937d3b6cfb928 (diff) | |
| download | tdelibs-06227c5420ce8eeef7bd44406a395188c61e1703.tar.gz tdelibs-06227c5420ce8eeef7bd44406a395188c61e1703.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/network')
| -rw-r--r-- | tdecore/network/kresolver.cpp | 2 | ||||
| -rw-r--r-- | tdecore/network/kresolverstandardworkers.cpp | 2 | ||||
| -rw-r--r-- | tdecore/network/ksrvresolverworker.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index cb2e21996..a6ca8e45c 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -940,7 +940,7 @@ static TQString ToUnicode(const TQString& label); static TQStringList *KResolver_initIdnDomains() { - const char *kde_use_idn = getenv("KDE_USE_IDN"); + const char *kde_use_idn = getenv("TDE_USE_IDN"); if (!kde_use_idn) kde_use_idn = "ac:at:br:cat:ch:cl:cn:de:dk:fi:gr:hu:info:io:is:jp:kr:li:lt:museum:org:no:se:sh:th:tm:tw:vn"; return new TQStringList(TQStringList::split(':', TQString::fromLatin1(kde_use_idn).lower())); diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index 5f0229969..77c085e08 100644 --- a/tdecore/network/kresolverstandardworkers.cpp +++ b/tdecore/network/kresolverstandardworkers.cpp @@ -63,7 +63,7 @@ static bool hasIPv6() #ifndef AF_INET6 return false; #else - if (getenv("KDE_NO_IPV6") != 0L) + if (getenv("TDE_NO_IPV6") != 0L) return false; int fd = ::socket(AF_INET6, SOCK_STREAM, 0); diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp index f3166b982..419873d4f 100644 --- a/tdecore/network/ksrvresolverworker.cpp +++ b/tdecore/network/ksrvresolverworker.cpp @@ -245,7 +245,7 @@ namespace KNetwork void initSrvWorker() KDE_NO_EXPORT; void initSrvWorker() { - if (getenv("KDE_NO_SRV") != NULL) + if (getenv("TDE_NO_SRV") != NULL) return; KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KSrvResolverWorker>); |