[prev in list] [next in list] [prev in thread] [next in thread] 

List:       enlightenment-svn
Subject:    E CVS: libs/engrave leviathan
From:       Enlightenment CVS <noreply () fitx-00 ! ewr ! caoslinux ! org>
Date:       2007-07-29 15:25:21
Message-ID: 20070729152521.86D08A30A2 () cvs ! caoslinux ! org
[Download RAW message or body]

Enlightenment CVS committal

Author  : leviathan
Project : e17
Module  : libs/engrave

Dir     : e17/libs/engrave/src/lib


Modified Files:
	engrave_enums.h engrave_out.c engrave_program.c 


Log Message:
handle scripts correctly
the presence of a script implied no other action before, but now scripts can coexist with actions
now engrave can fully parse the default e17 theme again :)

===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_enums.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- engrave_enums.h	24 Jul 2007 20:01:07 -0000	1.7
+++ engrave_enums.h	29 Jul 2007 15:25:21 -0000	1.8
@@ -79,7 +79,6 @@
   ENGRAVE_ACTION_DRAG_VAL_SET, /**< Set the drag value of a given part */
   ENGRAVE_ACTION_DRAG_VAL_STEP, /**< Set the drag step of a given part */
   ENGRAVE_ACTION_DRAG_VAL_PAGE, /**< Set the drag page of a given part */
-  ENGRAVE_ACTION_SCRIPT, /**< Set implictly if a script {} block is included */
   ENGRAVE_ACTION_NUM
 };
 
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- engrave_out.c	29 Jul 2007 15:05:51 -0000	1.43
+++ engrave_out.c	29 Jul 2007 15:25:21 -0000	1.44
@@ -394,18 +394,6 @@
             _action_string[action], state, state2);
       break;
 
-    case ENGRAVE_ACTION_SCRIPT:
-      {
-        if (engrave_program_script_get(program))
-        {
-          engrave_out_start(out, "script");
-          /* FIXME scripts are wierd ... */
-          fprintf(out, "%s", engrave_program_script_get(program));
-          engrave_out_end(out);
-        }
-      }
-      break;
-
     case ENGRAVE_ACTION_NUM:
       break;
 
@@ -420,6 +408,14 @@
 
   engrave_program_target_foreach(program, _engrave_program_output_target, out);
   engrave_program_after_foreach(program, _engrave_program_output_after, out);
+
+  if (engrave_program_script_get(program))
+  {
+    engrave_out_start(out, "script");
+    /* FIXME scripts are wierd ... */
+    fprintf(out, "%s", engrave_program_script_get(program));
+    engrave_out_end(out);
+  }
 
   engrave_out_end(out);
 }
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_program.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- engrave_program.c	6 Sep 2006 07:31:31 -0000	1.17
+++ engrave_program.c	29 Jul 2007 15:25:21 -0000	1.18
@@ -62,7 +62,6 @@
 {
   if (!ep) return;
   IF_FREE(ep->script);
-  ep->action = ENGRAVE_ACTION_SCRIPT;
   ep->script = (script ? strdup(script) : NULL);
 }
 



-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
[prev in list] [next in list] [prev in thread] [next in thread]