--- apps/ktorrent/ktorrent.cpp +++ apps/ktorrent/ktorrent.cpp 2006/05/23 15:57:30 @@ -320,6 +320,7 @@ //update QM m_core->getQueueManager()->orderQueue(); +#if 0 dht::DHTBase & ht = Globals::instance().getDHT(); if (Settings::dhtSupport() && !ht.isRunning()) { @@ -335,6 +336,7 @@ ht.stop(); ht.start(KGlobal::dirs()->saveLocation("data","ktorrent") + "dht_table",Settings::dhtPort()); } +#endif if (Settings::useEncryption()) { --- libktorrent/ktorrent.kcfg +++ libktorrent/ktorrent.kcfg 2006/05/23 15:31:53 @@ -79,16 +79,6 @@ 0 - - - false - - - - 6881 - 0 - 65535 - 4 --- apps/ktorrent/pref.cpp 2007/06/18 11:48:38 1.1 +++ apps/ktorrent/pref.cpp 2007/06/18 11:50:55 @@ -173,14 +173,14 @@ Settings::setNumUploadSlots(dp->num_upload_slots->value()); Settings::setMinDiskSpace(dp->intMinDiskSpace->value()); Settings::setMaxSeedTime(dp->max_seed_time->value()); - +#if 0 if (Settings::dhtSupport() && dp->udp_tracker_port->value() == Settings::dhtPort()) { QString msg = i18n("The DHT port needs to be different from the UDP tracker port!"); KMessageBox::error(0, msg, i18n("Error")); return false; } - +#endif Settings::setUdpTrackerPort(dp->udp_tracker_port->value()); return true; @@ -228,8 +228,10 @@ updateData(); connect(gp->custom_ip_check, SIGNAL(toggled(bool)), this, SLOT(customIPChecked(bool))); +#if 0 connect(gp->use_dht, SIGNAL(toggled(bool)), this, SLOT(dhtChecked(bool))); +#endif connect(gp->use_encryption, SIGNAL(toggled(bool)), this, SLOT(useEncryptionChecked(bool))); } @@ -289,6 +291,7 @@ +#if 0 if (gp->use_dht->isChecked() && gp->dht_port->value() == Settings::udpTrackerPort()) { QString msg = i18n("The DHT port needs to be different from the UDP tracker port!"); @@ -299,6 +302,7 @@ Settings::setDhtSupport(gp->use_dht->isChecked()); Settings::setDhtPort(gp->dht_port->value()); +#endif Settings::setUseEncryption(gp->use_encryption->isChecked()); Settings::setAllowUnencryptedConnections(gp->allow_unencrypted->isChecked()); return true; @@ -322,8 +326,10 @@ void GeneralPrefPage::dhtChecked(bool on) { +#if 0 gp->dht_port->setEnabled(on); gp->dht_port_label->setEnabled(on); +#endif } void GeneralPrefPage::updateData() @@ -388,12 +394,12 @@ gp->custom_ip_check->setChecked(useExternalIP); gp->custom_ip->setEnabled(useExternalIP); gp->custom_ip_label->setEnabled(useExternalIP); - +#if 0 gp->use_dht->setChecked(Settings::dhtSupport()); gp->dht_port->setValue(Settings::dhtPort()); gp->dht_port->setEnabled(Settings::dhtSupport()); gp->dht_port_label->setEnabled(Settings::dhtSupport()); - +#endif gp->use_encryption->setChecked(Settings::useEncryption()); gp->allow_unencrypted->setChecked(Settings::allowUnencryptedConnections()); gp->allow_unencrypted->setEnabled(Settings::useEncryption()); --- apps/ktorrent/pref.cpp 2007/10/11 12:04:22 1.9 +++ apps/ktorrent/pref.cpp 2007/10/11 12:14:09 @@ -228,6 +228,7 @@ updateData(); connect(gp->custom_ip_check, SIGNAL(toggled(bool)), this, SLOT(customIPChecked(bool))); + gp->groupBox4->setShown(false); #if 0 connect(gp->use_dht, SIGNAL(toggled(bool)), this, SLOT(dhtChecked(bool))); --- plugins/webinterface/php_interface.cpp 2008/01/27 17:09:20 1.1 +++ plugins/webinterface/php_interface.cpp 2008/01/27 17:10:36 @@ -174,7 +174,7 @@ out << QString("\"max_upload_speed\" => \"%1\",").arg(core->getMaxUploadSpeed()); out << QString("\"max_downloads\" => \"%1\",").arg(Settings::maxDownloads()); out << QString("\"max_seeds\"=> \"%1\",").arg(Settings::maxSeeds()); - out << QString("\"dht_support\" => \"%1\",").arg(Settings::dhtSupport()); + out << QString("\"dht_support\" => \"%1\",").arg(false); out << QString("\"use_encryption\" => \"%1\"").arg(Settings::useEncryption()); out << ");\n}\n"; } @@ -208,35 +208,6 @@ switch(it.key()[0]) { case 'd': - if(it.key()=="dht") - { - if(it.data()=="start") - { - Settings::setDhtSupport(true); - } - else - { - Settings::setDhtSupport(false); - } - - dht::DHTBase & ht = Globals::instance().getDHT(); - if (Settings::dhtSupport() && !ht.isRunning()) - { - ht.start(kt::DataDir() + "dht_table",kt::DataDir() + "dht_key",Settings::dhtPort()); - ret = true; - } - else if (!Settings::dhtSupport() && ht.isRunning()) - { - ht.stop(); - ret = true; - } - else if (Settings::dhtSupport() && ht.getPort() != Settings::dhtPort()) - { - ht.stop(); - ht.start(kt::DataDir() + "dht_table",kt::DataDir() + "dht_key",Settings::dhtPort()); - ret = true; - } - } break; case 'e': if(it.key()=="encription")