summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlliver Schinagl <o.schinagl@ultimaker.com>2015-06-10 10:08:58 (GMT)
committerOlliver Schinagl <o.schinagl@ultimaker.com>2015-06-12 05:30:16 (GMT)
commitd5bd1f023685a1a1afe7f4168045744e0a3ef88f (patch)
treefe6b0db1dd2b58075af2581ab3f5b29cd74fe00c /src
parent4f788c2b6253b08d7f546878ecd1b9779188d719 (diff)
downloadeulogium-d5bd1f023685a1a1afe7f4168045744e0a3ef88f.zip
eulogium-d5bd1f023685a1a1afe7f4168045744e0a3ef88f.tar.gz
eulogium-d5bd1f023685a1a1afe7f4168045744e0a3ef88f.tar.bz2
[griffin.hmi] remove harma dbus proxy interface
The printerService now proxies all harma related calls or emulates them. This removes the need for a separate harma-dbus interface. Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
Diffstat (limited to 'src')
-rw-r--r--src/eulogium.c19
-rw-r--r--src/eulogium.h3
2 files changed, 4 insertions, 18 deletions
diff --git a/src/eulogium.c b/src/eulogium.c
index 30f8d41..1f8cdda 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -1169,7 +1169,7 @@ static void _print_abort_cb(void *data, Evas_Object *obj EINA_UNUSED, void *even
{
struct eulogium_data *eulogium = data;
- eldbus_proxy_call(eulogium->dbus.proxy[HARMA], "abortPrint", _on_print_abort_ret, eulogium, -1, "");
+ eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "abortPrint", _on_print_abort_ret, eulogium, -1, "");
}
static void _but_system_maintenance_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
@@ -1926,7 +1926,7 @@ static void _cb_select_file(void *data, Evas_Object *obj EINA_UNUSED, void *even
menu_open_dir(eulogium, new_dir);
} else {
eulogium_print_data_set(eulogium, filepath);
- eldbus_proxy_call(eulogium->dbus.proxy[HARMA], "startPrint", _on_start_print_ret, eulogium, -1, "sss",
+ eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "startPrint", _on_start_print_ret, eulogium, -1, "sss",
eulogium->print.name, eulogium->print.file, eulogium->print.flags);
}
}
@@ -2940,19 +2940,6 @@ static int eulogium_dbus_init(struct eulogium_data *eulogium)
eldbus_name_owner_changed_callback_add(eulogium->dbus.conn, "org.freedesktop.systemd1.Manager", on_name_owner_changed, eulogium->dbus.conn, EINA_TRUE);
/* TODO: Make nice loop that gets BUS/PATH from a predefined array? */
- obj = eldbus_object_get(eulogium->dbus.conn, "nl.ultimaker.harma", "/nl/ultimaker/harma");
- if (!obj) {
- EINA_LOG_WARN("Could not get nl.ultimaker.harma object.");
- return -EFAULT;
- }
-
- eulogium->dbus.proxy[HARMA] = eldbus_proxy_get(obj, "nl.ultimaker");
- if (!eulogium->dbus.proxy[HARMA]) {
- EINA_LOG_WARN("Could not get dbus harma proxy.");
- return -EFAULT;
- }
- eldbus_name_owner_changed_callback_add(eulogium->dbus.conn, "nl.ultimaker.harma", on_name_owner_changed, eulogium->dbus.conn, EINA_TRUE);
-
obj = eldbus_object_get(eulogium->dbus.conn, "nl.ultimaker.led", "/nl/ultimaker/led");
if (!obj) {
return -EFAULT;
@@ -2982,7 +2969,7 @@ static int eulogium_dbus_init(struct eulogium_data *eulogium)
* and the statusChanged signal may not have been fired yet
*/
/* TODO: put signal/method name strings in macro/LUT */
- eldbus_proxy_call(eulogium->dbus.proxy[HARMA], "getFileHandlers", _on_get_file_handlers_ret, eulogium, -1, "");
+ eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getFileHandlers", _on_get_file_handlers_ret, eulogium, -1, "");
eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getStatus", _on_get_status_ret, eulogium, -1, "");
eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getPrintName", _on_get_print_name_ret, eulogium, -1, "");
eldbus_proxy_signal_handler_add(eulogium->dbus.proxy[PRINTER], "statusChanged", _on_status_changed_ret, eulogium);
diff --git a/src/eulogium.h b/src/eulogium.h
index 8fdcd38..657ca96 100644
--- a/src/eulogium.h
+++ b/src/eulogium.h
@@ -64,9 +64,8 @@ struct print_data {
};
enum proxy_idx {
- HARMA,
- LED,
PRINTER,
+ LED,
LAST /* sentinel */
};