diff options
Diffstat (limited to '')
-rw-r--r-- | src/extantz/extantz.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 679a47e..8956bbf 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -386,7 +386,6 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
386 | Evas_Object *obj; | 386 | Evas_Object *obj; |
387 | EPhysics_World *world; | 387 | EPhysics_World *world; |
388 | GLData *gld = NULL; | 388 | GLData *gld = NULL; |
389 | winFang *chat = NULL, *woMan = NULL; | ||
390 | char buf[PATH_MAX]; | 389 | char buf[PATH_MAX]; |
391 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. | 390 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. |
392 | 391 | ||
@@ -417,6 +416,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
417 | elm_config_finger_size_set(0); | 416 | elm_config_finger_size_set(0); |
418 | elm_config_scale_set(1.0); | 417 | elm_config_scale_set(1.0); |
419 | 418 | ||
419 | eina_clist_init(&ourGlobals.winFangs); | ||
420 | gld = &ourGlobals.gld; | 420 | gld = &ourGlobals.gld; |
421 | gldata_init(gld); | 421 | gldata_init(gld); |
422 | 422 | ||
@@ -468,8 +468,8 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
468 | elm_win_resize_object_add(ourGlobals.win, ourGlobals.bx); | 468 | elm_win_resize_object_add(ourGlobals.win, ourGlobals.bx); |
469 | 469 | ||
470 | // overlay_add(&ourGlobals); | 470 | // overlay_add(&ourGlobals); |
471 | woMan = woMan_add(&ourGlobals); | 471 | woMan_add(&ourGlobals); |
472 | chat = chat_add(&ourGlobals); | 472 | chat_add(&ourGlobals); |
473 | ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); | 473 | ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); |
474 | 474 | ||
475 | // Gotta do this after adding the windows, otherwise the menu renders under the window. | 475 | // Gotta do this after adding the windows, otherwise the menu renders under the window. |
@@ -503,11 +503,15 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
503 | 503 | ||
504 | if (ourGlobals. win) | 504 | if (ourGlobals. win) |
505 | { | 505 | { |
506 | winFang *win; | ||
507 | |||
506 | Evas_3D_Demo_fini(&ourGlobals); | 508 | Evas_3D_Demo_fini(&ourGlobals); |
507 | eo_unref(ourGlobals.tb); | 509 | eo_unref(ourGlobals.tb); |
508 | winFangDel(&ourGlobals, ourGlobals.files); | 510 | |
509 | winFangDel(&ourGlobals, chat); | 511 | EINA_CLIST_FOR_EACH_ENTRY(win, &ourGlobals.winFangs, winFang, node) |
510 | winFangDel(&ourGlobals, woMan); | 512 | { |
513 | winFangDel(&ourGlobals, win); | ||
514 | } | ||
511 | eo_unref(ourGlobals.bx); | 515 | eo_unref(ourGlobals.bx); |
512 | evas_object_del(ourGlobals.win); | 516 | evas_object_del(ourGlobals.win); |
513 | } | 517 | } |