[epiphany] Remove cache size preference
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Remove cache size preference
- Date: Sun, 8 Feb 2015 15:47:00 +0000 (UTC)
commit 3a26cf23ed71d3de8683b36da3ff2db0979421cd
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sat Feb 7 20:14:26 2015 -0600
Remove cache size preference
There is no way to set the cache size in WebKit2, and the max size is
ludicrously lower (sans bugs) than anybody would care about.
https://bugzilla.gnome.org/show_bug.cgi?id=737808
data/org.gnome.epiphany.gschema.xml | 5 --
lib/ephy-prefs.h | 1 -
src/prefs-dialog.c | 19 ++-----
src/resources/prefs-dialog.ui | 90 ++++++++++-------------------------
4 files changed, 32 insertions(+), 83 deletions(-)
---
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index 8e0a12b..c2837d8 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -144,11 +144,6 @@
<summary>Default encoding</summary>
<description>Default encoding. Accepted values are the ones WebKitGTK+ can
understand.</description>
</key>
- <key type="i" name="cache-size">
- <default>50</default>
- <summary>Size of disk cache</summary>
- <description>Size of disk cache, in MB.</description>
- </key>
<key type="as" name="language">
<default>[]</default>
<summary>Languages</summary>
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 1189be7..c0ca33d 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -103,7 +103,6 @@ typedef enum
#define EPHY_PREFS_SCHEMA "org.gnome.Epiphany"
#define EPHY_PREFS_USER_AGENT "user-agent"
-#define EPHY_PREFS_CACHE_SIZE "cache-size"
#define EPHY_PREFS_NEW_WINDOWS_IN_TABS "new-windows-in-tabs"
#define EPHY_PREFS_AUTO_DOWNLOADS "automatic-downloads"
#define EPHY_PREFS_WARN_ON_CLOSE_UNSUBMITTED_DATA "warn-on-close-unsubmitted-data"
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 1818e82..578b158 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -85,8 +85,7 @@ struct PrefsDialogPrivate
GtkWidget *never;
GtkWidget *remember_passwords_checkbutton;
GtkWidget *do_not_track_checkbutton;
- GtkWidget *disk_cache_spinbutton;
- GtkWidget *clear_cache_button;
+ GtkWidget *clear_personal_data_button;
/* language */
GtkWidget *default_encoding_combo;
@@ -204,8 +203,7 @@ prefs_dialog_class_init (PrefsDialogClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, PrefsDialog, never);
gtk_widget_class_bind_template_child_private (widget_class, PrefsDialog,
remember_passwords_checkbutton);
gtk_widget_class_bind_template_child_private (widget_class, PrefsDialog, do_not_track_checkbutton);
- gtk_widget_class_bind_template_child_private (widget_class, PrefsDialog, disk_cache_spinbutton);
- gtk_widget_class_bind_template_child_private (widget_class, PrefsDialog, clear_cache_button);
+ gtk_widget_class_bind_template_child_private (widget_class, PrefsDialog, clear_personal_data_button);
/* language */
gtk_widget_class_bind_template_child_private (widget_class, PrefsDialog, default_encoding_combo);
@@ -956,8 +954,8 @@ prefs_dialog_response_cb (GtkDialog *widget,
}
static void
-clear_cache_button_clicked_cb (GtkWidget *button,
- PrefsDialog *dialog)
+clear_personal_data_button_clicked_cb (GtkWidget *button,
+ PrefsDialog *dialog)
{
ClearDataDialog *clear_dialog;
@@ -1295,15 +1293,10 @@ setup_privacy_page (PrefsDialog *dialog)
priv->do_not_track_checkbutton,
"active",
G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (web_settings,
- EPHY_PREFS_CACHE_SIZE,
- priv->disk_cache_spinbutton,
- "value",
- G_SETTINGS_BIND_DEFAULT);
- g_signal_connect (priv->clear_cache_button,
+ g_signal_connect (priv->clear_personal_data_button,
"clicked",
- G_CALLBACK (clear_cache_button_clicked_cb),
+ G_CALLBACK (clear_personal_data_button_clicked_cb),
dialog);
}
diff --git a/src/resources/prefs-dialog.ui b/src/resources/prefs-dialog.ui
index da5c7da..8d17471 100644
--- a/src/resources/prefs-dialog.ui
+++ b/src/resources/prefs-dialog.ui
@@ -892,7 +892,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Temporary Files</property>
+ <property name="label" translatable="yes">Stored Data</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -911,82 +911,36 @@
<property name="spacing">12</property>
<property name="margin_start">12</property>
<child>
- <object class="GtkLabel" id="cache_size">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Disk space:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">disk_cache_spinbutton</property>
+ <!-- We must use xalign instead of halign because halign
+ does not work for labels with line wrap. And we must
+ allow line wrap to accomodate translations. -->
+ <property name="xalign">0</property>
+ <property name="wrap">True</property>
+ <property name="max-width-chars">30</property>
+ <property name="label" translatable="yes">You can clear stored personal
data.</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox175">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSpinButton" id="disk_cache_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment2</property>
- <property name="climb_rate">1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label1167">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">MB</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox14">
+ <object class="GtkButton" id="clear_personal_data_button">
+ <property name="label" translatable="yes">Cl_ear Personal Data…</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkButton" id="clear_cache_button">
- <property name="label" translatable="yes">Cl_ear</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
+ <property name="pack_type">end</property>
</packing>
</child>
</object>
@@ -1313,4 +1267,12 @@
</object>
</child>
</template>
+ <object class="GtkSizeGroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="manage_cookies_button"/>
+ <widget name="manage_passwords_button"/>
+ <widget name="clear_personal_data_button"/>
+ </widgets>
+ </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
