aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-prefs.h5
-rw-r--r--embed/ephy-embed-single.c5
-rw-r--r--embed/ephy-embed-single.h12
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp8
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp27
5 files changed, 28 insertions, 29 deletions
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,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 10:00:52 +0800