devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=23e430be256be9c5b1424b86537780e0dd5702af
commit 23e430be256be9c5b1424b86537780e0dd5702af Author: Chris Michael <[email protected]> Date: Thu Sep 18 13:58:52 2014 -0400 bugfix: Cleanup bluex module having missing initializers for services & icons Signed-off-by: Chris Michael <[email protected]> --- src/modules/bluez4/agent.c | 20 ++++++++++---------- src/modules/bluez4/ebluez4.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/modules/bluez4/agent.c b/src/modules/bluez4/agent.c index dc1531d..28eeedc 100644 --- a/src/modules/bluez4/agent.c +++ b/src/modules/bluez4/agent.c @@ -229,26 +229,26 @@ _agent_cancel(const Eldbus_Service_Interface *iface EINA_UNUSED, } static const Eldbus_Method agent_methods[] = { - { "Release", NULL, NULL, _agent_release }, + { "Release", NULL, NULL, _agent_release, 0 }, { "RequestPinCode", ELDBUS_ARGS({"o", "device"}), - ELDBUS_ARGS({"s", "pincode"}), _agent_request_pin_code }, + ELDBUS_ARGS({"s", "pincode"}), _agent_request_pin_code, 0 }, { "RequestPasskey", ELDBUS_ARGS({"o", "device"}), - ELDBUS_ARGS({"u", "passkey"}), _agent_request_passkey }, + ELDBUS_ARGS({"u", "passkey"}), _agent_request_passkey, 0 }, { "DisplayPasskey", ELDBUS_ARGS({"o", "device"},{"u", "passkey"},{"q", "entered"}), - NULL, _agent_display_passkey }, + NULL, _agent_display_passkey, 0 }, { "DisplayPinCode", ELDBUS_ARGS({"o", "device"},{"s", "pincode"}), - NULL, _agent_display_pin_code }, + NULL, _agent_display_pin_code, 0 }, { "RequestConfirmation", ELDBUS_ARGS({"o", "device"},{"u", "passkey"}), - NULL, _agent_request_confirmation }, + NULL, _agent_request_confirmation, 0 }, { "Authorize", ELDBUS_ARGS({"o", "device"},{"s", "uuid"}), - NULL, _agent_authorize }, - { "Cancel", NULL, NULL, _agent_cancel }, - { } + NULL, _agent_authorize, 0 }, + { "Cancel", NULL, NULL, _agent_cancel, 0 }, + { NULL, NULL, NULL, NULL, 0 } }; static const Eldbus_Service_Interface_Desc agent_iface = { - AGENT_INTERFACE, agent_methods + AGENT_INTERFACE, agent_methods, NULL, NULL, NULL, NULL }; /* Public Functions */ diff --git a/src/modules/bluez4/ebluez4.c b/src/modules/bluez4/ebluez4.c index c05514f..f2ce8bf 100644 --- a/src/modules/bluez4/ebluez4.c +++ b/src/modules/bluez4/ebluez4.c @@ -14,7 +14,7 @@ Service services[] = { { HumanInterfaceDevice_UUID, INPUT }, { AudioSource_UUID, AUDIO_SOURCE }, { AudioSink_UUID, AUDIO_SINK }, - { } + { NULL, NONE } }; static int @@ -52,7 +52,7 @@ static struct icon_type { "network-wireless", "Wireless" }, { "phone", "Phone" }, { "printer", "Printer" }, - { } + { NULL, NULL } }; static const char * --
