diff options
| author | Chris Lahey <clahey@src.gnome.org> | 2004-01-10 04:49:11 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2004-01-10 04:49:11 +0800 |
| commit | 1743162eef31aab9bb28a2c8201240e7dc4bd1cd (patch) | |
| tree | 46addc66c3d524ccd4adddac135385b44c390852 /src/ephy-session.c | |
| parent | fd4119bf05f970c82fda53fe0deff9dc440d8f5b (diff) | |
| download | gsoc2013-epiphany-1743162eef31aab9bb28a2c8201240e7dc4bd1cd.tar gsoc2013-epiphany-1743162eef31aab9bb28a2c8201240e7dc4bd1cd.tar.gz gsoc2013-epiphany-1743162eef31aab9bb28a2c8201240e7dc4bd1cd.tar.bz2 gsoc2013-epiphany-1743162eef31aab9bb28a2c8201240e7dc4bd1cd.tar.lz gsoc2013-epiphany-1743162eef31aab9bb28a2c8201240e7dc4bd1cd.tar.xz gsoc2013-epiphany-1743162eef31aab9bb28a2c8201240e7dc4bd1cd.tar.zst gsoc2013-epiphany-1743162eef31aab9bb28a2c8201240e7dc4bd1cd.zip | |
Added disable_bookmark_editing key.
* data/epiphany-lockdown.schemas.in, lib/ephy-prefs.h: Added
disable_bookmark_editing key.
* lib/ephy-node-db.c, ephy-node-db.h, ephy-node.c: Added immutable
property.
* lib/egg/egg-editable-toolbar.c (drag_data_received_cb,
toolbar_drag_motion_cb), src/ephy-toolbars-model.c
(impl_get_item_id): Made these handle immutable models/node_dbs.
* src/ephy-automation.c, src/ephy-session.c: Don't show the
bookmark editor if disabled.
* src/ephy-window.c: Disable a bunch of menus if bookmark editing
is disabled.
* src/bookmarks/ephy-bookmarks-import.c,
src/bookmarks/ephy-bookmarks.c: Disable bookmark editing and
importing is key is set. Uses immutable property.
Diffstat (limited to 'src/ephy-session.c')
| -rw-r--r-- | src/ephy-session.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ephy-session.c b/src/ephy-session.c index b1225a45a..527c84f46 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -33,6 +33,8 @@ #include "ephy-bookmarks-editor.h" #include "ephy-string.h" #include "ephy-file-helpers.h" +#include "eel-gconf-extensions.h" +#include "ephy-prefs.h" #include "ephy-debug.h" #include <glib/gi18n.h> @@ -646,7 +648,10 @@ ephy_session_load (EphySession *session, if (id && xmlStrEqual (BOOKMARKS_EDITOR_ID, id)) { - widget = ephy_shell_get_bookmarks_editor (ephy_shell); + if (!eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_BOOKMARK_EDITING)) + { + widget = ephy_shell_get_bookmarks_editor (ephy_shell); + } } else if (id && xmlStrEqual (HISTORY_WINDOW_ID, id)) { |