From fd9abc1da8fab3e800600c5762cd2fa13fc4c4a0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 10 Dec 2012 11:48:20 +0000 Subject: [PATCH] e now properly sets "hicolor" as the icon theme when no theme is set (FDO standard: http://icon-theme.freedesktop.org/wiki/HicolorTheme) SVN revision: 80601 --- src/bin/e_config.c | 3 +++ src/modules/conf_theme/e_int_config_xsettings.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index f07ce3547..f4fcbb43f 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -1448,6 +1448,9 @@ e_config_load(void) E_CONFIG_LIMIT(e_config->multiscreen_flip, 0, 1); + if (!e_config->icon_theme) + e_config->icon_theme = eina_stringshare_add("hicolor"); // FDO default + /* FIXME: disabled auto apply because it causes problems */ e_config->cfgdlg_auto_apply = 0; /* FIXME: desklock personalized password id disabled for security reasons */ diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c index 2f5e42c62..b78c652a7 100644 --- a/src/modules/conf_theme/e_int_config_xsettings.c +++ b/src/modules/conf_theme/e_int_config_xsettings.c @@ -150,7 +150,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) if (cfdata->icon_overrides || cfdata->match_e17_icon_theme) e_config->icon_theme = eina_stringshare_ref(cfdata->icon_theme); else - e_config->icon_theme = NULL; + e_config->icon_theme = eina_stringshare_add("hicolor"); // FDO default e_config->icon_theme_overrides = !!cfdata->icon_overrides; e_config->xsettings.match_e17_icon_theme = cfdata->match_e17_icon_theme;