From ed8dda32836a42ac73365719f399685746bce939 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 1 Feb 2005 19:45:23 +0000 Subject: Don't show the menubar with F10 in lockdown mode. Make sure we always 2005-02-01 Christian Persch * 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. --- ChangeLog | 8 ++++++++ src/ephy-window.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d19907fc..e48577f55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-02-01 Christian Persch + + * 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 * src/ephy-main.c: (main): 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), -- cgit v1.2.3