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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/06 18:06:08

Modified files:
        distrib        : ChangeLog 
        src/gtk2/gui   : guiStarter.ml 

Log message:
        patch #5527

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1078&r2=1.1079
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiStarter.ml?cvsroot=mldonkey&r1=1.3&r2=1.4

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1078
retrieving revision 1.1079
diff -u -b -r1.1078 -r1.1079
--- distrib/ChangeLog   5 Nov 2006 14:13:51 -0000       1.1078
+++ distrib/ChangeLog   6 Nov 2006 18:06:08 -0000       1.1079
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/11/06
+5527: mlguistarter: print correct syntax (fixes Debian bug #396754)
+
 2006/11/05
 5481: Overnet: Small updates
 - do not print opcode 18 (OvernetNoResult) as unknown message

Index: src/gtk2/gui/guiStarter.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiStarter.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/gtk2/gui/guiStarter.ml  31 Oct 2005 18:34:02 -0000      1.3
+++ src/gtk2/gui/guiStarter.ml  6 Nov 2006 18:06:08 -0000       1.4
@@ -22,6 +22,17 @@
 let _s_ x = (_s x) ^ ":"
 
 let main () =
+  let arg_1 =
+    try
+      Sys.argv.(1)
+    with _ -> ""
+  in
+  if not (Sys.file_exists arg_1) then
+    begin
+      if arg_1 <> "" then Printf.printf "File %s not found\n%!" arg_1;
+      Printf.printf "Syntax: mlguistarter FILE\n%!";
+      exit 0
+    end;
   ignore (GMain.Main.init ());
   let window = GWindow.window 
     ~title:(_s "MLdonkey GUI starter")
@@ -57,7 +68,7 @@
   ignore (wb_5#connect#clicked ~callback:
   (fun () -> 
       window#destroy ();
-      ignore (Sys.command (Printf.sprintf "%s &" Sys.argv.(1)));
+      ignore (Sys.command (Printf.sprintf "%s &" arg_1));
       ));
   ignore (wb_6#connect#clicked ~callback:
   (fun () ->