Remove memory cache prefs/ui, now mozilla can deal with it automagically.

2003-06-07  Marco Pesenti Gritti  <marco@it.gnome.org>

	* data/epiphany.schemas.in:
	* data/glade/prefs-dialog.glade:
	* embed/ephy-embed-prefs.h:
	* embed/ephy-embed-single.c: (ephy_embed_single_clear_cache):
	* embed/ephy-embed-single.h:
	* embed/mozilla/mozilla-embed-single.cpp:
	* embed/mozilla/mozilla-notifiers.cpp:
	* src/bookmarks/ephy-bookmarks-import.c: (mozilla_parse_bookmarks),
	(xbel_parse_folder):
	* src/prefs-dialog.c: (prefs_clear_cache_button_clicked_cb):

	Remove memory cache prefs/ui, now mozilla can deal with it
	automagically.
	Rename Appeareance tab to be less generic.
	Do not convert spaces to _ on bookmarks importing.

9 files changed, 158 insertions, 258 deletions

diff --git a/ChangeLog b/ChangeLog
index eaaac73bc..7b55e57ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2003-06-07  Marco Pesenti Gritti  <marco@it.gnome.org>
+
+	* data/epiphany.schemas.in:
+	* data/glade/prefs-dialog.glade:
+	* embed/ephy-embed-prefs.h:
+	* embed/ephy-embed-single.c: (ephy_embed_single_clear_cache):
+	* embed/ephy-embed-single.h:
+	* embed/mozilla/mozilla-embed-single.cpp:
+	* embed/mozilla/mozilla-notifiers.cpp:
+	* src/bookmarks/ephy-bookmarks-import.c: (mozilla_parse_bookmarks),
+	(xbel_parse_folder):
+	* src/prefs-dialog.c: (prefs_clear_cache_button_clicked_cb):
+
+	Remove memory cache prefs/ui, now mozilla can deal with it
+	automagically.
+	Rename Appeareance tab to be less generic.
+	Do not convert spaces to _ on bookmarks importing.
+
 2003-06-07  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/ephy-tab.c: (ephy_tab_set_property),
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index 9bca74027..206e3667d 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -710,6 +710,7 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">fonts_language_optionmenu</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -1136,7 +1137,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label1284">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Appearance</property>
+	      <property name="label" translatable="yes">Fonts and Colors</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1624,200 +1625,115 @@
 				  <property name="fill">True</property>
 				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkTable" id="table77">
-			      <property name="visible">True</property>
-			      <property name="n_rows">2</property>
-			      <property name="n_columns">4</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">6</property>
-			      <property name="column_spacing">12</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label1168">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">kB</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_CENTER</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">2</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options"></property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label1170">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Dis_k cache:</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_CENTER</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">disk_cache_spin</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
 
 			      <child>
-				<widget class="GtkLabel" id="label1171">
+				<widget class="GtkHBox" id="hbox174">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Memor_y cache:</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_CENTER</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">memory_cache_spin</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">12</property>
 
-			      <child>
-				<widget class="GtkLabel" id="label1167">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">kB</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_CENTER</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">2</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="x_options"></property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="button5">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Clear _Disk Cache</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <signal name="clicked" handler="prefs_clear_disk_cache_button_clicked_cb"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">3</property>
-				  <property name="right_attach">4</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="button6">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Clear _Memory Cache</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <signal name="clicked" handler="prefs_clear_memory_cache_button_clicked_cb"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">3</property>
-				  <property name="right_attach">4</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
+				  <child>
+				    <widget class="GtkLabel" id="cache_size">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Si_ze:</property>
+				      <property name="use_underline">True</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 
-			      <child>
-				<widget class="GtkSpinButton" id="disk_cache_spin">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="climb_rate">1</property>
-				  <property name="digits">0</property>
-				  <property name="numeric">False</property>
-				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				  <property name="snap_to_ticks">False</property>
-				  <property name="wrap">False</property>
-				  <property name="adjustment">1 0 1e+06 1000 10 10</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
+				  <child>
+				    <widget class="GtkHBox" id="hbox175">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">6</property>
+
+				      <child>
+					<widget class="GtkSpinButton" id="disk_cache_spin">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="climb_rate">1</property>
+					  <property name="digits">0</property>
+					  <property name="numeric">False</property>
+					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					  <property name="snap_to_ticks">False</property>
+					  <property name="wrap">False</property>
+					  <property name="adjustment">0 0 1e+06 1000 10 10</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label1167">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">MB</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_CENTER</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
 
-			      <child>
-				<widget class="GtkSpinButton" id="memory_cache_spin">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="climb_rate">1</property>
-				  <property name="digits">0</property>
-				  <property name="numeric">False</property>
-				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				  <property name="snap_to_ticks">False</property>
-				  <property name="wrap">False</property>
-				  <property name="adjustment">1 0 1e+06 1000 10 10</property>
+				  <child>
+				    <widget class="GtkHButtonBox" id="hbuttonbox14">
+				      <property name="visible">True</property>
+				      <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+				      <property name="spacing">0</property>
+
+				      <child>
+					<widget class="GtkButton" id="clear_cache_button">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">_Clear Cache</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <signal name="clicked" handler="prefs_clear_cache_button_clicked_cb" last_modification_time="Sat, 07 Jun 2003 11:07:21 GMT"/>
+					</widget>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 				</widget>
 				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
 				</packing>
 			      </child>
 			    </widget>
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index 7a723f6ca..8a2089e8a 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -1,7 +1,4 @@
-#define CONF_NETWORK_SOCKS_PROXY_VERSION "/apps/epiphany/network/socks_proxy_version"
-#define CONF_NETWORK_NO_PROXIES_FOR "/apps/epiphany/network/no_proxies_for"
-#define CONF_NETWORK_DISK_CACHE "/apps/epiphany/network/disk_cache_size"
-#define CONF_NETWORK_MEMORY_CACHE "/apps/epiphany/network/mem_cache_size"
+#define CONF_NETWORK_CACHE_SIZE "/apps/epiphany/network/cache_size"
 #define CONF_NETWORK_CACHE_COMPARE "/apps/epiphany/network/cache_compare"
 #define CONF_NETWORK_USER_AGENT "/apps/epiphany/network/user_agent"
 #define CONF_RENDERING_FONT "/apps/epiphany/rendering/font"
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 0e383499a..5346073a0 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -143,11 +143,10 @@ ephy_embed_single_new (const char *type)
 }
 
 gresult
-ephy_embed_single_clear_cache (EphyEmbedSingle *shell,
-			      CacheType type)
+ephy_embed_single_clear_cache (EphyEmbedSingle *shell)
 {
 	EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell);
-        return klass->clear_cache (shell, type);
+        return klass->clear_cache (shell);
 }
 
 gresult
diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index 3d271842e..2e313b6ef 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -98,12 +98,6 @@ typedef enum
 	IMAGES_PERMISSION
 } PermissionType;
 
-typedef enum
-{
-	DISK_CACHE = 2,
-	MEMORY_CACHE = 1
-} CacheType;
-
 struct EphyEmbedSingle
 {
 	GObject parent;
@@ -121,8 +115,7 @@ struct EphyEmbedSingleClass
 
 	/* Methods */
 
-	gresult         (* clear_cache)         (EphyEmbedSingle *shell,
-						 CacheType type);
+	gresult         (* clear_cache)         (EphyEmbedSingle *shell);
 	gresult         (* set_offline_mode)    (EphyEmbedSingle *shell,
 						 gboolean offline);
 	gresult         (* load_proxy_autoconf) (EphyEmbedSingle *shell,
@@ -165,8 +158,7 @@ GType             ephy_embed_single_get_type            (void);
 
 EphyEmbedSingle  *ephy_embed_single_new                 (const char *type);
 
-gresult           ephy_embed_single_clear_cache         (EphyEmbedSingle *shell,
-							 CacheType type);
+gresult           ephy_embed_single_clear_cache         (EphyEmbedSingle *shell);
 
 gresult           ephy_embed_single_set_offline_mode    (EphyEmbedSingle *shell,
 							 gboolean offline);
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index dc5540302..808d61f24 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -203,8 +203,7 @@ static void
 mozilla_embed_single_finalize (GObject *object);
 
 static gresult      
-impl_clear_cache (EphyEmbedSingle *shell,
-		  CacheType type);
+impl_clear_cache (EphyEmbedSingle *shell);
 static gresult          
 impl_set_offline_mode (EphyEmbedSingle *shell,
 		       gboolean offline);
@@ -651,8 +650,7 @@ mozilla_embed_single_finalize (GObject *object)
 }
 
 static gresult      
-impl_clear_cache (EphyEmbedSingle *shell,
-		  CacheType type)
+impl_clear_cache (EphyEmbedSingle *shell)
 {
 	nsresult rv;
 	
@@ -660,7 +658,7 @@ impl_clear_cache (EphyEmbedSingle *shell,
                         do_GetService (NS_CACHESERVICE_CONTRACTID, &rv);
 	if (NS_FAILED(rv)) return G_FAILED;
 
-	CacheService->EvictEntries((guint)type);
+	CacheService->EvictEntries (nsICache::STORE_ANYWHERE);
 
 	return G_OK;
 }
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index ddceaff46..ce52e498e 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -42,6 +42,11 @@
 #include "nsIServiceManager.h"
 
 static void
+mozilla_cache_size_notifier (GConfClient *client,
+		             guint cnxn_id,
+		             GConfEntry *entry,
+		             char *pref);
+static void
 mozilla_own_colors_notifier(GConfClient *client,
 			    guint cnxn_id,
 			    GConfEntry *entry,
@@ -135,14 +140,9 @@ conversion_table [] =
 	{ CONF_NETWORK_HTTP_PROXY, STRING_PREF, "network.proxy.http"},
 	{ CONF_NETWORK_FTP_PROXY, STRING_PREF, "network.proxy.ftp"},
 	{ CONF_NETWORK_SSL_PROXY, STRING_PREF, "network.proxy.ssl"},
-	{ CONF_NETWORK_SOCKS_PROXY, STRING_PREF, "network.proxy.socks"},
 	{ CONF_NETWORK_HTTP_PROXY_PORT, INT_PREF, "network.proxy.http_port"},
 	{ CONF_NETWORK_FTP_PROXY_PORT, INT_PREF, "network.proxy.ftp_port"},
 	{ CONF_NETWORK_SSL_PROXY_PORT, INT_PREF, "network.proxy.ssl_port"},
-	{ CONF_NETWORK_SOCKS_PROXY_PORT, INT_PREF, "network.proxy.socks_port"},
-	{ CONF_NETWORK_NO_PROXIES_FOR, STRING_PREF, "network.proxy.no_proxies_on"},
-	{ CONF_NETWORK_MEMORY_CACHE, INT_PREF, "browser.cache.memory.capacity"},
-	{ CONF_NETWORK_DISK_CACHE, INT_PREF, "browser.cache.disk.capacity"},
 	{ CONF_NETWORK_CACHE_COMPARE, INT_PREF, "browser.cache.check_doc_frequency"},
 	{ CONF_SECURITY_COOKIES_ACCEPT, BOOL_PREF, "network.cookie.warnAboutCookies"},
 	{ CONF_LANGUAGE_DEFAULT_ENCODING, STRING_PREF, "intl.charset.default" },
@@ -169,12 +169,12 @@ custom_notifiers [] =
 	  (GConfClientNotifyFunc) mozilla_language_notifier },
 	{ CONF_RENDERING_DEFAULT_FONT, 
 	  (GConfClientNotifyFunc) mozilla_default_font_notifier },
-	{ CONF_NETWORK_SOCKS_PROXY_VERSION, 
-	  (GConfClientNotifyFunc) mozilla_socks_version_notifier },
 	{ CONF_NETWORK_PROXY_MODE,
 	  (GConfClientNotifyFunc) mozilla_proxy_mode_notifier },
 	{ CONF_NETWORK_PROXY_AUTO_URL,
 	  (GConfClientNotifyFunc) mozilla_proxy_autoconfig_notifier },
+	{ CONF_NETWORK_CACHE_SIZE,
+          (GConfClientNotifyFunc) mozilla_cache_size_notifier },
 	{NULL, NULL}
 };
 
@@ -237,6 +237,19 @@ mozilla_prefs_set_int (const char *preference_name, int new_int_value)
 }
 
 static void
+mozilla_cache_size_notifier (GConfClient *client,
+		             guint cnxn_id,
+		             GConfEntry *entry,
+		             char *pref)
+{
+	int cache_size;
+
+	cache_size = gconf_value_get_int(entry->value) * 1024;
+
+	mozilla_prefs_set_int ("browser.cache.disk.capacity", cache_size);
+}
+
+static void
 mozilla_font_size_notifier (GConfClient *client,
 		            guint cnxn_id,
 		            GConfEntry *entry,
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index e767ad879..950560d8f 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -29,12 +29,6 @@ typedef struct _XbelInfo
 	char *smarturl;
 } XbelInfo;
 
-static char *
-build_keyword (const char *folder)
-{
-	return ephy_str_replace_substring (folder, " ", "_");
-}
-
 static EphyNode *
 set_folder (EphyBookmarks *bookmarks,
 	    EphyNode *bookmark,
@@ -64,12 +58,7 @@ mozilla_parse_bookmarks (EphyBookmarks *bookmarks,
 	{
 		if (xmlStrEqual (child->name, "h3"))
 		{
-			xmlChar *tmp;
-
-			tmp = xmlNodeGetContent (child);
-			g_free (*keyword);
-			*keyword = build_keyword (tmp);
-			xmlFree (tmp);
+			*keyword = xmlNodeGetContent (child);
 		}
 		else if (xmlStrEqual (child->name, "a"))
 		{
@@ -140,13 +129,7 @@ xbel_parse_folder (EphyBookmarks *bookmarks,
 	{
 		if (xmlStrEqual (child->name, "title"))
 		{
-			xmlChar *tmp;
-
-			tmp = xmlNodeGetContent (child);
-
-			g_free (keyword);
-			keyword = build_keyword (tmp);
-			xmlFree (tmp);
+			keyword = xmlNodeGetContent (child);
 		}
 		else if (xmlStrEqual (child->name, "bookmark"))
 		{
@@ -191,7 +174,7 @@ xbel_parse_folder (EphyBookmarks *bookmarks,
 			g_free (keyword);
 			keyword = g_strdup (default_keyword);
 		}
-		
+
 		child = child->next;
 	}
 
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 53170f8f3..594e11e21 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -54,11 +54,8 @@ void
 prefs_proxy_auto_url_reload_cb (GtkWidget *button,
 			        EphyDialog *dialog);
 void
-prefs_clear_memory_cache_button_clicked_cb (GtkWidget *button,
-					    gpointer data);
-void
-prefs_clear_disk_cache_button_clicked_cb (GtkWidget *button,
-					  gpointer data);
+prefs_clear_cache_button_clicked_cb (GtkWidget *button,
+				     gpointer data);
 void
 prefs_dialog_response_cb (GtkDialog *dialog, gint response_id, gpointer data);
 void
@@ -258,8 +255,7 @@ EphyDialogProperty properties [] =
 
 	/* Advanced */
 	{ CACHE_COMPARE_PROP, "cache_compare_radiobutton", CONF_NETWORK_CACHE_COMPARE, PT_AUTOAPPLY, NULL },
-	{ DISK_CACHE_PROP, "disk_cache_spin", CONF_NETWORK_DISK_CACHE, PT_AUTOAPPLY, NULL },
-	{ MEMORY_CACHE_PROP, "memory_cache_spin", CONF_NETWORK_MEMORY_CACHE, PT_AUTOAPPLY, NULL },
+	{ DISK_CACHE_PROP, "disk_cache_spin", CONF_NETWORK_CACHE_SIZE, PT_AUTOAPPLY, NULL },
 
 	{ -1, NULL, NULL }
 };
@@ -1076,27 +1072,15 @@ prefs_dialog_response_cb (GtkDialog *dialog, gint response_id, gpointer data)
 }
 
 void
-prefs_clear_memory_cache_button_clicked_cb (GtkWidget *button,
-					    gpointer data)
-{
-	EphyEmbedSingle *single;
-
-	single = ephy_embed_shell_get_embed_single
-		(EPHY_EMBED_SHELL (ephy_shell));
-
-	ephy_embed_single_clear_cache (single, MEMORY_CACHE);
-}
-
-void
-prefs_clear_disk_cache_button_clicked_cb (GtkWidget *button,
-					  gpointer data)
+prefs_clear_cache_button_clicked_cb (GtkWidget *button,
+				     gpointer data)
 {
 	EphyEmbedSingle *single;
 
 	single = ephy_embed_shell_get_embed_single
 		(EPHY_EMBED_SHELL (ephy_shell));
 
-	ephy_embed_single_clear_cache (single, DISK_CACHE);
+	ephy_embed_single_clear_cache (single);
 }
 
 void