- handles about:* uris in cicBrowser

[helm.git] / helm / matita / matitaMathView.ml

diff --git a/helm/matita/matitaMathView.ml b/helm/matita/matitaMathView.ml
index f22b3a170b6546d922721b78d56a0ad50bbb51d1..225738d581b88baee3bce8118e3d75fcc2f74d4f 100644 (file)
--- a/helm/matita/matitaMathView.ml
+++ b/helm/matita/matitaMathView.ml
@@ -381,8 +381,8 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
 
       win#browserForwardButton#misc#set_sensitive false;
       win#browserBackButton#misc#set_sensitive false;
-      ignore (win#browserUri#connect#activate (handle_error' (fun () ->
-        self#loadInput win#browserUri#text)));
+      ignore (win#browserUri#entry#connect#activate (handle_error' (fun () ->
+        self#loadInput win#browserUri#entry#text)));
       ignore (win#browserHomeButton#connect#clicked (handle_error' (fun () ->
         self#load (`About `Current_proof))));
       ignore (win#browserRefreshButton#connect#clicked
@@ -414,8 +414,8 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
 
     method private _getSelectedUri () =
       match model#easy_selection () with
-      | [sel] when is_uri sel -> sel        (* absolute URI selected *)
-      | [sel] -> win#browserUri#text ^ sel  (* relative URI selected *)
+      | [sel] when is_uri sel -> sel  (* absolute URI selected *)
+      | [sel] -> win#browserUri#entry#text ^ sel  (* relative URI selected *)
       | _ -> assert false
 
     (** history RATIONALE 
@@ -523,7 +523,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
       self#_loadList l
 
     method private setEntry entry =
-      win#browserUri#set_text (string_of_entry entry);
+      win#browserUri#entry#set_text (string_of_entry entry);
       current_entry <- entry
 
     method private _loadObj obj =
@@ -579,7 +579,11 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
           match txt with
           | txt when is_uri txt -> `Uri (fix_uri txt)
           | txt when is_dir txt -> `Dir (add_trailing_slash txt)
-          | _ -> raise (Browser_failure (sprintf "unsupported uri: %s" txt))
+          | txt ->
+              (try
+                entry_of_string txt
+              with Invalid_argument _ ->
+                raise (Browser_failure (sprintf "unsupported uri: %s" txt)))
         in
         self#_load entry;
         self#_historyAdd entry