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

Return success/failure for dbus.connect_signal 

dbus.connect_signal may only have a single function bound to
a given name, but the caller has no way of knowing if their
function was bound or not.

This change has dbus.connect_signal adopt the standard Lua error
convention of returning a truthy value upon success, or nil and an error
message upon failure.
This commit is contained in:
Rob Hoelz 2016-09-09 07:43:56 -05:00
parent 587cc530c7
commit df5caa06eb
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dbus.c
View File

@ -761,6 +761,8 @@ luaA_dbus_remove_match(lua_State *L)
*
* @param interface A string with the interface name.
* @param func The function to call.
* @return true on success, nil + error if the signal could not be connected
* because another function is already connected.
* @function connect_signal
*/
static int
@ -770,11 +772,16 @@ luaA_dbus_connect_signal(lua_State *L)
luaA_checkfunction(L, 2);
signal_t *sig = signal_array_getbyid(&dbus_signals,
a_strhash((const unsigned char *) name));
if(sig)
if(sig) {
luaA_warn(L, "cannot add signal %s on D-Bus, already existing", name);
else
lua_pushnil(L);
lua_pushfstring(L, "cannot add signal %s on D-Bus, already existing", name);
return 2;
} else {
signal_connect(&dbus_signals, name, luaA_object_ref(L, 2));
return 0;
lua_pushboolean(L, 1);
return 1;
}
}
/** Remove a signal receiver on the D-Bus.