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

Use the new edje_file_group_exists function, rather than evas_objects. 

Thanks rephorm :)


SVN revision: 25328
This commit is contained in:
Christopher Michael 2006-09-02 05:15:01 +00:00
parent 3e2e9d40c6
commit c54cd3de17
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/e_int_config_theme_import.c
View File

@ -236,7 +236,6 @@ _theme_import_cb_ok(void *data, void *data2)
{ {
Import *import; Import *import;
E_Win *win; E_Win *win;
Evas_Object *o;
const char *path; const char *path;
const char *file; const char *file;
char *homedir; char *homedir;
@ -266,12 +265,8 @@ _theme_import_cb_ok(void *data, void *data2)
if (!e_util_glob_case_match(file, "*.edj")) if (!e_util_glob_case_match(file, "*.edj"))
return; return;
o = edje_object_add(e_win_evas_get(win)); if (!edje_file_group_exists(import->cfdata->file,
is_theme = (edje_object_file_set(o, import->cfdata->file, "e/widgets/border/default/border"))
"e/widgets/border/default/border"));
evas_object_del(o);
if (!is_theme)
{ {
e_util_dialog_show(_("Theme Import Error"), e_util_dialog_show(_("Theme Import Error"),
_("Enlightenment was unable to import " _("Enlightenment was unable to import "

12
src/bin/e_int_config_wallpaper_import.c
View File

@ -525,16 +525,12 @@ _import_cb_ok(void *data, void *data2)
snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s", snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s",
homedir, file); homedir, file);
E_FREE(homedir); E_FREE(homedir);
Evas_Object *o;
o = edje_object_add(e_win_evas_get(import->win)); is_bg = edje_file_group_exists(import->cfdata->file,
is_bg = (edje_object_file_set(o, import->cfdata->file, "e/desktop/background");
"e/desktop/background"));
is_theme = is_theme =
(edje_object_file_set(o, import->cfdata->file, edje_file_group_exists(import->cfdata->file,
"e/widgets/border/default/border")); "e/widgets/border/default/border");
evas_object_del(o);
if ((is_bg) && (!is_theme)) if ((is_bg) && (!is_theme))
{ {