[Mldonkey-commits] mldonkey distribChangeLog src/daemon/common/com...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/06 23:50:51

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonInteractive.ml 
        src/networks/donkey: donkeyOneFile.ml donkeyShare.ml 

Log message:
        patch #5063

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.873&r2=1.874
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOneFile.ml?cvsroot=mldonkey&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyShare.ml?cvsroot=mldonkey&r1=1.45&r2=1.46

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.873
retrieving revision 1.874
diff -u -b -r1.873 -r1.874
--- distrib/ChangeLog   6 Jun 2006 22:32:44 -0000       1.873
+++ distrib/ChangeLog   6 Jun 2006 23:50:51 -0000       1.874
@@ -15,6 +15,7 @@
 =========
 
 2006/06/07
+5063: EDK: remove duplicate entries in shared_files_new.ini (pango)
 5160: Remove stale avifile.ml, clean commonMultimedia logging
 5159: Compute magic values only when needed
 5157: add some line breaks to option help text for shorter lines (schlumpf)

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- src/daemon/common/commonInteractive.ml      1 Jun 2006 01:40:28 -0000       
1.70
+++ src/daemon/common/commonInteractive.ml      6 Jun 2006 23:50:51 -0000       
1.71
@@ -359,9 +359,6 @@
         files =:= List2.removeq file !!files;
         done_files =:= file :: !!done_files;
         update_file_state impl FileDownloaded;
-        let file_name = file_disk_name file in
-        ignore (CommonShared.new_shared "completed" 0 (
-            file_best_name file ) file_name);
         (try mail_for_completed_file file with e ->
               lprintf_nl "Exception %s in sendmail" (Printexc2.to_string e);
               );

Index: src/networks/donkey/donkeyOneFile.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOneFile.ml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/networks/donkey/donkeyOneFile.ml        25 May 2006 19:47:25 -0000      
1.38
+++ src/networks/donkey/donkeyOneFile.ml        6 Jun 2006 23:50:51 -0000       
1.39
@@ -133,9 +133,6 @@
   CommonSwarming.remove_swarmer file.file_swarmer;
   file.file_swarmer <- None;
   unshare_file file;
-  ignore (CommonShared.new_shared "completed" 0 (
-      file_best_name file )
-    (file_disk_name file));
   (try
       let format = CommonMultimedia.get_info
           (file_disk_name file) in

Index: src/networks/donkey/donkeyShare.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyShare.ml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- src/networks/donkey/donkeyShare.ml  31 May 2006 20:02:14 -0000      1.45
+++ src/networks/donkey/donkeyShare.ml  6 Jun 2006 23:50:51 -0000       1.46
@@ -343,7 +343,7 @@
           Unix32.mtime disk_name
         with _ ->
             if !verbose then
-              lprintf_nl "Share: Trying mtime on new name %s, disk_name %s, 
TODO: too many files in shared_files_new.ini?"
+              lprintf_nl "Share: Trying mtime on new name %s, disk_name %s"
           new_name (file_disk_name file);
             Unix32.mtime new_name
       in