From 2b4c37a4cb6457c1af42617e0d3a58b21025293c Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sat, 17 May 2014 07:54:29 +1000 Subject: Make sure the server actually gets through to things started by GuiLuaLoad(). --- src/GuiLua/GuiLua.c | 6 +++--- src/GuiLua/GuiLua.h | 2 +- src/GuiLua/skang.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c index 94a0909..3bdada9 100644 --- a/src/GuiLua/GuiLua.c +++ b/src/GuiLua/GuiLua.c @@ -431,7 +431,7 @@ PD("GuiLua 3"); return 1; } -GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world) +GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world) { GuiLua *result; lua_State *L; @@ -439,6 +439,7 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world) result = calloc(1, sizeof(GuiLua)); result->parent = parent; + result->server = server; result->world = world; L = luaL_newstate(); @@ -499,9 +500,8 @@ GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhy char *args[] = {"GuiLUa", "-l", ""}; args[2] = module; - result = GuiLuaDo(3, args, parent, world); + result = GuiLuaDo(3, args, parent, server, world); result->name = module; - result->server = server; return result; } diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h index cf94e1f..9911ec5 100644 --- a/src/GuiLua/GuiLua.h +++ b/src/GuiLua/GuiLua.h @@ -32,7 +32,7 @@ typedef struct _GuiLua extern const char *glName; -GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world); +GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world); GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world); void GuiLuaDel(GuiLua *gl); diff --git a/src/GuiLua/skang.c b/src/GuiLua/skang.c index c116f30..967a354 100644 --- a/src/GuiLua/skang.c +++ b/src/GuiLua/skang.c @@ -5,7 +5,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) { HamrTime(elm_main, "GuiLua"); - GuiLuaDo(argc, argv, NULL, NULL); + GuiLuaDo(argc, argv, NULL, NULL, NULL); return 0; } -- cgit v1.1