aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-17 07:53:40 +1000
committerDavid Walter Seikel2014-05-17 07:53:40 +1000
commitc1a1d6581d6ab5e4faeac5397fdf2682c9605b8c (patch)
treeb6e453cad1edec4b65e5fc11274ac83199d84abf
parentRemove debugging and white space clean ups. (diff)
downloadSledjHamr-c1a1d6581d6ab5e4faeac5397fdf2682c9605b8c.zip
SledjHamr-c1a1d6581d6ab5e4faeac5397fdf2682c9605b8c.tar.gz
SledjHamr-c1a1d6581d6ab5e4faeac5397fdf2682c9605b8c.tar.bz2
SledjHamr-c1a1d6581d6ab5e4faeac5397fdf2682c9605b8c.tar.xz
More debugging removal.
-rw-r--r--lib/skang.lua4
-rw-r--r--src/GuiLua/GuiLua.c3
-rw-r--r--src/purkle/purkle.c9
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/skang.lua b/lib/skang.lua
index d4a9fec..90079ad 100644
--- a/lib/skang.lua
+++ b/lib/skang.lua
@@ -884,7 +884,7 @@ thingasm = function (names, ...)
884 if args then 884 if args then
885 setfenv(args, parent) 885 setfenv(args, parent)
886 thingy.Cwidget = widget(parent.window, args()) 886 thingy.Cwidget = widget(parent.window, args())
887print('\nNO IDEA WHY this does isValid() three times on the action, and the first one being a string.') 887--print('\nNO IDEA WHY this does isValid() three times on the action, and the first one being a string.')
888 parent.W[name] = thingy 888 parent.W[name] = thingy
889 else 889 else
890 print("ERROR - " .. err) 890 print("ERROR - " .. err)
@@ -1037,7 +1037,7 @@ local aIsValid = function (self, parent)
1037 1037
1038 if result then 1038 if result then
1039 local value = parent[self.names[1] ] 1039 local value = parent[self.names[1] ]
1040print('NEW ACTION - ' .. self.names[1] .. ' = ' .. value .. ' ' .. type(parent.Cwidget)) 1040--print('NEW ACTION - ' .. self.names[1] .. ' = ' .. value .. ' ' .. type(parent.Cwidget))
1041 action(parent.Cwidget, value) 1041 action(parent.Cwidget, value)
1042 end 1042 end
1043 return result 1043 return result
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index f2f5a6c..94a0909 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -204,7 +204,6 @@ static void _on_click(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
204 _A = lua_gettop(L); 204 _A = lua_gettop(L);
205 if (wid->win->module) 205 if (wid->win->module)
206 { 206 {
207 PD("Setting environment for Lua pcall to %s", wid->win->module);
208 lua_getfield(L, LUA_REGISTRYINDEX, wid->win->module); 207 lua_getfield(L, LUA_REGISTRYINDEX, wid->win->module);
209 208
210 // Consistancy would be good, just sayin'. 209 // Consistancy would be good, just sayin'.
@@ -264,7 +263,7 @@ static int action(lua_State *L)
264 pull_lua(L, 2, "$", &action); 263 pull_lua(L, 2, "$", &action);
265 if (wid && strcmp(wid->magic, "Widget") == 0) 264 if (wid && strcmp(wid->magic, "Widget") == 0)
266 { 265 {
267PD("Setting action : %s\n", action); 266//PD("Setting action : %s\n", action);
268 wid->action = strdup(action); 267 wid->action = strdup(action);
269 } 268 }
270 return 0; 269 return 0;
diff --git a/src/purkle/purkle.c b/src/purkle/purkle.c
index 01053fe..62f78a2 100644
--- a/src/purkle/purkle.c
+++ b/src/purkle/purkle.c
@@ -56,14 +56,15 @@ static int say(lua_State *L)
56 char *name = "", *id = NULL, *text = NULL, buf[PATH_MAX]; 56 char *name = "", *id = NULL, *text = NULL, buf[PATH_MAX];
57 int channel; 57 int channel;
58 58
59printf("PURKLE.SAY .....\n");
60 // TODO - Should include origin and distance? 59 // TODO - Should include origin and distance?
61 pull_lua(L, 1, "%channel $name $id $text", &channel, &name, &id, &text); 60 pull_lua(L, 1, "%channel $name $id $text", &channel, &name, &id, &text);
62 if (id && text) 61 if (id && text)
63 { 62 {
64 snprintf(buf, sizeof(buf), "events.listen(%d, %s, %s, %s)", channel, name, id, text); 63 snprintf(buf, sizeof(buf), "events.listen(%d, '%s', '%s', '%s')", channel, name, id, text);
65printf("PURKLE.SAY -%s.%s\n", id, buf); 64 if (server)
66 if (server) sendForth(server, id, buf); 65 sendForth(server, id, buf);
66 else
67 printf("PURKLE NOT SAY, no where to send %s", buf);
67 } 68 }
68 return 0; 69 return 0;
69} 70}