From 3c7a977291d45add529cc5725108f42beab043cd Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 18 Sep 2014 14:03:11 -0400 Subject: [PATCH] bugfix: Cleanup msgbus module from having missing field initializers for Eldbus Messages & Signals Signed-off-by: Chris Michael --- src/modules/msgbus/msgbus_audit.c | 6 +++--- src/modules/msgbus/msgbus_desktop.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/modules/msgbus/msgbus_audit.c b/src/modules/msgbus/msgbus_audit.c index 62b421982..095b907b3 100644 --- a/src/modules/msgbus/msgbus_audit.c +++ b/src/modules/msgbus/msgbus_audit.c @@ -28,12 +28,12 @@ cb_audit_timer_dump(const Eldbus_Service_Interface *iface __UNUSED__, } static const Eldbus_Method methods[] = { - { "Timers", NULL, ELDBUS_ARGS({"s", ""}), cb_audit_timer_dump }, - { } + { "Timers", NULL, ELDBUS_ARGS({"s", ""}), cb_audit_timer_dump, 0 }, + { NULL, NULL, NULL, NULL, 0 } }; static const Eldbus_Service_Interface_Desc audit = { - "org.enlightenment.wm.Audit", methods + "org.enlightenment.wm.Audit", methods, NULL, NULL, NULL, NULL }; void msgbus_audit_init(Eina_Array *ifaces) diff --git a/src/modules/msgbus/msgbus_desktop.c b/src/modules/msgbus/msgbus_desktop.c index 7d3d36316..dac684cbc 100644 --- a/src/modules/msgbus/msgbus_desktop.c +++ b/src/modules/msgbus/msgbus_desktop.c @@ -185,32 +185,32 @@ cb_desktop_bglist(const Eldbus_Service_Interface *iface __UNUSED__, static const Eldbus_Method desktop_methods[] = { { "GetVirtualCount", NULL, ELDBUS_ARGS({"i", "desk_x"}, {"i", "desk_y"}), - cb_virtual_desktops }, + cb_virtual_desktops, 0 }, { "Show", ELDBUS_ARGS({"i", "desk_x"}, {"i", "desk_y"}), NULL, - cb_desktop_show }, + cb_desktop_show, 0 }, { "ShowByName", ELDBUS_ARGS({"s", "desk_name"}), NULL, - cb_desktop_show_by_name }, - { "Lock", NULL, NULL, cb_desktop_lock }, - { "Unlock", NULL, NULL, cb_desktop_unlock }, - { } + cb_desktop_show_by_name, 0 }, + { "Lock", NULL, NULL, cb_desktop_lock, 0 }, + { "Unlock", NULL, NULL, cb_desktop_unlock, 0 }, + { NULL, NULL, NULL, NULL, 0 } }; static const Eldbus_Method background_methods[] = { { "Add", ELDBUS_ARGS({"i", "manager"}, {"i", "zone"}, {"i", "desk_x"}, {"i", "desk_y"}, {"s", "path"}), - NULL, cb_desktop_bgadd }, + NULL, cb_desktop_bgadd, 0 }, { "Del", ELDBUS_ARGS({"i", "manager"}, {"i", "zone"}, {"i", "desk_x"}, {"i", "desk_y"}), - NULL, cb_desktop_bgdel }, - { "List", ELDBUS_ARGS({"a(iiiis)", "array_of_bg"}), NULL, cb_desktop_bglist }, - { } + NULL, cb_desktop_bgdel, 0 }, + { "List", ELDBUS_ARGS({"a(iiiis)", "array_of_bg"}), NULL, cb_desktop_bglist, 0 }, + { NULL, NULL, NULL, NULL, 0 } }; static const Eldbus_Service_Interface_Desc desktop = { - "org.enlightenment.wm.Desktop", desktop_methods + "org.enlightenment.wm.Desktop", desktop_methods, NULL, NULL, NULL, NULL }; static const Eldbus_Service_Interface_Desc bg = { - "org.enlightenment.wm.Desktop.Background", background_methods + "org.enlightenment.wm.Desktop.Background", background_methods, NULL, NULL, NULL, NULL }; void msgbus_desktop_init(Eina_Array *ifaces)