discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c081cee34d7fbb6701dd58f5672e2d4012268b1b
commit c081cee34d7fbb6701dd58f5672e2d4012268b1b
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Sat Dec 21 15:30:28 2013 -0500
remove e-specific theme config members
---
src/bin/e_config.c | 41 +----------------------------------------
src/bin/e_config.h | 10 ----------
2 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 183c90a..15d3cbc 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -240,14 +240,6 @@ _e_config_edd_init(Eina_Bool old)
#define D _e_config_path_append_edd
E_CONFIG_VAL(D, T, dir, STR);
- _e_config_theme_edd = E_CONFIG_DD_NEW("E_Config_Theme", E_Config_Theme);
-#undef T
-#undef D
-#define T E_Config_Theme
-#define D _e_config_theme_edd
- E_CONFIG_VAL(D, T, category, STR);
- E_CONFIG_VAL(D, T, file, STR);
-
_e_config_module_edd = E_CONFIG_DD_NEW("E_Config_Module", E_Config_Module);
#undef T
#undef D
@@ -431,7 +423,6 @@ _e_config_edd_init(Eina_Bool old)
E_CONFIG_VAL(D, T, config_version, INT); /**/
E_CONFIG_VAL(D, T, config_type, UINT); /**/
E_CONFIG_VAL(D, T, show_splash, INT); /**/
- E_CONFIG_VAL(D, T, init_default_theme, STR); /**/
E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/
E_CONFIG_VAL(D, T, desktop_default_name, STR); /**/
E_CONFIG_VAL(D, T, desktop_default_window_profile, STR); /**/
@@ -462,7 +453,6 @@ _e_config_edd_init(Eina_Bool old)
EET_DATA_DESCRIPTOR_ADD_LIST_STRING(D, T, "bad_modules", bad_modules);
E_CONFIG_LIST(D, T, font_fallbacks, _e_config_font_fallback_edd); /**/
E_CONFIG_LIST(D, T, font_defaults, _e_config_font_default_edd); /**/
- E_CONFIG_LIST(D, T, themes, _e_config_theme_edd); /**/
E_CONFIG_LIST(D, T, mouse_bindings, _e_config_bindings_mouse_edd); /**/
E_CONFIG_LIST(D, T, key_bindings, _e_config_bindings_key_edd); /**/
E_CONFIG_LIST(D, T, edge_bindings, _e_config_bindings_edge_edd); /**/
@@ -472,7 +462,6 @@ _e_config_edd_init(Eina_Bool old)
E_CONFIG_LIST(D, T, path_append_data, _e_config_path_append_edd); /**/
E_CONFIG_LIST(D, T, path_append_images, _e_config_path_append_edd); /**/
E_CONFIG_LIST(D, T, path_append_fonts, _e_config_path_append_edd); /**/
- E_CONFIG_LIST(D, T, path_append_themes, _e_config_path_append_edd); /**/
E_CONFIG_LIST(D, T, path_append_init, _e_config_path_append_edd); /**/
E_CONFIG_LIST(D, T, path_append_icons, _e_config_path_append_edd); /**/
E_CONFIG_LIST(D, T, path_append_modules, _e_config_path_append_edd); /**/
@@ -1238,13 +1227,11 @@ e_config_load(void)
}
CONFIG_VERSION_CHECK(14)
{
- E_Config_Theme *et;
- E_Path_Dir *epd;
- char buf[PATH_MAX], buf2[PATH_MAX], *f;
Eina_List *files, *l;
Eina_Bool fail = EINA_FALSE;
E_Config_Shelf *cf_es;
E_Remember *rem;
+ char buf[PATH_MAX], buf2[PATH_MAX], *f;
CONFIG_VERSION_UPDATE_INFO(14);
@@ -1262,19 +1249,6 @@ e_config_load(void)
cf_es->popup = 0;
}
- // empty out theme elements of config
- eina_stringshare_replace(&e_config->init_default_theme, NULL);
- EINA_LIST_FREE(e_config->themes, et)
- {
- eina_stringshare_del(et->category);
- eina_stringshare_del(et->file);
- free(et);
- }
- EINA_LIST_FREE(e_config->path_append_themes, epd)
- {
- eina_stringshare_del(epd->dir);
- free(epd);
- }
/* E19 layer values are higher */
EINA_LIST_FOREACH(e_config->remembers, l, rem)
if (rem->apply & E_REMEMBER_APPLY_LAYER)
@@ -2132,7 +2106,6 @@ _e_config_free(E_Config *ecf)
E_Font_Fallback *eff;
E_Config_Module *em;
E_Font_Default *efd;
- E_Config_Theme *et;
E_Color_Class *cc;
E_Path_Dir *epd;
E_Remember *rem;
@@ -2174,12 +2147,6 @@ _e_config_free(E_Config *ecf)
if (efd->font) eina_stringshare_del(efd->font);
E_FREE(efd);
}
- EINA_LIST_FREE(ecf->themes, et)
- {
- if (et->category) eina_stringshare_del(et->category);
- if (et->file) eina_stringshare_del(et->file);
- E_FREE(et);
- }
EINA_LIST_FREE(ecf->path_append_data, epd)
{
if (epd->dir) eina_stringshare_del(epd->dir);
@@ -2195,11 +2162,6 @@ _e_config_free(E_Config *ecf)
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
- EINA_LIST_FREE(ecf->path_append_themes, epd)
- {
- if (epd->dir) eina_stringshare_del(epd->dir);
- E_FREE(epd);
- }
EINA_LIST_FREE(ecf->path_append_init, epd)
{
if (epd->dir) eina_stringshare_del(epd->dir);
@@ -2247,7 +2209,6 @@ _e_config_free(E_Config *ecf)
if (cc->name) eina_stringshare_del(cc->name);
E_FREE(cc);
}
- if (ecf->init_default_theme) eina_stringshare_del(ecf->init_default_theme);
if (ecf->desktop_default_background)
eina_stringshare_del(ecf->desktop_default_background);
if (ecf->desktop_default_name)
eina_stringshare_del(ecf->desktop_default_name);
if (ecf->desktop_default_window_profile)
eina_stringshare_del(ecf->desktop_default_window_profile);
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 2678302..479f876 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -4,7 +4,6 @@
typedef struct _E_Config E_Config;
typedef struct _E_Config_Module E_Config_Module;
-typedef struct _E_Config_Theme E_Config_Theme;
typedef struct _E_Config_Binding_Mouse E_Config_Binding_Mouse;
typedef struct _E_Config_Binding_Key E_Config_Binding_Key;
typedef struct _E_Config_Binding_Edge E_Config_Binding_Edge;
@@ -58,7 +57,6 @@ struct _E_Config
int config_version; // INTERNAL
E_Config_Profile_Type config_type; // INTERNAL
int show_splash; // GUI
- const char *init_default_theme; // GUI
const char *desktop_default_background; // GUI
Eina_List *desktop_backgrounds; // GUI
const char *desktop_default_name;
@@ -89,7 +87,6 @@ struct _E_Config
Eina_List *bad_modules; // GUI
Eina_List *font_fallbacks; // GUI
Eina_List *font_defaults; // GUI
- Eina_List *themes; // GUI
/* NO LONGER SAVED WITH THIS STRUCT */
Eina_List *mouse_bindings; // GUI
@@ -102,7 +99,6 @@ struct _E_Config
Eina_List *path_append_data; // GUI
Eina_List *path_append_images; // GUI
Eina_List *path_append_fonts; // GUI
- Eina_List *path_append_themes; // GUI
Eina_List *path_append_init; // GUI
Eina_List *path_append_icons; // GUI
Eina_List *path_append_modules; // GUI
@@ -478,12 +474,6 @@ struct _E_Config_Module
int priority;
};
-struct _E_Config_Theme
-{
- const char *category;
- const char *file;
-};
-
struct _E_Config_Binding_Mouse
{
int context;
--
