Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_program.c
Log Message:
safety thing... :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_calc.c 1 Sep 2003 02:53:08 -0000 1.14
+++ edje_calc.c 5 Sep 2003 07:17:54 -0000 1.15
@@ -616,7 +616,9 @@
chosen_desc = ep->param1.description;
else
chosen_desc = ep->param2.description;
-
+ if (!chosen_desc) chosen_desc = ep->param2.description;
+ if (!chosen_desc) return;
+
ep->chosen_description = chosen_desc;
if (ep->param1.description)
_edje_part_recalc_single(ed, ep, ep->param1.description, chosen_desc,
ep->param1.rel1_to_x, ep->param1.rel1_to_y, ep->param1.rel2_to_x,
ep->param1.rel2_to_y, ep->confine_to, &p1);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- edje_program.c 1 Sep 2003 02:53:08 -0000 1.22
+++ edje_program.c 5 Sep 2003 07:17:54 -0000 1.23
@@ -577,8 +577,10 @@
_edje_emit(ed, "program,stop", pr->name);
if (_edje_block_break(ed)) goto break_prog;
}
- if (!((pr->action == EDJE_ACTION_TYPE_STATE_SET) &&
- (pr->tween.time > 0.0) && (!ed->no_anim)))
+ if (!((pr->action == EDJE_ACTION_TYPE_STATE_SET)
+ /* hmm this fucks somethgin up. must look into it later */
+ /* && (pr->tween.time > 0.0) && (!ed->no_anim))) */
+ ))
{
if (pr->after >= 0)
{
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
