[Mldonkey-commits] mldonkey distrib/ChangeLog src/gtk2/gui/guiCom....

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/29 15:56:44

Modified files:
        distrib        : ChangeLog 
        src/gtk2/gui   : guiCom.ml guiMain.ml guiUtf8.ml 
        src/utils/net  : ip.ml 

Log message:
        patch #5212

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.907&r2=1.908
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiCom.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiMain.ml?cvsroot=mldonkey&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiUtf8.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/ip.ml?cvsroot=mldonkey&r1=1.23&r2=1.24

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.907
retrieving revision 1.908
diff -u -b -r1.907 -r1.908
--- distrib/ChangeLog   27 Jun 2006 21:20:28 -0000      1.907
+++ distrib/ChangeLog   29 Jun 2006 15:56:44 -0000      1.908
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2006/06/29
+5212: Fix DNS lookup of localhost (pango)
+      SIGTERM & SIGINT support for GTK2 GUI
+
 2006/06/27
 5207: Remove some obsolete options: html_mods_vd_queues, ED2K-initial_score,
       ED2K-max_dialog_history, ED2K-immediate_master

Index: src/gtk2/gui/guiCom.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiCom.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/gtk2/gui/guiCom.ml      12 Nov 2005 11:16:36 -0000      1.4
+++ src/gtk2/gui/guiCom.ml      29 Jun 2006 15:56:44 -0000      1.5
@@ -67,8 +67,7 @@
 
 let send t =
   match !connection with
-    None -> 
-      lprintf "Message not sent since not connected\n";
+    None -> ()
   | Some sock ->
       GuiEncoding.gui_send (GuiEncoding.from_gui from_gui_protocol_used) sock t
           

Index: src/gtk2/gui/guiMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiMain.ml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/gtk2/gui/guiMain.ml     27 Jun 2006 10:38:36 -0000      1.8
+++ src/gtk2/gui/guiMain.ml     29 Jun 2006 15:56:44 -0000      1.9
@@ -863,6 +863,11 @@
     if !G.is_docked then G.tray.destroy_tray ()
   );
 
+  MlUnix.set_signal  Sys.sigint
+    (Sys.Signal_handle (fun _ -> CommonGlobals.exit_properly 0));
+
+  MlUnix.set_signal  Sys.sigterm
+    (Sys.Signal_handle (fun _ -> CommonGlobals.exit_properly 0));
 
   (************ Some hooks ***************)
 

Index: src/gtk2/gui/guiUtf8.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiUtf8.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/gtk2/gui/guiUtf8.ml     19 Nov 2005 17:19:45 -0000      1.4
+++ src/gtk2/gui/guiUtf8.ml     29 Jun 2006 15:56:44 -0000      1.5
@@ -725,9 +725,6 @@
   enc_list := List.map (fun c -> codeset_to_string c ) (codeset_list_from_lang 
lang);
   enc_list := List.filter (fun enc -> enc <> charset) !enc_list;
   enc_list := if (charset <> "UTF-8") then charset::!enc_list else !enc_list;
-  List.iter (fun enc ->
-    lprintf "Use encoding %s\n" enc
-  ) !enc_list;
   nenc := List.length !enc_list
 
 let last_chance_to_encode s =

Index: src/utils/net/ip.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/ip.ml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/utils/net/ip.ml 19 Jun 2006 20:44:49 -0000      1.23
+++ src/utils/net/ip.ml 29 Jun 2006 15:56:44 -0000      1.24
@@ -145,10 +145,12 @@
   Unix.ADDR_INET (to_inet_addr ip, port)
 
 let get_non_local_ip list =
-  let list = List.filter ((<>) localhost) list in
   match list with
   | [] -> raise Not_found
-  | l -> l
+  | _ :: _ ->
+      match List.filter ((<>) localhost) list with
+      | (_ :: _) as l -> l
+      | [] -> list (* there's *only* local addresses, give up *)
 
 let gethostbyname name = 
   let h = Unix.gethostbyname name in