Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-terminal/ChangeLog,v
retrieving revision 1.475
diff -u -r1.475 ChangeLog
--- ChangeLog	3 Oct 2005 15:53:12 -0000	1.475
+++ ChangeLog	11 Oct 2005 18:19:22 -0000
@@ -1,3 +1,10 @@
+2005-10-11  Dan Winship  <danw@novell.com>
+
+	* src/terminal-window.c (terminal_window_set_menubar_visible):
+	Call reset_menubar_labels().
+	(reset_menubar_labels): Only enable menubar mnemonics if the
+	menubar is visible. #172777
+
 2005-10-03  Mark McLoughlin  <mark@skynet.ie>
 
 	* src/terminal-window.c: (fill_in_new_term_submenu_real): fix
Index: src/terminal-window.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.c,v
retrieving revision 1.110
diff -u -r1.110 terminal-window.c
--- src/terminal-window.c	3 Oct 2005 15:53:36 -0000	1.110
+++ src/terminal-window.c	11 Oct 2005 18:19:23 -0000
@@ -1552,6 +1552,7 @@
     {
       gtk_widget_hide (window->priv->menubar);
     }
+  reset_menubar_labels (window);
 
   if (window->priv->active_term)
     {
@@ -2078,11 +2079,13 @@
 static void
 reset_menubar_labels (TerminalWindow *window)
 {
-  if (window->priv->use_mnemonics ==
-      window->priv->using_mnemonics)
+  gboolean want_mnemonics =
+	  window->priv->use_mnemonics && window->priv->menubar_visible;
+
+  if (want_mnemonics == window->priv->using_mnemonics)
     return;
 
-  window->priv->using_mnemonics = window->priv->use_mnemonics;
+  window->priv->using_mnemonics = want_mnemonics;
 
   set_menuitem_text (window->priv->file_menuitem,
                      _("_File"), !window->priv->using_mnemonics);
