ok tested - it. new lua disabled for now (not ready). old lua still there.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@47783 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/edje_load.c b/src/lib/edje_load.c
index 1a678c8..69e711f 100644 (file)
--- a/src/lib/edje_load.c
+++ b/src/lib/edje_load.c
@@ -1162,7 +1162,9 @@ _edje_collection_free(Edje_File *edf, Edje_Part_Collection *ec)
      }
 #endif
    if (ec->script) embryo_program_free(ec->script);
+#ifdef LUA2   
    _edje_lua2_script_unload(ec);
+#endif
    free(ec);
 }
 

diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index 09173bd..e4c1794 100644 (file)
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -1563,15 +1563,16 @@ void _edje_module_shutdown();
 
 
 
+// new lua stuff - supercedes the old
+//#define LUA2 1
 
-#define LUA2 1
-
+#ifdef LUA2
 void _edje_lua2_error_full(const char *file, const char *fnc, int line, lua_State *L, int err_code);
 #define _edje_lua2_error(L, err_code) _edje_lua2_error_full(__FILE__, __FUNCTION__, __LINE__, L, err_code)
-
 void _edje_lua2_script_init(Edje *ed);
 void _edje_lua2_script_shutdown(Edje *ed);
 void _edje_lua2_script_load(Edje_Part_Collection *edc, void *data, int size);
 void _edje_lua2_script_unload(Edje_Part_Collection *edc);
-    
+#endif
+
 #endif