[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, upstream-vcs, updated. 00a54b97536aa9ded13ec8505d14a50a99338b40
raster
raster at alioth.debian.org
Sat Jun 7 18:20:23 UTC 2008
The following commit has been merged in the upstream-vcs branch:
commit d24843710275397da5300f668dbdbab09a8c7316
Author: raster <raster>
Date: Fri May 30 14:27:56 2008 +0000
printf--
diff --git a/src/lib/edje_load.c b/src/lib/edje_load.c
index 1e739a8..9f3a81d 100644
--- a/src/lib/edje_load.c
+++ b/src/lib/edje_load.c
@@ -264,9 +264,11 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *p
if (ed->collection)
{
- printf("%s %s = %i\n", file, part, ed->collection->script_only);
if (ed->collection->script_only)
- _edje_script_only_init(ed);
+ {
+ ed->load_error = EDJE_LOAD_ERROR_NONE;
+ _edje_script_only_init(ed);
+ }
else
{
Evas_List *l;
@@ -574,9 +576,9 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *p
_edje_thaw(ed);
_edje_unblock(ed);
_edje_unref(ed);
+ ed->load_error = EDJE_LOAD_ERROR_NONE;
+ _edje_emit(ed, "load", NULL);
}
- ed->load_error = EDJE_LOAD_ERROR_NONE;
- _edje_emit(ed, "load", NULL);
return 1;
}
else
--
Enlightenment DR17 graphical layout and animation library
More information about the Pkg-e-commits
mailing list