diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/ephy-window.c | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,13 @@ 2005-02-01 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-window.c: (ephy_window_key_press_event): + + Don't show the menubar with F10 in lockdown mode. + Make sure we always chain up to GtkWindow's keypress handler. + Fixes bug #165550. + +2005-02-01 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-main.c: (main): * src/ephy-shell.c: (ephy_shell_finalize): diff --git a/src/ephy-window.c b/src/ephy-window.c index 5c37f4252..7a108887e 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -715,10 +715,10 @@ ephy_window_key_press_event (GtkWidget *widget, guint mask = gtk_accelerator_get_default_mod_mask (); char *accel = NULL; - /* Don't activate menubar in ppv mode */ - if (window->priv->ppv_mode) + /* Don't activate menubar in ppv mode, or in lockdown mode */ + if (window->priv->ppv_mode || eel_gconf_get_boolean (CONF_LOCKDOWN_HIDE_MENUBAR)) { - return FALSE; + return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event); } g_object_get (gtk_widget_get_settings (widget), |