aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/epiphany.convert1
-rw-r--r--data/glade/prefs-dialog.ui54
-rw-r--r--data/org.gnome.epiphany.gschema.xml.in4
-rw-r--r--embed/ephy-embed-prefs.c5
-rw-r--r--lib/ephy-prefs.h1
-rw-r--r--src/ephy-window.c7
-rw-r--r--src/prefs-dialog.c3
7 files changed, 1 insertions, 74 deletions
diff --git a/data/epiphany.convert b/data/epiphany.convert
index c938c7639..34ccfd473 100644
--- a/data/epiphany.convert
+++ b/data/epiphany.convert
@@ -10,7 +10,6 @@ remember-passwords = /apps/epiphany/general/remember_passwords
keyword-search-url = /apps/epiphany/general/url_search
managed-network = /apps/epiphany/general/managed_network
enable-smooth-scrolling = /apps/epiphany/web/smooth_scroll
-enable-web-inspector = /apps/epiphany/web/inspector_enabled
enable-caret-browsing = /apps/epiphany/web/browse_with_caret
enabled-extensions = /apps/epiphany/general/active_extensions
diff --git a/data/glade/prefs-dialog.ui b/data/glade/prefs-dialog.ui
index 32a9e1368..ea54f3864 100644
--- a/data/glade/prefs-dialog.ui
+++ b/data/glade/prefs-dialog.ui
@@ -235,60 +235,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkVBox" id="vbox201">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1318">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Web Development&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment20">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox203">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="web_inspector_checkbutton">
- <property name="label" translatable="yes">Enable Web Inspector</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="position">1</property>
diff --git a/data/org.gnome.epiphany.gschema.xml.in b/data/org.gnome.epiphany.gschema.xml.in
index 6bc4089da..587a5ebcb 100644
--- a/data/org.gnome.epiphany.gschema.xml.in
+++ b/data/org.gnome.epiphany.gschema.xml.in
@@ -9,10 +9,6 @@
<default>false</default>
<summary>Browse with caret</summary>
</key>
- <key type="b" name="enable-web-inspector">
- <default>false</default>
- <summary>Enable Web Inspector</summary>
- </key>
<key type="s" name="homepage-url">
<default>'http://www.google.com'</default>
<summary>Home page</summary>
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index 2b43f69ea..5fd6ba22f 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -384,6 +384,7 @@ ephy_embed_prefs_init (void)
"enable-site-specific-quirks", TRUE,
"enable-page-cache", TRUE,
"auto-resize-window", TRUE,
+ "enable-developer-extras", TRUE,
NULL);
for (i = 0; i < G_N_ELEMENTS (webkit_pref_entries); i++) {
@@ -404,10 +405,6 @@ ephy_embed_prefs_init (void)
webkit_settings, "enable-scripts",
G_SETTINGS_BIND_GET);
g_settings_bind (EPHY_SETTINGS_MAIN,
- EPHY_PREFS_ENABLE_WEB_INSPECTOR,
- webkit_settings, "enable-developer-extras",
- G_SETTINGS_BIND_GET);
- g_settings_bind (EPHY_SETTINGS_MAIN,
EPHY_PREFS_ENABLE_CARET_BROWSING,
webkit_settings, "enable-caret-browsing",
G_SETTINGS_BIND_GET);
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index e61a49e94..5ae1c6912 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -97,7 +97,6 @@ typedef enum
#define EPHY_PREFS_KEYWORD_SEARCH_URL "keyword-search-url"
#define EPHY_PREFS_MANAGED_NETWORK "managed-network"
#define EPHY_PREFS_ENABLE_SMOOTH_SCROLLING "enable-smooth-scrolling"
-#define EPHY_PREFS_ENABLE_WEB_INSPECTOR "enable-web-inspector"
#define EPHY_PREFS_ENABLE_CARET_BROWSING "enable-caret-browsing"
#define EPHY_PREFS_ENABLED_EXTENSIONS "enabled-extensions"
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 3f7efa02a..c64373378 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1065,7 +1065,6 @@ update_popup_actions_visibility (EphyWindow *window,
{
GtkAction *action;
GtkActionGroup *action_group;
- gboolean inspector_enabled;
action_group = window->priv->popups_action_group;
@@ -1080,12 +1079,6 @@ update_popup_actions_visibility (EphyWindow *window,
action = gtk_action_group_get_action (action_group, "OpenFrame");
gtk_action_set_visible (action, is_frame);
-
- inspector_enabled = g_settings_get_boolean
- (EPHY_SETTINGS_MAIN,
- EPHY_PREFS_ENABLE_WEB_INSPECTOR);
- action = gtk_action_group_get_action (action_group, "InspectElement");
- gtk_action_set_visible (action, inspector_enabled);
}
static void
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index b1dcc7165..ce9466a08 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -1031,9 +1031,6 @@ static const PrefsDialogPreference preferences[] =
{ "automatic_downloads_checkbutton", "active",
EPHY_PREFS_SCHEMA, EPHY_PREFS_AUTO_DOWNLOADS,
G_SETTINGS_BIND_DEFAULT, NULL, NULL },
- { "web_inspector_checkbutton", "active",
- EPHY_PREFS_SCHEMA, EPHY_PREFS_ENABLE_WEB_INSPECTOR,
- G_SETTINGS_BIND_DEFAULT, NULL, NULL },
{ "remember_passwords_checkbutton", "active",
EPHY_PREFS_SCHEMA, EPHY_PREFS_REMEMBER_PASSWORDS,
G_SETTINGS_BIND_DEFAULT, NULL, NULL },