aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-02-02 03:45:23 +0800
committerChristian Persch <chpe@src.gnome.org>2005-02-02 03:45:23 +0800
commited8dda32836a42ac73365719f399685746bce939 (patch)
tree8de94b76d76978a133ebc7bd0cedd73806cdcea2
parentc0d392cbae39f50fd029c58fac14a95b5a5f2cc3 (diff)
downloadgsoc2013-epiphany-ed8dda32836a42ac73365719f399685746bce939.tar
gsoc2013-epiphany-ed8dda32836a42ac73365719f399685746bce939.tar.gz
gsoc2013-epiphany-ed8dda32836a42ac73365719f399685746bce939.tar.bz2
gsoc2013-epiphany-ed8dda32836a42ac73365719f399685746bce939.tar.lz
gsoc2013-epiphany-ed8dda32836a42ac73365719f399685746bce939.tar.xz
gsoc2013-epiphany-ed8dda32836a42ac73365719f399685746bce939.tar.zst
gsoc2013-epiphany-ed8dda32836a42ac73365719f399685746bce939.zip
Don't show the menubar with F10 in lockdown mode. Make sure we always
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.
-rw-r--r--ChangeLog8
-rw-r--r--src/ephy-window.c6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d19907fc..e48577f55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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),