diff options
| author | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-06-16 06:45:38 (GMT) |
|---|---|---|
| committer | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-06-16 06:45:38 (GMT) |
| commit | 149f2a7cd778188f363260df5268e08fbdc43297 (patch) | |
| tree | fadb971a92050b0c64b7b74c6ff18e798624c1c2 | |
| parent | e65343f50ce20060c5209d052a36a614fc4026d2 (diff) | |
| download | eulogium-149f2a7cd778188f363260df5268e08fbdc43297.zip eulogium-149f2a7cd778188f363260df5268e08fbdc43297.tar.gz eulogium-149f2a7cd778188f363260df5268e08fbdc43297.tar.bz2 | |
[griffin.hmi] cleanup/rename some of the dbus stuff
Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
| -rw-r--r-- | src/eulogium.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/eulogium.c b/src/eulogium.c index 85dd652..70cff7c 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -13,11 +13,11 @@ #include <string.h> #include <stdint.h> +#include "eulogium.h" #include "eulogium_item_list.h" #include "eulogium_private.h" #include "gettext.h" -#include "eulogium.h" #define COPYRIGHT "Copyright © 2015 Olliver Schinagl <o.schinagl@ultimaker.com> and various contributors (see AUTHORS)." @@ -3090,7 +3090,7 @@ static void _on_list_units_ret(void *data, const Eldbus_Message *msg, Eldbus_Pen { const char *errname, *errmsg; struct eulogium_data *eulogium = data; - Eldbus_Message_Iter *array, *dbus_struct; + Eldbus_Message_Iter *array, *units_struct; char *id, *unit; char *dummy; uint_fast32_t dummy_int; @@ -3103,8 +3103,8 @@ static void _on_list_units_ret(void *data, const Eldbus_Message *msg, Eldbus_Pen EINA_LOG_ERR("Message content does not match expected \"a(ssssssouso)\" signature. (%s)", eldbus_message_signature_get(msg)); return; } - while (eldbus_message_iter_get_and_next(array, 'r', &dbus_struct)) { - if (eldbus_message_iter_arguments_get(dbus_struct, "ssssssouso", &id, &dummy, &dummy, &dummy, &dummy, &dummy, &unit, &dummy_int, &dummy, &dummy)) { + while (eldbus_message_iter_get_and_next(array, 'r', &units_struct)) { + if (eldbus_message_iter_arguments_get(units_struct, "ssssssouso", &id, &dummy, &dummy, &dummy, &dummy, &dummy, &unit, &dummy_int, &dummy, &dummy)) { Eldbus_Object *obj; struct mount_data *mount; size_t id_len; @@ -3222,7 +3222,6 @@ static int eulogium_dbus_init(struct eulogium_data *eulogium) return -EFAULT; EINA_LOG_WARN("Could not get nl.ultimaker.led object."); } - eulogium->dbus.proxy[LED] = eldbus_proxy_get(obj, "nl.ultimaker"); if (!eulogium->dbus.proxy[LED]) { EINA_LOG_WARN("Could not get dbus led proxy."); @@ -3235,7 +3234,6 @@ static int eulogium_dbus_init(struct eulogium_data *eulogium) EINA_LOG_WARN("Could not get nl.ultimaker.printer object."); return -EFAULT; } - eulogium->dbus.proxy[PRINTER] = eldbus_proxy_get(obj, "nl.ultimaker"); if (!eulogium->dbus.proxy[PRINTER]) { EINA_LOG_WARN("Could not get dbus printer proxy."); @@ -3253,7 +3251,6 @@ static int eulogium_dbus_init(struct eulogium_data *eulogium) eldbus_proxy_signal_handler_add(proxy, "UnitNew", _on_unit_new_ret, eulogium); eldbus_proxy_signal_handler_add(proxy, "UnitRemoved", _on_unit_removed_ret, eulogium); - msg = eldbus_proxy_method_call_new(proxy, "ListUnitsFiltered"); iter = eldbus_message_iter_get(msg); array = eldbus_message_iter_container_new(iter, 'a', "s"); |