[Mldonkey-commits] mldonkey distrib/ChangeLog src/gtk/newgui/gui_i...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/12 12:42:56

Modified files:
        distrib        : ChangeLog 
        src/gtk/newgui : gui_installer_base.ml 
        src/networks/direct_connect: dcProtocol.ml 
        src/networks/opennap: opennapProtocol.ml 
        src/utils/net  : http_server.ml 

Log message:
        patch #5544

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1082&r2=1.1083
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_installer_base.ml?cvsroot=mldonkey&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcProtocol.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/opennap/opennapProtocol.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/http_server.ml?cvsroot=mldonkey&r1=1.34&r2=1.35

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1082
retrieving revision 1.1083
diff -u -b -r1.1082 -r1.1083
--- distrib/ChangeLog   12 Nov 2006 12:36:14 -0000      1.1082
+++ distrib/ChangeLog   12 Nov 2006 12:42:55 -0000      1.1083
@@ -15,6 +15,7 @@
 =========
 
 2006/11/12
+5544: Clean up code to avoid otags warnings (pango)
 5543: Improve exception handling, fix some indentions (pango)
 5542: CommonSources: Work-around division-by-zero bug in Ocaml
       on Alpha platform (pango)

Index: src/gtk/newgui/gui_installer_base.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_installer_base.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/gtk/newgui/gui_installer_base.ml        1 Nov 2004 11:22:59 -0000       
1.5
+++ src/gtk/newgui/gui_installer_base.ml        12 Nov 2006 12:42:55 -0000      
1.6
@@ -0,0 +1 @@
+let () = ()

Index: src/networks/direct_connect/dcProtocol.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcProtocol.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/networks/direct_connect/dcProtocol.ml   6 Sep 2005 11:24:59 -0000       
1.4
+++ src/networks/direct_connect/dcProtocol.ml   12 Nov 2006 12:42:55 -0000      
1.5
@@ -601,7 +601,7 @@
 module MultiConnectToMe = NickAndAddr(struct let msg = "MultiConnectToMe" end)
   
 module Msg = struct
-    type t = ()
+    type t = unit
       
     let parse s = ()
       

Index: src/networks/opennap/opennapProtocol.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/opennap/opennapProtocol.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/networks/opennap/opennapProtocol.ml     16 Oct 2005 20:42:54 -0000      
1.4
+++ src/networks/opennap/opennapProtocol.ml     12 Nov 2006 12:42:55 -0000      
1.5
@@ -771,7 +771,7 @@
   end
 
 module Msg = struct
-    type t = ()
+    type t = unit
       
     let parse s = ()
       

Index: src/utils/net/http_server.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/http_server.ml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- src/utils/net/http_server.ml        21 Oct 2006 19:35:09 -0000      1.34
+++ src/utils/net/http_server.ml        12 Nov 2006 12:42:56 -0000      1.35
@@ -240,7 +240,7 @@
                 | Some Blocked -> Printf.sprintf "IP %s is blocked, its part 
of the used IP blocklist " from_ip
                 | _ -> "")
     | "404" -> "Not found", Printf.sprintf "The requested URL %swas not found 
on this server."
-                             (match reason with Some Url_not_found url -> url 
^ " " | _ -> "")
+                             (match reason with Some (Url_not_found url) -> 
url ^ " " | _ -> "")
     | _ -> Printf.sprintf "Unknown error %s" code, ""
   in
   let reject_message = Printf.sprintf