awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'naughty-version' of https://github.com/psychon/awesome

This commit is contained in:
Uli Schlachter 2016-01-17 16:01:18 +01:00
parent 3793c339ce 1367968824
commit 62495daa66
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbus.c
View File

@ -319,8 +319,9 @@ a_dbus_convert_value(lua_State *L, int idx, DBusMessageIter *iter)
case dbustype: \ case dbustype: \
{ \ { \
const char *s = lua_tostring(L, idx + 1); \ const char *s = lua_tostring(L, idx + 1); \
if(s) \ if(!s) \
dbus_message_iter_append_basic(iter, dbustype, &s); \ s = ""; \
dbus_message_iter_append_basic(iter, dbustype, &s); \
} \ } \
break; break;
DBUS_MSG_RETURN_HANDLE_TYPE_STRING(DBUS_TYPE_STRING) DBUS_MSG_RETURN_HANDLE_TYPE_STRING(DBUS_TYPE_STRING)

4
lib/naughty/dbus.lua
View File

@ -195,8 +195,8 @@ capi.dbus.connect_signal("org.freedesktop.Notifications", function (data, appnam
naughty.destroy(obj, naughty.notificationClosedReason.dismissedByCommand) naughty.destroy(obj, naughty.notificationClosedReason.dismissedByCommand)
end end
elseif data.member == "GetServerInfo" or data.member == "GetServerInformation" then elseif data.member == "GetServerInfo" or data.member == "GetServerInformation" then
-- name of notification app, name of vender, version -- name of notification app, name of vender, version, specification version
return "s", "naughty", "s", "awesome", "s", capi.awesome.version:match("%d.%d"), "s", "1.0" return "s", "naughty", "s", "awesome", "s", capi.awesome.version, "s", "1.0"
elseif data.member == "GetCapabilities" then elseif data.member == "GetCapabilities" then
-- We actually do display the body of the message, we support <b>, <i> -- We actually do display the body of the message, we support <b>, <i>
-- and <u> in the body and we handle static (non-animated) icons. -- and <u> in the body and we handle static (non-animated) icons.