Version 0.1.4.

[guestfs-browser.git] / window.ml

diff --git a/window.ml b/window.ml
index aac7380..dd4f5ad 100644 (file)
--- a/window.ml
+++ b/window.ml
@@ -19,6 +19,7 @@
 open Printf
 
 open Utils
+open Slave_types
 
 module G = Guestfs
 
@@ -59,7 +60,7 @@ and populate_vmcombo ws doms =
   let combo, (model, column) = ws.vmcombo in
   model#clear ();
   List.iter (
-    fun { Slave.dom_name = name } ->
+    fun { dom_name = name } ->
       let row = model#append () in
       model#set ~row ~column name
   ) doms
@@ -96,12 +97,12 @@ and when_opened_disk_images ws images data =
 and when_opened_common ws name data =
   (* Dump some of the inspection data in debug messages. *)
   List.iter (fun (dev, t) -> debug "filesystem: %s: %s" dev t)
-    data.Slave.insp_all_filesystems;
+    data.insp_all_filesystems;
   List.iter (
-    fun { Slave.insp_root = root; insp_type = typ; insp_distro = distro;
+    fun { insp_root = root; insp_type = typ; insp_distro = distro;
           insp_major_version = major; insp_minor_version = minor } ->
       debug "root device %s contains %s %s %d.%d" root typ distro major minor;
-  ) data.Slave.insp_oses;
+  ) data.insp_oses;
 
   Filetree.add ws.view name data
 
@@ -293,7 +294,7 @@ and when_connected_cli_request ws guest doms =
     | d::ds when d = guest -> i
     | _::ds -> loop (i+1) ds
   in
-  let i = loop 0 (List.map (fun { Slave.dom_name = name } -> name) doms) in
+  let i = loop 0 (List.map (fun { dom_name = name } -> name) doms) in
 
   let combo, _ = ws.vmcombo in
   combo#set_active i