diff options
| author | Christopher James Lahey <clahey@ximian.com> | 2004-01-10 23:35:19 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2004-01-10 23:35:19 +0800 |
| commit | 818cf0139401620a5a04f0f0e12a5cbd001cdd8e (patch) | |
| tree | efe24bae1a4e96a973c8a9f2e45b9d261ef327ff /src/ephy-tab.c | |
| parent | b0b62cbe423aa7c223baa81000cf66ec421ed2a2 (diff) | |
| download | gsoc2013-epiphany-818cf0139401620a5a04f0f0e12a5cbd001cdd8e.tar gsoc2013-epiphany-818cf0139401620a5a04f0f0e12a5cbd001cdd8e.tar.gz gsoc2013-epiphany-818cf0139401620a5a04f0f0e12a5cbd001cdd8e.tar.bz2 gsoc2013-epiphany-818cf0139401620a5a04f0f0e12a5cbd001cdd8e.tar.lz gsoc2013-epiphany-818cf0139401620a5a04f0f0e12a5cbd001cdd8e.tar.xz gsoc2013-epiphany-818cf0139401620a5a04f0f0e12a5cbd001cdd8e.tar.zst gsoc2013-epiphany-818cf0139401620a5a04f0f0e12a5cbd001cdd8e.zip | |
Added disable_arbitrary_url, disable_toolbar_editing, and disable_history
2004-01-09 Christopher James Lahey <clahey@ximian.com>
* data/epiphany-lockdown.schemas.in, lib/ephy-prefs.h: Added
disable_arbitrary_url, disable_toolbar_editing, and
disable_history keys.
* src/ephy-automation.c (impl_ephy_automation_loadurl): Make this
ignore a url given on the command line if disable_arbitrary_url is
on.
* src/ephy-notebook.c (notebook_drag_data_received_cb): Made this
ignore drags if disable_arbitrary_url is on.
* src/ephy-session.c (ephy_session_load): Don't show history
window if disable_history is on.
* src/ephy-tab.c (ephy_tab_dom_mouse_click_cb): Disable middle
click to paste url if disable_arbitrary_url is on.
* src/ephy-window.c: Disable menu actions based on
disable_arbitrary_url, disable_toolbar_editing, and
disable_history keys.
Diffstat (limited to 'src/ephy-tab.c')
| -rw-r--r-- | src/ephy-tab.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 0ca50ef4a..6bfb97f48 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -1037,8 +1037,9 @@ ephy_tab_dom_mouse_click_cb (EphyEmbed *embed, is_left_click = (type == EPHY_EMBED_EVENT_MOUSE_BUTTON1); is_middle_click = (type == EPHY_EMBED_EVENT_MOUSE_BUTTON2); - middle_click_opens = eel_gconf_get_boolean - (CONF_INTERFACE_MIDDLE_CLICK_OPEN_URL); + middle_click_opens = + eel_gconf_get_boolean (CONF_INTERFACE_MIDDLE_CLICK_OPEN_URL) && + !eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_ARBITRARY_URL); is_link = (context & EMBED_CONTEXT_LINK) != 0; is_image = (context & EMBED_CONTEXT_IMAGE) != 0; |