Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-05 12:51:47 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-05 12:51:47 (GMT) |
| commit | 3adede854422194f5761a40fc6663688ae0d0416 (patch) | |
| tree | 6449e675cbf6cb575453d7f1b30d75b0678ae530 | |
| parent | 4e0888a6e2350f06504d4c6a99e5a21fa51ee9bc (diff) | |
| download | swift-contrib-3adede854422194f5761a40fc6663688ae0d0416.zip swift-contrib-3adede854422194f5761a40fc6663688ae0d0416.tar.bz2 | |
Fixed some Sluift bugs.
| -rw-r--r-- | Sluift/SConscript | 2 | ||||
| -rw-r--r-- | Sluift/sluift.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Sluift/SConscript b/Sluift/SConscript index 6f38693..19dc1e7 100644 --- a/Sluift/SConscript +++ b/Sluift/SConscript @@ -28,7 +28,7 @@ if env["SCONS_STAGE"] == "build" : f = open(source[0].abspath, "r") contents = f.read() f.close() - if env["PLATFORM"] == "windows" : + if env["PLATFORM"] == "win32" : key = "Z" else : key = "D" diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp index ca7d9ff..c9189e7 100644 --- a/Sluift/sluift.cpp +++ b/Sluift/sluift.cpp @@ -395,14 +395,14 @@ static int sluift_client_set_options(lua_State* L) { static void pushEvent(lua_State* L, Stanza::ref event) { if (Message::ref message = boost::dynamic_pointer_cast<Message>(event)) { Lua::Table result = boost::assign::map_list_of - ("type", boost::make_shared<Lua::Value>("message")) + ("type", boost::make_shared<Lua::Value>(std::string("message"))) ("from", boost::make_shared<Lua::Value>(message->getFrom().toString())) ("body", boost::make_shared<Lua::Value>(message->getBody())); Lua::pushValue(L, result); } else if (Presence::ref presence = boost::dynamic_pointer_cast<Presence>(event)) { Lua::Table result = boost::assign::map_list_of - ("type", boost::make_shared<Lua::Value>("presence")) + ("type", boost::make_shared<Lua::Value>(std::string("presence"))) ("from", boost::make_shared<Lua::Value>(presence->getFrom().toString())) ("status", boost::make_shared<Lua::Value>(presence->getStatus())); Lua::pushValue(L, result); |