aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-01-02 01:58:34 +0800
committerChristian Persch <chpe@src.gnome.org>2004-01-02 01:58:34 +0800
commit11a7cc65dfe779d091abd429784d7cad7dbcbf76 (patch)
tree071518269c2ad03849d0fb3826fef3d03ebc310f
parent0e85de55596a39a8f47b3448e376e4c3978c7a3c (diff)
downloadgsoc2013-epiphany-11a7cc65dfe779d091abd429784d7cad7dbcbf76.tar
gsoc2013-epiphany-11a7cc65dfe779d091abd429784d7cad7dbcbf76.tar.gz
gsoc2013-epiphany-11a7cc65dfe779d091abd429784d7cad7dbcbf76.tar.bz2
gsoc2013-epiphany-11a7cc65dfe779d091abd429784d7cad7dbcbf76.tar.lz
gsoc2013-epiphany-11a7cc65dfe779d091abd429784d7cad7dbcbf76.tar.xz
gsoc2013-epiphany-11a7cc65dfe779d091abd429784d7cad7dbcbf76.tar.zst
gsoc2013-epiphany-11a7cc65dfe779d091abd429784d7cad7dbcbf76.zip
Remove default font notifier, it's been obsoleted by the fonts rewrite.
2004-01-01 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed-prefs.h: * embed/mozilla/mozilla-notifiers.cpp: Remove default font notifier, it's been obsoleted by the fonts rewrite.
-rw-r--r--ChangeLog7
-rw-r--r--embed/ephy-embed-prefs.h1
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp23
3 files changed, 18 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index ba7dbdeff..81724a290 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-01-01 Christian Persch <chpe@cvs.gnome.org>
+ * embed/ephy-embed-prefs.h:
+ * embed/mozilla/mozilla-notifiers.cpp:
+
+ Remove default font notifier, it's been obsoleted by the fonts rewrite.
+
+2004-01-01 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/mozilla-notifiers.cpp:
Set socks prefs from gconf too.
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index 0ba5954f8..33b86da97 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -12,7 +12,6 @@
#define CONF_SECURITY_COOKIES_ACCEPT "/apps/epiphany/web/cookie_accept"
#define CONF_LANGUAGE_AUTODETECT_ENCODING "/apps/epiphany/web/autodetect_encoding"
#define CONF_LANGUAGE_DEFAULT_ENCODING "/apps/epiphany/web/default_encoding"
-#define CONF_RENDERING_DEFAULT_FONT "/apps/epiphany/web/default_font_type"
/* These are defined gnome wide now */
#define CONF_NETWORK_PROXY_MODE "/system/proxy/mode"
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index 01070613b..3a0314ddf 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -138,20 +138,19 @@ static const struct
}
conversion_table [] =
{
- { CONF_SECURITY_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
- { CONF_SECURITY_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
- { CONF_NETWORK_PROXY_AUTO_URL, STRING_PREF, "network.proxy.autoconfig_url"},
- { 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_SECURITY_JAVA_ENABLED, BOOL_PREF, "security.enable_java" },
+ { CONF_SECURITY_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled" },
+ { CONF_NETWORK_PROXY_AUTO_URL, STRING_PREF, "network.proxy.autoconfig_url" },
+ { 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_LANGUAGE_DEFAULT_ENCODING, STRING_PREF, "intl.charset.default" },
{ CONF_LANGUAGE_AUTODETECT_ENCODING, STRING_PREF, "intl.charset.detector" },
- { CONF_RENDERING_DEFAULT_FONT, STRING_PREF, "font.default" },
{ NULL, 0, NULL }
};