enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

* e_int_config_theme: Use more eina macro, remove some memory leak, 

reduce memory allocation and memory comparison.


SVN revision: 39552
This commit is contained in:
Cedric BAIL 2009-03-18 16:52:49 +00:00
parent 1ef42062db
commit 613db34144
1 changed files with 173 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

342
src/modules/conf_theme/e_int_config_theme.c
View File

@ -14,7 +14,6 @@ static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas
static int _advanced_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _advanced_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static Eina_List *_get_theme_categories_list (void); static Eina_List *_get_theme_categories_list (void);
static Eina_List *_get_parts_list (void);
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
@ -27,7 +26,7 @@ struct _E_Config_Dialog_Data
Evas_Object *o_personal; Evas_Object *o_personal;
Evas_Object *o_system; Evas_Object *o_system;
int fmdir; int fmdir;
char *theme; const char *theme;
/* Advanced */ /* Advanced */
Evas_Object *o_categories_ilist; Evas_Object *o_categories_ilist;
@ -41,6 +40,36 @@ struct _E_Config_Dialog_Data
E_Dialog *dia_web; E_Dialog *dia_web;
}; };
static const char *parts_list[] = {
"about:e/widgets/about/main",
"borders:e/widgets/border/default/border",
"background:e/desktop/background",
"configure:e/widgets/configure/main",
"dialog:e/widgets/dialog/main",
"dnd:ZZZ",
"error:e/error/main",
"exebuf:e/widgets/exebuf/main",
"fileman:ZZZ",
"gadman:e/gadman/control",
"icons:ZZZ",
"menus:ZZZ",
"modules:ZZZ",
"modules/pager:e/widgets/pager/popup",
"modules/ibar:ZZZ",
"modules/ibox:ZZZ",
"modules/clock:e/modules/clock/main",
"modules/battery:e/modules/battery/main",
"modules/cpufreq:e/modules/cpufreq/main",
"modules/start:e/modules/start/main",
"modules/temperature:e/modules/temperature/main",
"pointer:e/pointer",
"shelf:e/shelf/default/base",
"transitions:ZZZ",
"widgets:ZZZ",
"winlist:e/widgets/winlist/main",
NULL
};
EAPI E_Config_Dialog * EAPI E_Config_Dialog *
e_int_config_theme(E_Container *con, const char *params __UNUSED__) e_int_config_theme(E_Container *con, const char *params __UNUSED__)
{ {
@ -94,8 +123,8 @@ e_int_config_theme_update(E_Config_Dialog *dia, char *file)
e_widget_radio_toggle_set(cfdata->o_personal, 1); e_widget_radio_toggle_set(cfdata->o_personal, 1);
snprintf(path, sizeof(path), "%s/.e/e/themes", e_user_homedir_get()); snprintf(path, sizeof(path), "%s/.e/e/themes", e_user_homedir_get());
E_FREE(cfdata->theme); eina_stringshare_del(cfdata->theme);
cfdata->theme = strdup(file); cfdata->theme = eina_stringshare_add(file);
if (cfdata->o_fm) if (cfdata->o_fm)
e_widget_flist_path_set(cfdata->o_fm, path, "/"); e_widget_flist_path_set(cfdata->o_fm, path, "/");
@ -151,8 +180,8 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
if (ecore_file_is_dir(buf)) return; if (ecore_file_is_dir(buf)) return;
E_FREE(cfdata->theme); eina_stringshare_del(cfdata->theme);
cfdata->theme = strdup(buf); cfdata->theme = eina_stringshare_add(buf);
if (cfdata->o_preview) if (cfdata->o_preview)
e_widget_preview_edje_set(cfdata->o_preview, buf, "e/desktop/background"); e_widget_preview_edje_set(cfdata->o_preview, buf, "e/desktop/background");
if (cfdata->o_fm) e_widget_change(cfdata->o_fm); if (cfdata->o_fm) e_widget_change(cfdata->o_fm);
@ -279,12 +308,12 @@ _fill_data(E_Config_Dialog_Data *cfdata)
c = e_theme_config_get("theme"); c = e_theme_config_get("theme");
if (c) if (c)
cfdata->theme = strdup(c->file); cfdata->theme = eina_stringshare_add(c->file);
else else
{ {
snprintf(path, sizeof(path), "%s/data/themes/default.edj", snprintf(path, sizeof(path), "%s/data/themes/default.edj",
e_prefix_data_get()); e_prefix_data_get());
cfdata->theme = strdup(path); cfdata->theme = eina_stringshare_add(path);
} }
if (cfdata->theme[0] != '/') if (cfdata->theme[0] != '/')
{ {
@ -292,8 +321,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
e_user_homedir_get(), cfdata->theme); e_user_homedir_get(), cfdata->theme);
if (ecore_file_exists(path)) if (ecore_file_exists(path))
{ {
E_FREE(cfdata->theme); eina_stringshare_del(cfdata->theme);
cfdata->theme = strdup(path); cfdata->theme = eina_stringshare_add(path);
} }
else else
{ {
@ -301,14 +330,13 @@ _fill_data(E_Config_Dialog_Data *cfdata)
e_prefix_data_get(), cfdata->theme); e_prefix_data_get(), cfdata->theme);
if (ecore_file_exists(path)) if (ecore_file_exists(path))
{ {
E_FREE(cfdata->theme); eina_stringshare_del(cfdata->theme);
cfdata->theme = strdup(path); cfdata->theme = eina_stringshare_add(path);
} }
} }
} }
cfdata->theme_list = _get_theme_categories_list(); cfdata->theme_list = _get_theme_categories_list();
cfdata->parts_list = _get_parts_list();
snprintf(path, sizeof(path), "%s/data/themes", e_prefix_data_get()); snprintf(path, sizeof(path), "%s/data/themes", e_prefix_data_get());
if (!strncmp(cfdata->theme, path, strlen(path))) if (!strncmp(cfdata->theme, path, strlen(path)))
@ -330,11 +358,18 @@ _create_data(E_Config_Dialog *cfd)
static void static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
E_Config_Theme *t;
if (cfdata->win_import) if (cfdata->win_import)
e_int_config_theme_del(cfdata->win_import); e_int_config_theme_del(cfdata->win_import);
eina_list_free(cfdata->theme_list); EINA_LIST_FREE(cfdata->theme_list, t)
E_FREE(cfdata->theme); {
eina_stringshare_del(t->file);
eina_stringshare_del(t->category);
free(t);
}
E_FREE(cfdata); E_FREE(cfdata);
} }
@ -461,133 +496,100 @@ _cb_sort(const void *data1, const void *data2)
return strcmp(d1, d2); return strcmp(d1, d2);
} }
static Eina_List *
_get_parts_list(void)
{
Eina_List *parts = NULL;
/*
* TODO: Those parts with ZZZ, are the ones I could not find a suitable
* part to use as its preview.
*/
parts = eina_list_append(parts, strdup("about:e/widgets/about/main"));
parts = eina_list_append(parts, strdup("borders:e/widgets/border/default/border"));
parts = eina_list_append(parts, strdup("background:e/desktop/background"));
parts = eina_list_append(parts, strdup("configure:e/widgets/configure/main"));
parts = eina_list_append(parts, strdup("dialog:e/widgets/dialog/main"));
parts = eina_list_append(parts, strdup("dnd:ZZZ"));
parts = eina_list_append(parts, strdup("error:e/error/main"));
parts = eina_list_append(parts, strdup("exebuf:e/widgets/exebuf/main"));
parts = eina_list_append(parts, strdup("fileman:ZZZ"));
parts = eina_list_append(parts, strdup("gadman:e/gadman/control"));
parts = eina_list_append(parts, strdup("icons:ZZZ"));
parts = eina_list_append(parts, strdup("menus:ZZZ"));
parts = eina_list_append(parts, strdup("modules:ZZZ"));
parts = eina_list_append(parts, strdup("modules/pager:e/widgets/pager/popup"));
parts = eina_list_append(parts, strdup("modules/ibar:ZZZ"));
parts = eina_list_append(parts, strdup("modules/ibox:ZZZ"));
parts = eina_list_append(parts, strdup("modules/clock:e/modules/clock/main"));
parts = eina_list_append(parts, strdup("modules/battery:e/modules/battery/main"));
parts = eina_list_append(parts, strdup("modules/cpufreq:e/modules/cpufreq/main"));
parts = eina_list_append(parts, strdup("modules/start:e/modules/start/main"));
parts = eina_list_append(parts, strdup("modules/temperature:e/modules/temperature/main"));
parts = eina_list_append(parts, strdup("pointer:e/pointer"));
parts = eina_list_append(parts, strdup("shelf:e/shelf/default/base"));
parts = eina_list_append(parts, strdup("transitions:ZZZ"));
parts = eina_list_append(parts, strdup("widgets:ZZZ"));
parts = eina_list_append(parts, strdup("winlist:e/widgets/winlist/main"));
return parts;
}
static Eina_List * static Eina_List *
_get_theme_categories_list(void) _get_theme_categories_list(void)
{ {
Eina_List *themes, *tcl = NULL; Eina_List *themes, *tcl = NULL;
Eina_List *cats = NULL, *g = NULL, *cats2 = NULL; Eina_List *cats = NULL, *g = NULL, *cats2 = NULL;
const char *category; const char *c;
char *category;
/* Setup some default theme categories */ /* Setup some default theme categories */
cats = eina_list_append(cats, strdup("base/theme/about")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/about"));
cats = eina_list_append(cats, strdup("base/theme/borders")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/borders"));
cats = eina_list_append(cats, strdup("base/theme/background")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/background"));
cats = eina_list_append(cats, strdup("base/theme/configure")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/configure"));
cats = eina_list_append(cats, strdup("base/theme/dialog")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/dialog"));
cats = eina_list_append(cats, strdup("base/theme/dnd")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/dnd"));
cats = eina_list_append(cats, strdup("base/theme/error")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/error"));
cats = eina_list_append(cats, strdup("base/theme/exebuf")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/exebuf"));
cats = eina_list_append(cats, strdup("base/theme/fileman")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/fileman"));
cats = eina_list_append(cats, strdup("base/theme/gadman")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/gadman"));
cats = eina_list_append(cats, strdup("base/theme/icons")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/icons"));
cats = eina_list_append(cats, strdup("base/theme/menus")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/menus"));
cats = eina_list_append(cats, strdup("base/theme/modules")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/modules"));
cats = eina_list_append(cats, strdup("base/theme/modules/pager")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/modules/pager"));
cats = eina_list_append(cats, strdup("base/theme/modules/ibar")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/modules/ibar"));
cats = eina_list_append(cats, strdup("base/theme/modules/ibox")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/modules/ibox"));
cats = eina_list_append(cats, strdup("base/theme/modules/clock")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/modules/clock"));
cats = eina_list_append(cats, strdup("base/theme/modules/battery")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/modules/battery"));
cats = eina_list_append(cats, strdup("base/theme/modules/cpufreq")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/modules/cpufreq"));
cats = eina_list_append(cats, strdup("base/theme/modules/start")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/modules/start"));
cats = eina_list_append(cats, strdup("base/theme/modules/temperature")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/modules/temperature"));
cats = eina_list_append(cats, strdup("base/theme/pointer")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/pointer"));
cats = eina_list_append(cats, strdup("base/theme/shelf")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/shelf"));
cats = eina_list_append(cats, strdup("base/theme/transitions")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/transitions"));
cats = eina_list_append(cats, strdup("base/theme/widgets")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/widgets"));
cats = eina_list_append(cats, strdup("base/theme/winlist")); cats = eina_list_append(cats, eina_stringshare_add("base/theme/winlist"));
cats = eina_list_sort(cats, 0, _cb_sort);
/* /*
* Get a list of registered themes. * Get a list of registered themes.
* Add those which are not in the above list * Add those which are not in the above list
*/ */
for (g = e_theme_category_list(); g; g = g->next) EINA_LIST_FOREACH(e_theme_category_list(), g, c)
{ {
const char *c; const char *result;
if (!(c = g->data)) continue; if (!c) continue;
cats2 = cats; cats2 = eina_list_search_sorted_near_list(cats, _cb_sort, c);
while (cats2) result = eina_list_data_get(cats2);
if (result)
{ {
if (!strcmp(c, cats2->data)) break; int res;
cats2 = cats2->next;
}
if (!cats2)
cats = eina_list_append(cats, strdup(c));
}
cats = eina_list_sort(cats, -1, _cb_sort);
while (cats) res = strcmp(c, result);
if (!res) continue;
if (res < 0)
cats = eina_list_prepend_relative_list(cats, eina_stringshare_ref(c), cats2);
else
cats = eina_list_append_relative_list(cats, eina_stringshare_ref(c), cats2);
}
}
EINA_LIST_FREE(cats, category)
{ {
E_Config_Theme *theme, *newtheme = NULL; E_Config_Theme *theme, *newtheme = NULL;
category = cats->data;
/* Not interested in adding "base" */ /* Not interested in adding "base" */
if (strcmp(category, "base")) if (strcmp(category, "base"))
{ {
newtheme = (E_Config_Theme *)malloc(sizeof(E_Config_Theme)); newtheme = (E_Config_Theme *)malloc(sizeof(E_Config_Theme));
if (!newtheme) break; if (!newtheme) break;
if (!strcmp(category, "base/theme")) if (!strcmp(category, "base/theme"))
newtheme->category = strdup("base/theme/Base Theme"); newtheme->category = eina_stringshare_add("base/theme/Base Theme");
else else
newtheme->category = strdup(category); newtheme->category = eina_stringshare_ref(category);
newtheme->file = NULL; newtheme->file = NULL;
for (themes = e_config->themes; themes; themes = themes->next) EINA_LIST_FOREACH(e_config->themes, themes, theme)
{ {
theme = themes->data;
if (!strcmp(category + 5, theme->category)) if (!strcmp(category + 5, theme->category))
newtheme->file = strdup(theme->file); {
newtheme->file = eina_stringshare_add(theme->file);
}
} }
tcl = eina_list_append(tcl, newtheme); tcl = eina_list_append(tcl, newtheme);
} }
cats = cats->next; eina_stringshare_del(category);
} }
cats = eina_list_free(cats);
return tcl; return tcl;
} }
static char * static const char *
_files_ilist_nth_label_to_file(void *data, int n) _files_ilist_nth_label_to_file(void *data, int n)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
@ -605,7 +607,7 @@ _files_ilist_nth_label_to_file(void *data, int n)
e_user_homedir_get(), e_user_homedir_get(),
e_widget_ilist_nth_label_get(cfdata->o_files_ilist, n)); e_widget_ilist_nth_label_get(cfdata->o_files_ilist, n));
return strdup(file); return eina_stringshare_add(file);
} }
static void static void
@ -614,8 +616,7 @@ _preview_set(void *data)
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
const char *theme; const char *theme;
char c_label[128]; char c_label[128];
int n, ret = 0; int n;
Eina_List *p;
if (!(cfdata = data)) return; if (!(cfdata = data)) return;
@ -625,18 +626,19 @@ _preview_set(void *data)
e_widget_ilist_selected_label_get(cfdata->o_categories_ilist)); e_widget_ilist_selected_label_get(cfdata->o_categories_ilist));
if (theme) if (theme)
{ {
p = cfdata->parts_list; int ret = 0;
while (p) int i;
{
if (strstr((char *)(p->data), c_label)) break; for (i = 0; parts_list[i] != NULL; i++)
p = p->next; if (strstr(parts_list[i], c_label)) break;
}
if (p) if (parts_list[i])
ret = e_widget_preview_edje_set(cfdata->o_preview, theme, ret = e_widget_preview_edje_set(cfdata->o_preview, theme,
(char *)p->data + strlen(c_label)); parts_list[i] + strlen(c_label));
if (!ret) if (!ret)
ret = e_widget_preview_edje_set(cfdata->o_preview, theme, ret = e_widget_preview_edje_set(cfdata->o_preview, theme,
"e/desktop/background"); "e/desktop/background");
eina_stringshare_del(theme);
} }
} }
@ -648,6 +650,7 @@ _cb_adv_categories_change(void *data, Evas_Object *obj)
const char *file = NULL; const char *file = NULL;
char category[256]; char category[256];
Eina_List *themes = NULL; Eina_List *themes = NULL;
E_Config_Theme *t;
Evas_Object *ic = NULL; Evas_Object *ic = NULL;
int n; int n;
@ -665,14 +668,11 @@ _cb_adv_categories_change(void *data, Evas_Object *obj)
} }
snprintf(category, sizeof(category), "base/theme/%s", label); snprintf(category, sizeof(category), "base/theme/%s", label);
for (themes = cfdata->theme_list; themes; themes = themes->next) EINA_LIST_FOREACH(cfdata->theme_list, themes, t)
{ {
E_Config_Theme *t;
t = themes->data;
if (!strcmp(category, t->category) && (t->file)) if (!strcmp(category, t->category) && (t->file))
{ {
file = strdup(t->file); file = t->file;
break; break;
} }
} }
@ -680,14 +680,16 @@ _cb_adv_categories_change(void *data, Evas_Object *obj)
for (n = 0; n < e_widget_ilist_count(cfdata->o_files_ilist); n++) for (n = 0; n < e_widget_ilist_count(cfdata->o_files_ilist); n++)
{ {
if (!strcmp(file, _files_ilist_nth_label_to_file(cfdata, n))) const char *tmp;
tmp = _files_ilist_nth_label_to_file(cfdata, n);
eina_stringshare_del(tmp);
if (file == tmp) /* We don't need the value, just the adress. */
{ {
e_widget_ilist_selected_set(cfdata->o_files_ilist, n); e_widget_ilist_selected_set(cfdata->o_files_ilist, n);
break; break;
} }
} }
free((void *)file);
} }
static void static void
@ -700,15 +702,12 @@ static int
_theme_file_used(Eina_List *tlist, const char *filename) _theme_file_used(Eina_List *tlist, const char *filename)
{ {
E_Config_Theme *theme; E_Config_Theme *theme;
Eina_List *l;
if (!filename) return 0; if (!filename) return 0;
while (tlist) EINA_LIST_FOREACH(tlist, l, theme)
{ if (theme->file == filename) return 1;
theme = tlist->data;
if (theme->file && !strcmp(theme->file, filename)) return 1;
tlist = tlist->next;
}
return 0; return 0;
} }
@ -723,6 +722,7 @@ _ilist_files_add(E_Config_Dialog_Data *cfdata, const char *header, const char *d
char themename[1024]; char themename[1024];
char *tmp; char *tmp;
Evas_Object *o; Evas_Object *o;
const char *theme;
Evas *evas; Evas *evas;
o = cfdata->o_files_ilist; o = cfdata->o_files_ilist;
@ -738,7 +738,7 @@ _ilist_files_add(E_Config_Dialog_Data *cfdata, const char *header, const char *d
{ {
snprintf(themename, sizeof(themename), "%s/%s", snprintf(themename, sizeof(themename), "%s/%s",
dir, dentry->d_name); dir, dentry->d_name);
themefiles = eina_list_append(themefiles, strdup(themename)); themefiles = eina_list_append(themefiles, eina_stringshare_add(themename));
} }
} }
closedir(d); closedir(d);
@ -749,22 +749,22 @@ _ilist_files_add(E_Config_Dialog_Data *cfdata, const char *header, const char *d
themefiles = eina_list_sort(themefiles, -1, _cb_sort); themefiles = eina_list_sort(themefiles, -1, _cb_sort);
count = eina_list_count(themefiles); count = eina_list_count(themefiles);
while (themefiles) EINA_LIST_FREE(themefiles, theme)
{ {
Evas_Object *ic = NULL; Evas_Object *ic = NULL;
if (_theme_file_used(cfdata->theme_list, themefiles->data)) if (_theme_file_used(cfdata->theme_list, theme))
{ {
ic = e_icon_add(evas); ic = e_icon_add(evas);
e_util_icon_theme_set(ic, "preferences-desktop-theme"); e_util_icon_theme_set(ic, "preferences-desktop-theme");
} }
tmp = strdup(strrchr(themefiles->data, '/') + 1); tmp = strdup(strrchr(theme, '/') + 1);
strncpy(themename, tmp, strlen(tmp) - 3); strncpy(themename, tmp, strlen(tmp) - 3);
themename[strlen(tmp) - 4] = '\0'; themename[strlen(tmp) - 4] = '\0';
e_widget_ilist_append(o, ic, themename, NULL, NULL, NULL); e_widget_ilist_append(o, ic, themename, NULL, NULL, NULL);
free(tmp); free(tmp);
themefiles = themefiles->next; eina_stringshare_del(theme);
} }
} }
@ -819,19 +819,16 @@ _fill_categories_ilist(E_Config_Dialog_Data *cfdata)
e_widget_ilist_freeze(o); e_widget_ilist_freeze(o);
e_widget_ilist_clear(o); e_widget_ilist_clear(o);
themes = cfdata->theme_list; EINA_LIST_FOREACH(cfdata->theme_list, themes, theme)
while (themes)
{ {
Evas_Object *ic = NULL; Evas_Object *ic = NULL;
theme = themes->data;
if (theme->file) if (theme->file)
{ {
ic = e_icon_add(evas); ic = e_icon_add(evas);
e_util_icon_theme_set(ic, "dialog-ok-apply"); e_util_icon_theme_set(ic, "dialog-ok-apply");
} }
e_widget_ilist_append(o, ic, theme->category + 11, NULL, NULL, NULL); e_widget_ilist_append(o, ic, theme->category + 11, NULL, NULL, NULL);
themes = themes->next;
} }
e_widget_ilist_go(o); e_widget_ilist_go(o);
@ -868,7 +865,7 @@ _cb_adv_btn_assign(void *data1, void *data2)
label = e_widget_ilist_selected_label_get(oc); label = e_widget_ilist_selected_label_get(oc);
snprintf(buf, sizeof(buf), "base/theme/%s", label); snprintf(buf, sizeof(buf), "base/theme/%s", label);
newtheme->category = strdup(buf); newtheme->category = eina_stringshare_add(buf);
n = e_widget_ilist_selected_get(of); n = e_widget_ilist_selected_get(of);
ic = e_icon_add(evas); ic = e_icon_add(evas);
@ -876,26 +873,31 @@ _cb_adv_btn_assign(void *data1, void *data2)
e_widget_ilist_nth_icon_set(of, n, ic); e_widget_ilist_nth_icon_set(of, n, ic);
newtheme->file = _files_ilist_nth_label_to_file(cfdata, n); newtheme->file = _files_ilist_nth_label_to_file(cfdata, n);
for (themes = cfdata->theme_list; themes; themes = themes->next) EINA_LIST_FOREACH(cfdata->theme_list, themes, t)
{ {
const char *filename = NULL; const char *filename = NULL;
t = themes->data;
if (!strcmp(t->category, newtheme->category)) if (!strcmp(t->category, newtheme->category))
{ {
if ((t->file) && (strcmp(t->file, newtheme->file))) if ((t->file) && (strcmp(t->file, newtheme->file)))
{ {
filename = eina_stringshare_add(t->file); filename = t->file;
free((void *)(t->file));
t->file = NULL; t->file = NULL;
if (!_theme_file_used(cfdata->theme_list, filename)) if (!_theme_file_used(cfdata->theme_list, filename))
{ {
for (n = 0; n < e_widget_ilist_count(of); n++) for (n = 0; n < e_widget_ilist_count(of); n++)
if (!strcmp(filename, _files_ilist_nth_label_to_file(cfdata, n))) {
e_widget_ilist_nth_icon_set(of, n, NULL); const char *tmp;
tmp = _files_ilist_nth_label_to_file(cfdata, n);
eina_stringshare_del(tmp);
if (filename == tmp) /* We just need the pointer, not the value. */
e_widget_ilist_nth_icon_set(of, n, NULL);
}
} }
} }
t->file = strdup(newtheme->file); t->file = eina_stringshare_add(newtheme->file);
if (filename) eina_stringshare_del(filename); if (filename) eina_stringshare_del(filename);
break; break;
} }
@ -903,7 +905,11 @@ _cb_adv_btn_assign(void *data1, void *data2)
if (!themes) if (!themes)
cfdata->theme_list = eina_list_append(cfdata->theme_list, newtheme); cfdata->theme_list = eina_list_append(cfdata->theme_list, newtheme);
else else
free(newtheme); {
eina_stringshare_del(newtheme->category);
eina_stringshare_del(newtheme->file);
free(newtheme);
}
return; return;
} }
@ -931,15 +937,13 @@ _cb_adv_btn_clear(void *data1, void *data2)
label = e_widget_ilist_selected_label_get(oc); label = e_widget_ilist_selected_label_get(oc);
snprintf(cat, sizeof(cat), "base/theme/%s", label); snprintf(cat, sizeof(cat), "base/theme/%s", label);
for (themes = cfdata->theme_list; themes; themes = themes->next) EINA_LIST_FOREACH(cfdata->theme_list, themes, t)
{ {
t = themes->data;
if (!strcmp(t->category, cat)) if (!strcmp(t->category, cat))
{ {
if (t->file) if (t->file)
{ {
filename = eina_stringshare_add(t->file); filename = t->file;
free((void *)(t->file));
t->file = NULL; t->file = NULL;
} }
break; break;
@ -949,8 +953,14 @@ _cb_adv_btn_clear(void *data1, void *data2)
if ((filename) && (!_theme_file_used(cfdata->theme_list, filename))) if ((filename) && (!_theme_file_used(cfdata->theme_list, filename)))
{ {
for (n = 0; n < e_widget_ilist_count(of); n++) for (n = 0; n < e_widget_ilist_count(of); n++)
if (!strcmp(filename, _files_ilist_nth_label_to_file(cfdata, n))) {
e_widget_ilist_nth_icon_set(of, n, NULL); const char *tmp;
tmp = _files_ilist_nth_label_to_file(cfdata, n);
if (filename == tmp)
e_widget_ilist_nth_icon_set(of, n, NULL);
eina_stringshare_del(tmp);
}
eina_stringshare_del(filename); eina_stringshare_del(filename);
} }
@ -976,14 +986,10 @@ _cb_adv_btn_clearall(void *data1, void *data2)
for (n = 0; n < e_widget_ilist_count(of); n++) for (n = 0; n < e_widget_ilist_count(of); n++)
e_widget_ilist_nth_icon_set(of, n, NULL); e_widget_ilist_nth_icon_set(of, n, NULL);
for (themes = cfdata->theme_list; themes; themes = themes->next) EINA_LIST_FOREACH(cfdata->theme_list, themes, t)
{ {
t = themes->data; eina_stringshare_del(t->file);
if (t->file) t->file = NULL;
{
free((void *)(t->file));
t->file = NULL;
}
} }
return; return;
@ -1053,20 +1059,20 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
static int static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Eina_List *themes, *ec_themes; E_Config_Theme *theme;
Eina_List *themes;
E_Action *a; E_Action *a;
themes = cfdata->theme_list; EINA_LIST_FOREACH(cfdata->theme_list, themes, theme)
while (themes)
{ {
E_Config_Theme *theme, *ec_theme; E_Config_Theme *ec_theme;
Eina_List *ec_themes;
theme = themes->data;
if (!strcmp(theme->category, "base/theme/Base Theme")) if (!strcmp(theme->category, "base/theme/Base Theme"))
theme->category = strdup("base/theme"); theme->category = eina_stringshare_add("base/theme");
for (ec_themes = e_config->themes; ec_themes; ec_themes = ec_themes->next)
EINA_LIST_FOREACH(e_config->themes, ec_themes, ec_theme)
{ {
ec_theme = ec_themes->data;
if (!strcmp(theme->category + 5, ec_theme->category)) if (!strcmp(theme->category + 5, ec_theme->category))
{ {
if (theme->file) if (theme->file)
@ -1078,8 +1084,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
} }
if ((!ec_themes) && (theme->file)) if ((!ec_themes) && (theme->file))
e_theme_config_set(theme->category + 5, theme->file); e_theme_config_set(theme->category + 5, theme->file);
themes = themes->next;
} }
e_config_save_queue(); e_config_save_queue();