aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-13 18:13:20 +1000
committerDavid Walter Seikel2014-05-13 18:13:20 +1000
commit443133b9b612899777a93fe9371b5f5b27a95984 (patch)
tree8e789d9c6d006b274ab538627770da33941a769e /src/extantz
parentAdd a TCP link between love and extantz, and have love pass on some of the co... (diff)
downloadSledjHamr-443133b9b612899777a93fe9371b5f5b27a95984.zip
SledjHamr-443133b9b612899777a93fe9371b5f5b27a95984.tar.gz
SledjHamr-443133b9b612899777a93fe9371b5f5b27a95984.tar.bz2
SledjHamr-443133b9b612899777a93fe9371b5f5b27a95984.tar.xz
GuiLuaLoad() now returns the GuiLua it loaded, and adds the name. Use that for the purkle load in extantz.
Diffstat (limited to 'src/extantz')
-rw-r--r--src/extantz/extantz.c2
-rw-r--r--src/extantz/extantz.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 8d533fd..a6ffad7 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -626,7 +626,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
626// overlay_add(&ourGlobals); 626// overlay_add(&ourGlobals);
627 GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world); 627 GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world);
628 woMan_add(&ourGlobals); 628 woMan_add(&ourGlobals);
629 GuiLuaLoad("purkle", ourGlobals.mainWindow, ourGlobals.world); 629 ourGlobals.purkle = GuiLuaLoad("purkle", ourGlobals.mainWindow, ourGlobals.world);
630 ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); 630 ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE);
631 631
632 // Bump the top toolbar above the windows. 632 // Bump the top toolbar above the windows.
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index d24f23c..0bbf76f 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -227,6 +227,7 @@ typedef struct _globals
227 EPhysics_World *world; 227 EPhysics_World *world;
228 228
229 winFang *files; 229 winFang *files;
230 GuiLua *purkle;
230 231
231 Ecore_Con_Server *server; 232 Ecore_Con_Server *server;
232 const char *address; 233 const char *address;