diff options
| author | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-06-19 05:31:00 (GMT) |
|---|---|---|
| committer | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-06-19 05:31:00 (GMT) |
| commit | 6c82fd8790d8f1f387d92972471dfe243de49285 (patch) | |
| tree | 4cd02748b96a075a03ea51e4aac8310488af2a56 /src | |
| parent | 592cbae2b2b7c8b807bfd5bf140a9f32642a9b56 (diff) | |
| download | eulogium-6c82fd8790d8f1f387d92972471dfe243de49285.zip eulogium-6c82fd8790d8f1f387d92972471dfe243de49285.tar.gz eulogium-6c82fd8790d8f1f387d92972471dfe243de49285.tar.bz2 | |
init eulogium horror-var more properly
Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/eulogium.c | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/eulogium.c b/src/eulogium.c index 7764bd8..48cb1df 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -2743,16 +2743,6 @@ static void eulogium_setup(struct eulogium_data *eulogium) /* This is silly, barding redonkylous and will get fixed in the refactoring */ eulogium->procedures = procedures_init(); - eulogium->mounts = NULL; - eulogium->progress_data_refresh = NULL; - eulogium->print.name = NULL; - eulogium->print.url = NULL; - eulogium_print_data_clear(eulogium); - eulogium->printer.status = DISCONNECTED; - eulogium->printer.file_handlers = NULL; - eulogium->footer = NULL; - eulogium->print.block = EINA_TRUE; - eulogium->print.block_active = EINA_FALSE; eulogium_button_cb_data_set(&but_return, eulogium); eulogium_button_cb_data_set(&but_print_abort_confirm, eulogium); eulogium_button_cb_data_set(&but_print_abort, eulogium); @@ -3385,7 +3375,26 @@ EAPI_MAIN int elm_main(int argc, char **argv) }; int args; uint_fast8_t i; - struct eulogium_data eulogium; + struct eulogium_data eulogium = { + .mounts = NULL, + .progress_data_refresh = NULL, + .print = { + .name = NULL, + .url = NULL, + .block = EINA_TRUE, + .block_active = EINA_FALSE, + }, + .printer = { + .status = DISCONNECTED, + .file_handlers = NULL, + }, + .footer = NULL, + .network = { + .ethernet_power = EINA_FALSE, + .wifi_power = EINA_FALSE, + .hotspot_power = EINA_FALSE, + }, + }; Evas_Object *window, *object; // Evas_Object *splash_window; // Eina_List *engines, *l; @@ -3454,6 +3463,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) evas_object_show(object); eulogium_setup(&eulogium); + eulogium_print_data_clear(&eulogium); object = eulogium_main_menu(window, &eulogium); if (!object) return EXIT_FAILURE; |