[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
Date: |
Wed, 02 Jan 2008 16:50:16 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 08/01/02 16:50:16
Modified files:
distrib : ChangeLog
src/daemon/common: commonShared.ml commonTypes.ml
src/daemon/driver: driverInterface.ml
Log message:
patch #6361
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1340&r2=1.1341
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonShared.ml?cvsroot=mldonkey&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonTypes.ml?cvsroot=mldonkey&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInterface.ml?cvsroot=mldonkey&r1=1.67&r2=1.68
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1340
retrieving revision 1.1341
diff -u -b -r1.1340 -r1.1341
--- distrib/ChangeLog 2 Jan 2008 16:15:53 -0000 1.1340
+++ distrib/ChangeLog 2 Jan 2008 16:50:15 -0000 1.1341
@@ -15,6 +15,7 @@
=========
2008/01/02
+6361: GUI: Send console messages to admin users after unsharing a file
6349: DirectConnect: Correctly report total shared filesize to server (LuCasn)
6360: BT: New command print_torrent <file_num>,
new link in HTML, upstats to display .torrent details
Index: src/daemon/common/commonShared.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonShared.ml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- src/daemon/common/commonShared.ml 2 Jan 2008 16:14:52 -0000 1.41
+++ src/daemon/common/commonShared.ml 2 Jan 2008 16:50:15 -0000 1.42
@@ -179,7 +179,8 @@
let shared_unshare s =
let impl = as_shared_impl s in
shared_remove impl;
- try impl.impl_shared_ops.op_shared_unshare impl.impl_shared_val with _ -> ()
+ (try impl.impl_shared_ops.op_shared_unshare impl.impl_shared_val with _ ->
());
+ CommonEvent.add_event (Root_console_message_event (Printf.sprintf "INFO:
unshared %s\n" impl.impl_shared_fullname))
let shared_state s o =
let impl = as_shared_impl s in
Index: src/daemon/common/commonTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonTypes.ml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- src/daemon/common/commonTypes.ml 3 Aug 2007 22:12:57 -0000 1.74
+++ src/daemon/common/commonTypes.ml 2 Jan 2008 16:50:15 -0000 1.75
@@ -818,7 +818,7 @@
| File_remove_source_event of file * client
| Server_new_user_event of server * user
| Search_new_result_event of gui_result_handler * gui_events * int * result
-
+| Root_console_message_event of string
| Console_message_event of string
exception FormatFound of format
Index: src/daemon/driver/driverInterface.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/daemon/driver/driverInterface.ml 3 Aug 2007 22:12:57 -0000
1.67
+++ src/daemon/driver/driverInterface.ml 2 Jan 2008 16:50:16 -0000
1.68
@@ -237,6 +237,9 @@
| Console_message_event msg ->
gui_send gui (P.Console msg)
+ | Root_console_message_event msg ->
+ if user2_is_admin gui.gui_conn.conn_user.ui_user then gui_send gui
(P.Console msg)
+
| Network_info_event n ->
gui_send gui (P.Network_info (network_info n))
@@ -1352,7 +1355,7 @@
update_result_info r;
gui.gui_new_events <- event :: gui.gui_new_events
- | Console_message_event msg ->
+ | Console_message_event msg | Root_console_message_event msg ->
Fifo.put console_messages event;
if Fifo.length console_messages > !!gui_log_size then
ignore (Fifo.take console_messages);