Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1078 from hoelzro/master 

Return success/failure for dbus.connect_signal
This commit is contained in:
Emmanuel Lepage Vallée 2016-09-12 22:42:52 -04:00 committed by GitHub
parent 0363b3a72b df5caa06eb
commit 25f2b03490
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 interface A string with the interface name.
* @param func The function to call. * @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 * @function connect_signal
*/ */
static int static int
@ -770,11 +772,16 @@ luaA_dbus_connect_signal(lua_State *L)
luaA_checkfunction(L, 2); luaA_checkfunction(L, 2);
signal_t *sig = signal_array_getbyid(&dbus_signals, signal_t *sig = signal_array_getbyid(&dbus_signals,
a_strhash((const unsigned char *) name)); a_strhash((const unsigned char *) name));
if(sig) if(sig) {
luaA_warn(L, "cannot add signal %s on D-Bus, already existing", name); 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)); 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. /** Remove a signal receiver on the D-Bus.