Some cleaning up, no code changes

Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>

1 files changed, 6 insertions, 11 deletions

diff --git a/src/eulogium.c b/src/eulogium.c
index 37035a5..2388d08 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -542,12 +542,10 @@ Evas_Object *eulogium_generic_error(struct eulogium_data *eulogium, uint8_t eulo
 	return box;
 }
 
-static void _on_start_print_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
+static void _on_start_print_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
-	Evas_Object *content;
 	const char *errname, *errmsg;
 	Eina_Bool print_started = EINA_FALSE;
-	struct eulogium_data *eulogium = data;
 
 	if (eldbus_message_error_get(msg, &errname, &errmsg)) {
 		EINA_LOG_ERR("%s %s", errname, errmsg);
@@ -577,11 +575,10 @@ static void eulogium_print_start(struct eulogium_data *eulogium)
 			  eulogium->print.name, eulogium->print.file, eulogium->print.flags);
 }
 
-static void _on_cleared_printer_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
+static void _on_cleared_printer_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
 	const char *errname, *errmsg;
 	Eina_Bool cleared_bed = EINA_FALSE;
-	struct eulogium_data *eulogium = data;
 
 	if (eldbus_message_error_get(msg, &errname, &errmsg)) {
 		EINA_LOG_ERR("%s %s", errname, errmsg);
@@ -603,14 +600,14 @@ static void _on_cleared_printer_ret(void *data, const Eldbus_Message *msg, Eldbu
 	}
 }
 
-static void _clear_bed_and_start_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+static void _cleared_bed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
 	struct eulogium_data *eulogium = data;
 
 	eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "clearedPrinter", _on_cleared_printer_ret, eulogium, -1, "");
 }
 
-void eulogium_clear_print_bed_and_start_print(struct eulogium_data *eulogium)
+Evas_Object *eulogium_clear_print_bed(struct eulogium_data *eulogium)
 {
 	Evas_Object *content, *obj;
 
@@ -625,7 +622,7 @@ void eulogium_clear_print_bed_and_start_print(struct eulogium_data *eulogium)
 	/* TODO replace with left/right button call, this is just a quick Hack XXX */
 	obj = elm_button_add(content);
 	elm_object_text_set(obj, "Bed is now clear");
-	evas_object_smart_callback_add(obj, "clicked", _clear_bed_and_start_cb, eulogium);
+	evas_object_smart_callback_add(obj, "clicked", _cleared_bed_cb, eulogium);
 	evas_object_show(obj);
 	elm_box_pack_end(content, obj);
 
@@ -1069,9 +1066,7 @@ Evas_Object *eulogium_main_menu(Evas_Object *window, struct eulogium_data *eulog
 	eulogium->navi = elm_naviframe_add(window);
 	if (!eulogium->navi)
 		return NULL;
-	elm_naviframe_prev_btn_auto_pushed_set(eulogium->navi, EINA_FALSE);
-//	elm_naviframe_item_title_enabled_set(eulogium->navi, EINA_TRUE, EINA_TRUE);
-//	elm_naviframe_item_title_visible_set(eulogium->navi, EINA_FALSE);
+	elm_naviframe_prev_btn_auto_pushed_set(eulogium->navi, EINA_FALSE); /* We removed this from the theme, enabling it causes errors */
 
 	content = eulogium_tripple_button_menu(eulogium->navi, &but_main_print, &but_main_material, &but_main_maintanance);
 	if (!content)