From df3e0e041a52792ca8b8d957ba821c31a8d99731 Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Fri, 19 Jun 2015 15:31:53 +0200 Subject: change some dbus_handler stuff Signed-off-by: Olliver Schinagl --- src/Makefile.am | 3 ++- src/dbus_handlers.c | 13 +++++++++++++ src/dbus_handlers.h | 8 ++++++-- src/eulogium.c | 4 ++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 416d9be..9c1f6c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,8 @@ AM_CPPFLAGS = -DPACKAGE_BIN_DIR=\"$(bindir)/\" \ -I$(top_srcdir)/src/ \ @EFL_CFLAGS@ -eulogium_SOURCES = eulogium.c eulogium_item_list.c procedures.c +eulogium_SOURCES = eulogium.c eulogium_item_list.c procedures.c \ + dbus_handlers.c eulogium_LDADD = @EFL_LIBS@ localedir = $(datadir)/locale diff --git a/src/dbus_handlers.c b/src/dbus_handlers.c index 2c817da..25609f5 100644 --- a/src/dbus_handlers.c +++ b/src/dbus_handlers.c @@ -12,6 +12,19 @@ #include "dbus_handlers.h" #include "eulogium_item_list.h" +void on_method_generic_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) +{ + + struct list_item *item = data; + const char *errname, *errmsg; + Eina_Bool state; + + if (eldbus_message_error_get(msg, &errname, &errmsg)) { + EINA_LOG_ERR("%s %s", errname, errmsg); + return; + } +} + void on_method_is_network_powered_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) { struct list_item *item = data; diff --git a/src/dbus_handlers.h b/src/dbus_handlers.h index cf69f4c..281be84 100644 --- a/src/dbus_handlers.h +++ b/src/dbus_handlers.h @@ -19,10 +19,14 @@ struct dbus_handle { const char *signal; Eldbus_Signal_Cb sig_cb; - const char *method; - Eldbus_Message_Cb met_cb; + const char *get; + Eldbus_Message_Cb get_cb; + const char *set; + Eldbus_Message_Cb set_cb; + void *set_data; }; +void on_method_generic_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED); void on_method_is_network_powered_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED); void on_signal_network_power_changed_ret(void *data, const Eldbus_Message *msg); diff --git a/src/eulogium.c b/src/eulogium.c index 803c8d4..5106234 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -3306,8 +3306,8 @@ static uint_fast16_t _dbus_members_map(Eldbus_Proxy *proxy, struct menu_entry_de for (i = 0; entry[i].label; i++) if (entry[i].dbus.signal && entry[i].dbus.sig_cb) eldbus_proxy_signal_handler_add(proxy, entry[i].dbus.signal, entry[i].dbus.sig_cb, &entry[i].item); - if (entry[i].dbus.method && entry[i].dbus.met_cb) - eldbus_proxy_call(proxy, entry[i].dbus.method, entry[i].dbus.met_cb, &entry[i].item, -1, ""); + if (entry[i].dbus.get && entry[i].dbus.get_cb) + eldbus_proxy_call(proxy, entry[i].dbus.get, entry[i].dbus.get_cb, &entry[i].item, -1, ""); return i; } -- cgit v0.12