X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=filetree_markup.ml;h=8b8dc2e95bbe2d22d831ecadf0595f8ae2ec7b89;hb=e3cc4d32de383a8087c1065f150a09c5f3f77ca8;hp=a890cca3cb16eef883af4d024952764509fa4ff3;hpb=f09bb82de01019f24411cac2916d9567b5e9a235;p=guestfs-browser.git
diff --git a/filetree_markup.ml b/filetree_markup.ml
index a890cca..8b8dc2e 100644
--- a/filetree_markup.ml
+++ b/filetree_markup.ml
@@ -18,11 +18,10 @@
open ExtString
open ExtList
-open CamomileLibrary
-open Default.Camomile
open Unix
open Utils
+open Slave_types
open Filetree_type
open Printf
@@ -47,15 +46,15 @@ let other_color = file_color (* anything not one of the above *)
* http://library.gnome.org/devel/pango/stable/PangoMarkupFormat.html
*)
let rec markup_of_name ?(visited = false) direntry =
- let name = direntry.Slave.dent_name in
- let mode = direntry.Slave.dent_stat.Guestfs.mode in
+ let name = direntry.dent_name in
+ let mode = direntry.dent_stat.Guestfs.mode in
if is_directory mode then ( (* directory *)
let fg = if not visited then normal dir_color else darken dir_color in
sprintf "%s"
fg (markup_escape name)
)
else if is_symlink mode then ( (* symlink *)
- let link = direntry.Slave.dent_link in
+ let link = direntry.dent_link in
let fg =
if not visited then normal symlink_color else darken symlink_color in
sprintf "%s %s %s"
@@ -212,7 +211,7 @@ let set_visited ({ model = model; name_col = name_col } as t) row =
hdata.visited <- true;
match hdata.content with
| Directory direntry | File direntry ->
- debug "set_visited %s" direntry.Slave.dent_name;
+ debug "set_visited %s" direntry.dent_name;
model#set ~row ~column:name_col
(markup_of_name ~visited:true direntry)
| RegKey node ->