summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlliver Schinagl <o.schinagl@ultimaker.com>2015-07-29 10:01:12 (GMT)
committerOlliver Schinagl <o.schinagl@ultimaker.com>2015-07-29 11:48:11 (GMT)
commit56d77dfc70b50500c4c47cb8d6ebc23259206d2c (patch)
tree20b2b11e2a128e2c7d1da24d21dcc6ae1173bbd7
parent185a5010ed7f20b3835cd54c813a4a1f1de525b3 (diff)
downloadeulogium-56d77dfc70b50500c4c47cb8d6ebc23259206d2c.zip
eulogium-56d77dfc70b50500c4c47cb8d6ebc23259206d2c.tar.gz
eulogium-56d77dfc70b50500c4c47cb8d6ebc23259206d2c.tar.bz2
moar archive, remove wip progress/procedure stuff
Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
-rw-r--r--packaging/debian/changelog5
-rw-r--r--src/eulogium.c4
-rw-r--r--src/procedures.c10
3 files changed, 7 insertions, 12 deletions
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
deleted file mode 100644
index aa94cb5..0000000
--- a/packaging/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-eulogium (v0.1-4-g97b1-dirty) UNRELEASED; urgency=low
-
- * Initial release.
-
- -- Olliver Schinagl <o.schinagl@ultimaker.com> Tue, 14 Jul 2015 09:54:16 +0200
diff --git a/src/eulogium.c b/src/eulogium.c
index 10c6ac6..d858c41 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -2415,7 +2415,7 @@ static void _but_bed_move_cb(void *data, Evas_Object *obj EINA_UNUSED, void *eve
Evas_Object *content = NULL;
printf("But bed move\n");
- content = ui_widget_spinner_add(eulogium->navi, &dials[PROC_BED_MOVE]);
+ content = ui_widget_spinner(eulogium->navi, eulogium, &dials[PROC_BED_MOVE]);
ui_stack_push(eulogium->navi, content, PAGE_NORMAL);
}
@@ -4341,7 +4341,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
// Evas_Object *splash_window;
// Eina_List *engines, *l;
- _priviledges_drop(); /* XXX hack until we no longer need root, this may be needed elsewhere. */
+// _priviledges_drop(); /* XXX hack until we no longer need root, this may be needed elsewhere. */
args = ecore_getopt_parse(&optdesc, values, argc, argv);
if (args < 0) {
diff --git a/src/procedures.c b/src/procedures.c
index 5bf686f..964e324 100644
--- a/src/procedures.c
+++ b/src/procedures.c
@@ -170,7 +170,7 @@ static void _get_meta_progress(void *data, const void *key, Eldbus_Message_Iter
}
free(var_sig);
- ecore_event_add(procedure->poll.event, progress, NULL, NULL);
+// ecore_event_add(procedure->poll.event, progress, NULL, NULL);
}
static void _get_meta_cur_tar(void *data, const void *key, Eldbus_Message_Iter *var)
@@ -200,7 +200,7 @@ static void _get_meta_cur_tar(void *data, const void *key, Eldbus_Message_Iter *
}
free(var_sig);
- ecore_event_add(procedure->poll.event, dial_data, NULL, NULL);
+// ecore_event_add(procedure->poll.event, dial_data, NULL, NULL);
}
static void _on_start_print_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
@@ -870,7 +870,7 @@ static struct procedure_data procedures[] = {
.key = _PROC_MATERIAL_UNLOAD,
.wizard = EINA_TRUE,
.status = PROC_READY,
- .parser = _get_meta_progress,
+ .parser = NULL,
.executable = EINA_FALSE,
.available = EINA_FALSE,
._steps = steps_material_unload,
@@ -886,7 +886,7 @@ static struct procedure_data procedures[] = {
.key = _PROC_MATERIAL_LOAD,
.wizard = EINA_TRUE,
.status = PROC_READY,
- .parser = _get_meta_progress,
+ .parser = NULL,
.executable = EINA_FALSE,
.available = EINA_FALSE,
._steps = steps_material_load,
@@ -902,7 +902,7 @@ static struct procedure_data procedures[] = {
.key = _PROC_MATERIAL_CHANGE,
.wizard = EINA_TRUE,
.status = PROC_READY,
- .parser = _get_meta_progress,
+ .parser = NULL,
.executable = EINA_FALSE,
.available = EINA_FALSE,
._steps = steps_material_change,