[Mldonkey-commits] mldonkey config/Makefile.in distrib/ChangeLog s...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/11 14:43:20

Modified files:
        config         : Makefile.in 
        distrib        : ChangeLog 
        src/networks/donkey: donkeyClient.ml donkeyInteractive.ml 
                             donkeyMain.ml 
Removed files:
        src/networks/donkey: donkeyNeighbours.ml donkeyNeighbours.mli 

Log message:
        patch #4903

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.in.diff?tr1=1.147&tr2=1.148&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.729&tr2=1.730&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.92&tr2=1.93&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml.diff?tr1=1.46&tr2=1.47&r1=text&r2=text

Patches:
Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.147 mldonkey/config/Makefile.in:1.148
--- mldonkey/config/Makefile.in:1.147   Thu Feb  9 11:46:53 2006
+++ mldonkey/config/Makefile.in Sat Feb 11 14:43:20 2006
@@ -324,7 +324,6 @@
   $(SRC_DONKEY)/donkeyShare.ml \
   $(SRC_DONKEY)/donkeyReliability.ml \
   $(SRC_DONKEY)/donkeyThieves.ml \
-  $(SRC_DONKEY)/donkeyNeighbours.ml \
   $(SRC_DONKEY)/donkeyStats.ml \
   $(SRC_DONKEY)/donkeyOneFile.ml \
   \
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.729 mldonkey/distrib/ChangeLog:1.730
--- mldonkey/distrib/ChangeLog:1.729    Sat Feb 11 14:41:12 2006
+++ mldonkey/distrib/ChangeLog  Sat Feb 11 14:43:20 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/11
+4903: EDK: Remove obsolete donkeyNeighbours (thx to sam_dennis)
 4907: EDK: Fixed copy/paste error in emule miscoptions1 reading (sam_dennis)
 
 2006/02/10
Index: mldonkey/src/networks/donkey/donkeyClient.ml
diff -u mldonkey/src/networks/donkey/donkeyClient.ml:1.83 
mldonkey/src/networks/donkey/donkeyClient.ml:1.84
--- mldonkey/src/networks/donkey/donkeyClient.ml:1.83   Thu Feb  9 11:41:39 2006
+++ mldonkey/src/networks/donkey/donkeyClient.ml        Sat Feb 11 14:43:20 2006
@@ -819,7 +819,6 @@
   - do *not* ask for sources, we can't be sure, the client is still 
downloading the file!
 *)
 let client_has_file c file =
-  DonkeyNeighbours.new_neighbour c file;
   DonkeySources.set_request_result c.client_source file.file_sources File_found
 
 (*
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.92 
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.93
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.92      Thu Feb  9 
11:41:39 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml   Sat Feb 11 14:43:20 2006
@@ -265,8 +265,6 @@
 (*  !file_change_hook file; *)
 (*  set_file_size file (file_size file); *)
 
-  DonkeyNeighbours.recover_downloads [file];
-
   List.iter (fun s ->
       add_query_location file s
   ) (connected_servers());
Index: mldonkey/src/networks/donkey/donkeyMain.ml
diff -u mldonkey/src/networks/donkey/donkeyMain.ml:1.46 
mldonkey/src/networks/donkey/donkeyMain.ml:1.47
--- mldonkey/src/networks/donkey/donkeyMain.ml:1.46     Mon Feb  6 21:45:04 2006
+++ mldonkey/src/networks/donkey/donkeyMain.ml  Sat Feb 11 14:43:20 2006
@@ -62,8 +62,7 @@
   DonkeyClient.clean_groups ();
   DonkeyClient.clean_requests ();
   Hashtbl.clear udp_servers_replies;
-  DonkeyThieves.clean_thieves ();
-  DonkeyNeighbours.recover_downloads !current_files
+  DonkeyThieves.clean_thieves ()
     
 let quarter_timer timer =
   clean_join_queue_tables ()