diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/GuiLua/GuiLua.c | 8 | ||||
-rw-r--r-- | src/GuiLua/GuiLua.h | 1 | ||||
-rw-r--r-- | src/extantz/extantz.c | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c index dbd3f95..55037e0 100644 --- a/src/GuiLua/GuiLua.c +++ b/src/GuiLua/GuiLua.c | |||
@@ -433,6 +433,14 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent) | |||
433 | return result; | 433 | return result; |
434 | } | 434 | } |
435 | 435 | ||
436 | void GuiLuaLoad(char *module, winFang *parent) | ||
437 | { | ||
438 | char *args[] = {"GuiLUa", "-l", ""}; | ||
439 | |||
440 | args[2] = module; | ||
441 | GuiLuaDo(3, args, parent); | ||
442 | } | ||
443 | |||
436 | void GuiLuaDel(GuiLua *gl) | 444 | void GuiLuaDel(GuiLua *gl) |
437 | { | 445 | { |
438 | if (gl) | 446 | if (gl) |
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h index 75c0b38..b123fe7 100644 --- a/src/GuiLua/GuiLua.h +++ b/src/GuiLua/GuiLua.h | |||
@@ -30,6 +30,7 @@ typedef struct _GuiLua | |||
30 | extern const char *glName; | 30 | extern const char *glName; |
31 | 31 | ||
32 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent); | 32 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent); |
33 | void GuiLuaLoad(char *module, winFang *parent); | ||
33 | void GuiLuaDel(GuiLua *gl); | 34 | void GuiLuaDel(GuiLua *gl); |
34 | 35 | ||
35 | #endif | 36 | #endif |
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 590770d..5fb88f4 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -515,11 +515,9 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
515 | makeMainMenu(&ourGlobals); | 515 | makeMainMenu(&ourGlobals); |
516 | 516 | ||
517 | // overlay_add(&ourGlobals); | 517 | // overlay_add(&ourGlobals); |
518 | char *args[] = {"extantz", "-l", "test", "-foo", "COMBINED!", NULL}; | 518 | GuiLuaLoad("test", ourGlobals.mainWindow); |
519 | GuiLuaDo(5, args, ourGlobals.mainWindow); | ||
520 | woMan_add(&ourGlobals); | 519 | woMan_add(&ourGlobals); |
521 | args[2] = "purkle"; | 520 | GuiLuaLoad("purkle", ourGlobals.mainWindow); |
522 | GuiLuaDo(3, args, ourGlobals.mainWindow); | ||
523 | ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); | 521 | ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); |
524 | 522 | ||
525 | #if USE_PHYSICS | 523 | #if USE_PHYSICS |