[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/23 17:37:12

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyMain.ml donkeyOptions.ml 

Log message:
        patch #5121

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.846&tr2=1.847&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml.diff?tr1=1.41&tr2=1.42&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.846 mldonkey/distrib/ChangeLog:1.847
--- mldonkey/distrib/ChangeLog:1.846    Sun May 21 07:55:24 2006
+++ mldonkey/distrib/ChangeLog  Tue May 23 17:37:12 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/05/23
+5121: EDK: Remove obsolete option emule_compression
+-------------------------------------------------------------------------------
 2006/05/21: version 2.7.6 = tag release-2-7-6
 5119: HTML, Options: Include Wiki link in options names
 5117: Telnet: replace "avail" by "last seen"/fix non-ASCII-filename column 
width
Index: mldonkey/src/networks/donkey/donkeyMain.ml
diff -u mldonkey/src/networks/donkey/donkeyMain.ml:1.50 
mldonkey/src/networks/donkey/donkeyMain.ml:1.51
--- mldonkey/src/networks/donkey/donkeyMain.ml:1.50     Fri May 19 23:43:54 2006
+++ mldonkey/src/networks/donkey/donkeyMain.ml  Tue May 23 17:37:12 2006
@@ -158,8 +158,7 @@
   ];
 
   emule_info.DonkeyProtoClient.EmuleClientInfo.tags <- [
-    int_tag (Field_UNKNOWN "compression") 
-      (if !!emule_compression then m.emule_compression else 0);
+    int_tag (Field_UNKNOWN "compression") m.emule_compression;
     int_tag (Field_UNKNOWN "udpver") m.emule_udpver;
     int_tag (Field_UNKNOWN "udpport") (!!donkey_port+4);
     int_tag (Field_UNKNOWN "sourceexchange") m.emule_sourceexchange;
Index: mldonkey/src/networks/donkey/donkeyOptions.ml
diff -u mldonkey/src/networks/donkey/donkeyOptions.ml:1.41 
mldonkey/src/networks/donkey/donkeyOptions.ml:1.42
--- mldonkey/src/networks/donkey/donkeyOptions.ml:1.41  Tue May 16 22:02:54 2006
+++ mldonkey/src/networks/donkey/donkeyOptions.ml       Tue May 23 17:37:12 2006
@@ -58,9 +58,6 @@
 let reliable_sources = define_option donkey_section ["reliable_sources"]
     "Should mldonkey try to detect sources responsible for corruption and ban 
them" bool_option true
 
-let emule_compression = define_option donkey_section ["emule_compression"]
-  "Should mldonkey accept compressed packets from emule" bool_option true
-
 let ban_identity_thieves = define_option donkey_section 
["ban_identity_thieves"]
   "Should mldonkey try to detect sources masquerading as others and ban them" 
bool_option true