# 
# patch "main.ml"
#  from [76d695d2ec4c7849db39b9f51b390c4931aabcb3]
#    to [b3012be53c72a238d19c83ecc734bfc33a2a2cd4]
# 
# patch "ui.ml"
#  from [024aed654eb656daf8e2e287c986cd7f7076dfe4]
#    to [394a85648f8edc3d3a024d038cdc8b7b5b07e82c]
# 
========================================================================
--- main.ml	76d695d2ec4c7849db39b9f51b390c4931aabcb3
+++ main.ml	b3012be53c72a238d19c83ecc734bfc33a2a2cd4
@@ -127,7 +127,8 @@
 	 begin
 	   try
 	     match mt_options with
-	     | MTopt_none -> ()
+	     | MTopt_none ->
+		 ctrl#show_open ()
 	     | MTopt_db fname ->
 		 ctrl#open_db fname
 	     | MTopt_branch (fname, branch) ->
========================================================================
--- ui.ml	024aed654eb656daf8e2e287c986cd7f7076dfe4
+++ ui.ml	394a85648f8edc3d3a024d038cdc8b7b5b07e82c
@@ -343,7 +343,7 @@
 
 type manager = {
     manager      : GAction.ui_manager ;
-    main_group   : GAction.action_group ;
+    db_group     : GAction.action_group ;
     view_group   : GAction.action_group ;
     popup_data   : popup_data Lazy.t ;
   }
@@ -354,12 +354,14 @@
   GAction.add_actions g_main [
   add "FileMenu" ~label:"_File" ;
   add "Open"  ~stock:`OPEN  ~tooltip:"Open a database" ;
-  add "Close" ~stock:`CLOSE ~tooltip:"Close the database" ;
   add "Quit"  ~stock:`QUIT  ~tooltip:"Exit" ;
   add "Prefs" ~stock:`PREFERENCES ~tooltip:"Edit Preferences" ;
-  add "New" ~stock:`NEW ~tooltip:"View a monotone ancestry graph" ;
   add "FindEntry" ~accel:"<Ctrl>l" ] ;
-  (g_main#get_action "Close")#set_sensitive false ;
+  let g_db = GAction.action_group ~name:"db" () in
+  GAction.add_actions g_db [
+  add "Close" ~stock:`CLOSE ~tooltip:"Close the database" ;
+  add "New"   ~stock:`NEW   ~tooltip:"View a monotone ancestry graph" ] ;
+  g_db#set_sensitive false ;
   let g_popup = GAction.action_group ~name:"popup" () in
   GAction.add_actions g_popup [
   add "Certs" ~label:"Display certs" ;
@@ -377,7 +379,7 @@
   add "Zoom_out" ~stock:`ZOOM_OUT ~tooltip:"Zoom out" ~accel:"<Ctrl>minus" ;
   add "Query"    ~stock:`FIND     ~tooltip:"Search the database" ] ;
   g_view#set_sensitive false ;
-  (g_main, g_popup, g_view)
+  (g_main, g_db, g_popup, g_view)
 
 let get_obj m name =
   (m#get_widget name)#as_widget
@@ -395,15 +397,16 @@
 
 let make () =
   let m = GAction.ui_manager () in
-  let (g_main, g_popup, g_view) = make_groups () in
+  let (g_main, g_db, g_popup, g_view) = make_groups () in
   m#insert_action_group g_main  1 ;
-  m#insert_action_group g_popup 2 ;
-  m#insert_action_group g_view  3 ;
+  m#insert_action_group g_db    2 ;
+  m#insert_action_group g_popup 3 ;
+  m#insert_action_group g_view  4 ;
   ignore (m#add_ui_from_string ui_info) ;
   let menubar = m#get_widget "/menubar" in
   let toolbar = m#get_widget "/toolbar" in
   { manager = m ; 
-    main_group = g_main; view_group = g_view ;
+    db_group = g_db ; view_group = g_view ;
     popup_data = lazy (make_popup_data m g_popup)
   }, menubar, toolbar
 
@@ -530,10 +533,10 @@
 
 
 let open_db m ctrl =
-  (m.manager#get_action "/menubar/FileMenu/Close")#set_sensitive true
+  m.db_group#set_sensitive true
 
 let close_db m ctrl =
-  (m.manager#get_action "/menubar/FileMenu/Close")#set_sensitive false
+  m.db_group#set_sensitive false
 
 let clear m =
   m.view_group#set_sensitive false