diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-11-05 05:43:09 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-11-05 05:43:09 +0800 |
| commit | 8180308e57e97c0c4e69331aac409e49e6a38876 (patch) | |
| tree | f507f2923ead34164153f2825eea87f8199d3e5d /embed/ephy-embed-prefs.h | |
| parent | f077672b83507d7ae5dedad6c7d82105e5d5d42f (diff) | |
| download | gsoc2013-epiphany-8180308e57e97c0c4e69331aac409e49e6a38876.tar.gz gsoc2013-epiphany-8180308e57e97c0c4e69331aac409e49e6a38876.tar.zst gsoc2013-epiphany-8180308e57e97c0c4e69331aac409e49e6a38876.zip | |
Resync with eel.
2003-11-04 Marco Pesenti Gritti <marco@gnome.org>
* 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.
Diffstat (limited to 'embed/ephy-embed-prefs.h')
| -rw-r--r-- | embed/ephy-embed-prefs.h | 11 |
1 files changed, 8 insertions, 3 deletions
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" |