Make window into an object.

[guestfs-browser.git] / main.ml

diff --git a/main.ml b/main.ml
index 25215ac..93e2a3a 100644 (file)
--- a/main.ml
+++ b/main.ml
@@ -22,8 +22,7 @@ open Utils
 
 (* Main. *)
 let () =
-  (* XXX command line *)
-  Utils.set_verbose_flag ();
+  let cli_request = Cmdline.command_line () in
 
   (* If we're in verbose mode, print some debug information which
    * could be useful in bug reports.
@@ -34,14 +33,15 @@ let () =
     debug "libvirt %s" (libvirt_version_string ());
   );
 
-  let ws = Window.open_main_window () in
-  Slave.set_failure_hook (Window.failure ws);
-  Slave.set_busy_hook (Window.throbber_busy ws);
-  Slave.set_idle_hook (Window.throbber_idle ws);
-  Slave.set_progress_hook (Window.progress ws);
+  let w = new Window.window in
+  Slave.set_failure_hook w#failure;
+  Slave.set_busy_hook w#throbber_busy;
+  Slave.set_idle_hook w#throbber_idle;
+  Slave.set_status_hook w#set_statusbar;
+  Slave.set_progress_hook w#progress;
 
   (* What did the user request on the command line? *)
-  (*Window.run_cli_request ws cli_request;*)
+  w#run_cli_request cli_request;
 
   (* Run the main display thread.  When this returns, the application
    * has been closed.