[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/07/01 21:58:09

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverInterface.ml driverInterface.mli 
        src/networks/bittorrent: bTMain.ml bTOptions.ml 

Log message:
        patch #6064

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1297&r2=1.1298
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInterface.ml?cvsroot=mldonkey&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInterface.mli?cvsroot=mldonkey&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTMain.ml?cvsroot=mldonkey&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTOptions.ml?cvsroot=mldonkey&r1=1.34&r2=1.35

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1297
retrieving revision 1.1298
diff -u -b -r1.1297 -r1.1298
--- distrib/ChangeLog   1 Jul 2007 13:01:40 -0000       1.1297
+++ distrib/ChangeLog   1 Jul 2007 21:58:08 -0000       1.1298
@@ -15,6 +15,7 @@
 =========
 
 2007/07/01
+6064: BT: Earlier first scan of torrents/incoming/*
 6053: HTML: Send correct filename when previewing (chandlerding)
 6061: Options: New type port_option, values are bound to be >= 0 and <= 65535
 6060: Do not send mail notifications when smtp_server = ""

Index: src/daemon/driver/driverInterface.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- src/daemon/driver/driverInterface.ml        1 Jul 2007 12:57:03 -0000       
1.65
+++ src/daemon/driver/driverInterface.ml        1 Jul 2007 21:58:08 -0000       
1.66
@@ -92,8 +92,6 @@
     None -> not !gui_reconnected
   | Some sock -> TcpBufferedSocket.can_write sock
           
-let restart_gui_server = ref (fun _ -> ())
-
 let update_events gui update user_num map =
   if not gui.gui_poll then
     let gui_num = gui.gui_num in

Index: src/daemon/driver/driverInterface.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInterface.mli,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/daemon/driver/driverInterface.mli       20 Nov 2003 16:43:16 -0000      
1.2
+++ src/daemon/driver/driverInterface.mli       1 Jul 2007 21:58:08 -0000       
1.3
@@ -16,25 +16,8 @@
     along with mldonkey; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
-(*
-  val gui_send :
-  DonkeyTypes.gui_record -> DonkeyTypes.GuiProto.to_gui -> unit
-val send_result :
-  DonkeyTypes.gui_record -> int -> DonkeyTypes.result -> unit
-val send_download : DonkeyTypes.gui_record -> DonkeyTypes.file -> unit
-val send_server : DonkeyTypes.gui_record -> DonkeyTypes.server -> unit
-val gui_reader :
-  DonkeyTypes.gui_record -> DonkeyTypes.GuiProto.from_gui -> 'a -> unit
-val gui_closed : DonkeyTypes.gui_record -> 'a -> 'b -> unit
-val gui_server_change_hook :
-  DonkeyTypes.server -> DonkeyTypes.gui_record -> unit
-val gui_friend_change_hook : 'a -> 'b -> unit
-val gui_file_change_hook :
-  DonkeyTypes.file -> DonkeyTypes.gui_record -> unit
-*)
 
 val gui_handler : 'a -> TcpServerSocket.event -> unit
 val update_gui_info : unit -> unit
 val install_hooks : unit -> unit
-val restart_gui_server : (unit -> unit) ref
 val gift_handler : 'a -> TcpServerSocket.event -> unit

Index: src/networks/bittorrent/bTMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTMain.ml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/networks/bittorrent/bTMain.ml   30 Jun 2007 17:54:11 -0000      1.25
+++ src/networks/bittorrent/bTMain.ml   1 Jul 2007 21:58:08 -0000       1.26
@@ -83,6 +83,7 @@
     add_session_timer enabler !!import_new_torrents_interval (fun _ ->
         BTInteractive.scan_new_torrents_directory ();
     );
+    add_timer 5. (fun _ -> BTInteractive.scan_new_torrents_directory ());
     add_timer 10. BTInteractive.share_files;
     add_session_timer enabler 600. BTInteractive.retry_all_ft;
     network.op_network_disable <- disable enabler;

Index: src/networks/bittorrent/bTOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- src/networks/bittorrent/bTOptions.ml        1 Jul 2007 13:00:12 -0000       
1.34
+++ src/networks/bittorrent/bTOptions.ml        1 Jul 2007 21:58:08 -0000       
1.35
@@ -101,8 +101,7 @@
 
 let import_new_torrents_interval = define_option bittorrent_section 
["import_new_torrents_interval"]
   ~restart: true
-  "Interval in seconds 'torrents/incoming' is scanned for new torrent files to 
be downloaded,
-  0 to deactivate, changes require restart"
+  "Interval in seconds 'torrents/incoming' is scanned for new torrent files to 
be downloaded, 0 to deactivate"
     float_option 60.
 
 let tracker_retries = define_option bittorrent_section ["tracker_retries"]