aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-02 08:40:15 +1000
committerDavid Walter Seikel2014-05-02 08:40:15 +1000
commit4d33b142d420555193c5ec77140e2ce9c33e96f9 (patch)
tree7cf3490f1543167e13a271ca212bcd7cbe39adfe
parentSilence some more excess EFL bitching. (diff)
downloadSledjHamr-4d33b142d420555193c5ec77140e2ce9c33e96f9.zip
SledjHamr-4d33b142d420555193c5ec77140e2ce9c33e96f9.tar.gz
SledjHamr-4d33b142d420555193c5ec77140e2ce9c33e96f9.tar.bz2
SledjHamr-4d33b142d420555193c5ec77140e2ce9c33e96f9.tar.xz
Clean up globals.
-rw-r--r--src/GuiLua/GuiLua.c1
-rw-r--r--src/GuiLua/GuiLua.h7
2 files changed, 2 insertions, 6 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index 46e0d1e..4b5ccd9 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -1110,7 +1110,6 @@ int luaopen_GuiLua(lua_State *L)
1110 int skang; 1110 int skang;
1111 1111
1112 // In theory this function only ever gets called once. 1112 // In theory this function only ever gets called once.
1113 memset(&ourGlobals, 0, sizeof(globals));
1114 ourGlobals.logDom = loggingStartup("GuiLua", ourGlobals.logDom); 1113 ourGlobals.logDom = loggingStartup("GuiLua", ourGlobals.logDom);
1115 1114
1116 elm_policy_set(ELM_POLICY_EXIT, ELM_POLICY_EXIT_NONE); 1115 elm_policy_set(ELM_POLICY_EXIT, ELM_POLICY_EXIT_NONE);
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 2e2a616..42442cf 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -3,9 +3,6 @@
3#include "Runnr.h" 3#include "Runnr.h"
4 4
5 5
6typedef struct _globals globals;
7
8
9#define WIDTH (300) 6#define WIDTH (300)
10#define HEIGHT (300) 7#define HEIGHT (300)
11 8
@@ -15,13 +12,13 @@ typedef struct _globals globals;
15#define THINGASM "thingasm" 12#define THINGASM "thingasm"
16 13
17 14
18struct _globals 15typedef struct _globals
19{ 16{
20 Evas *evas; 17 Evas *evas;
21 Evas_Object *win; // Our Elm window. 18 Evas_Object *win; // Our Elm window.
22 Eina_Clist widgets; // Our windows widgets. 19 Eina_Clist widgets; // Our windows widgets.
23 int logDom; // Our logging domain. 20 int logDom; // Our logging domain.
24}; 21} globals;
25 22
26 23
27int luaopen_widget(lua_State *L); 24int luaopen_widget(lua_State *L);