From 8180308e57e97c0c4e69331aac409e49e6a38876 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 4 Nov 2003 21:43:09 +0000 Subject: Resync with eel. 2003-11-04 Marco Pesenti Gritti * lib/eel-gconf-extensions.c: (global_client_free), (eel_gconf_client_get_global), (eel_gconf_handle_error), (eel_gconf_set_string), (eel_gconf_is_default), (eel_gconf_key_is_writable), (eel_gconf_monitor_add), (eel_gconf_monitor_remove), (eel_gconf_preload_cache), (eel_gconf_get_default_value), (eel_strcmp), (eel_str_is_equal), (simple_value_is_equal), (eel_gconf_value_is_equal), (eel_gconf_value_get_string_list), (eel_gconf_value_set_string_list), (eel_gconf_set_float), (eel_gconf_get_float): * lib/eel-gconf-extensions.h: Resync with eel. * lib/ephy-prefs.h: * lib/widgets/ephy-spinner.c: * embed/ephy-embed-prefs.h: * embed/mozilla/mozilla-notifiers.cpp: Migrate old font size settings. This will screw things for 1.1 users, not much we can do about it now. --- embed/ephy-embed-prefs.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'embed/ephy-embed-prefs.h') diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h index 50e63bdb7..71cba6166 100644 --- a/embed/ephy-embed-prefs.h +++ b/embed/ephy-embed-prefs.h @@ -1,8 +1,8 @@ #define CONF_NETWORK_CACHE_SIZE "/apps/epiphany/web/cache_size" #define CONF_RENDERING_FONT "/apps/epiphany/web/font" -#define CONF_RENDERING_FONT_VAR_SIZE "/apps/epiphany/web/font_var_size" -#define CONF_RENDERING_FONT_FIXED_SIZE "/apps/epiphany/web/font_fixed_size" -#define CONF_RENDERING_FONT_MIN_SIZE "/apps/epiphany/web/font_min_size" +#define CONF_RENDERING_FONT_VAR_SIZE "/apps/epiphany/web/font_var_size_pt" +#define CONF_RENDERING_FONT_FIXED_SIZE "/apps/epiphany/web/font_fixed_size_pt" +#define CONF_RENDERING_FONT_MIN_SIZE "/apps/epiphany/web/font_min_size_pt" #define CONF_RENDERING_LANGUAGE "/apps/epiphany/web/language" #define CONF_RENDERING_USE_OWN_COLORS "/apps/epiphany/web/use_own_colors" #define CONF_RENDERING_USE_OWN_FONTS "/apps/epiphany/web/use_own_fonts" @@ -26,3 +26,8 @@ #define CONF_NETWORK_SOCKS_PROXY_PORT "/system/proxy/socks_port" #define CONF_NETWORK_PROXY_AUTO_URL "/system/proxy/autoconfig_url" #define CONF_NETWORK_PROXY_IGNORE_HOSTS "/system/http_proxy/ignore_hosts" + +/* Deprecated, we migrate them */ +#define CONF_RENDERING_FONT_VAR_SIZE_OLD "/apps/epiphany/web/font_var_size" +#define CONF_RENDERING_FONT_FIXED_SIZE_OLD "/apps/epiphany/web/font_fixed_size" +#define CONF_RENDERING_FONT_MIN_SIZE_OLD "/apps/epiphany/web/font_min_size" -- cgit v1.2.3