Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_theme_import.c
Log Message:
Theme Import can no longer copy bg edj files, or edj files without a border
defined, to theme location.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_theme_import.c 1 Sep 2006 17:38:25 -0000 1.2
+++ e_int_config_theme_import.c 2 Sep 2006 03:46:17 -0000 1.3
@@ -256,28 +256,36 @@
if (import->cfdata->file)
{
file = ecore_file_get_file(import->cfdata->file);
+ snprintf(buf, sizeof(buf), "%s/.e/e/themes/%s", homedir, file);
+ E_FREE(homedir);
+
if (!ecore_file_strip_ext(file))
- {
- E_FREE(homedir);
- return;
- }
+ return;
if (!e_util_glob_case_match(file, "*.edj"))
+ return;
+
+ if (!edje_file_data_get(import->cfdata->file,
+ "e/widgets/border/default/border"))
{
- E_FREE(homedir);
- return;
+ e_util_dialog_show(_("Theme Import Error"),
+ _("Enlightenment was unable to import "
+ "the theme.<br><br>Are you sure this "
+ "is really a valid theme?"));
}
-
- /* Copy File */
- snprintf(buf, sizeof(buf), "%s/.e/e/themes/%s", homedir, file);
- if (!ecore_file_cp(import->cfdata->file, buf))
+ else
{
- e_util_dialog_show(_("Theme Import Error"),
- _("Enlightenment was unable to import"
- "the theme<br>due to a copy error"));
+ if (!ecore_file_cp(import->cfdata->file, buf))
+ {
+ e_util_dialog_show(_("Theme Import Error"),
+ _("Enlightenment was unable to import"
+ "the theme<br>due to a copy error"));
+ }
+ else
+ e_int_config_theme_update(import->parent, buf);
}
- else
- e_int_config_theme_update(import->parent, buf);
}
+ else
+ E_FREE(homedir);
e_int_config_theme_del(import->win);
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
