7 files changed, 25 insertions, 8 deletions

diff --git a/src/extantz/Evas_3D_demo.c b/src/extantz/Evas_3D_demo.c
index fb6f03f..3dda9ef 100644
--- a/src/extantz/Evas_3D_demo.c
+++ b/src/extantz/Evas_3D_demo.c
@@ -456,7 +456,6 @@ void Evas_3D_Demo_add(globals *ourGlobals)
 
 void Evas_3D_Demo_fini(globals *ourGlobals)
 {
-  eo_unref(ourGlobals->scene->image);
   free(sphere_vertices);
   free(sphere_indices);
 }
diff --git a/src/extantz/camera.c b/src/extantz/camera.c
index 83bf98a..b7a79d1 100644
--- a/src/extantz/camera.c
+++ b/src/extantz/camera.c
@@ -235,6 +235,7 @@ Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *image)
 //    evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)
     evas_3d_node_orientation_set(0.0, 0.0, 0.0, 1.0)
     );
+//  eo_unref(camera);
 
   eo_do(scene->root_node, evas_3d_node_member_add(result));
   eo_do(scene->scene, evas_3d_scene_camera_node_set(result));
diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c
index 6ace8a0..a0bf4d0 100644
--- a/src/extantz/ephysics_demo.c
+++ b/src/extantz/ephysics_demo.c
@@ -34,7 +34,7 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals)
 
   sprintf(buf, "%s/%s.edj", elm_app_data_dir_get(), EPHYSICS_TEST_THEME);
   box1 = eo_add(ELM_OBJ_IMAGE_CLASS, ourGlobals->win,
-    elm_obj_image_file_set(strdup(buf), "blue-cube"),
+    elm_obj_image_file_set(buf, "blue-cube"),
     evas_obj_size_set(70, 70),
     evas_obj_position_set(ourGlobals->win_w / 2 - 80, ourGlobals->win_h - 200),
     evas_obj_visibility_set(EINA_TRUE)
@@ -49,10 +49,9 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals)
   ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1);
   eo_unref(box1);
 
-
   sprintf(buf, "%s/%s.edj", elm_app_data_dir_get(), EPHYSICS_TEST_THEME);
   box2 = eo_add(ELM_OBJ_IMAGE_CLASS, ourGlobals->win,
-    elm_obj_image_file_set(strdup(buf), "purple-cube"),
+    elm_obj_image_file_set(buf, "purple-cube"),
     evas_obj_size_set(70, 70),
     evas_obj_position_set(ourGlobals->win_w / 2 + 10, ourGlobals->win_h - 200),
     evas_obj_visibility_set(EINA_TRUE)
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index ff418c0..fa38251 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -606,8 +606,6 @@ EAPI_MAIN int elm_main(int argc, char **argv)
   ourGlobals.ee = ecore_evas_ecore_evas_get(ourGlobals.evas);   // Only use this on Evas that was created with Ecore_Evas.
 #endif
 
-  evas_object_event_callback_add(ourGlobals.win, EVAS_CALLBACK_RESIZE, _on_resize, &ourGlobals);
-
   // Get the screen size.
   elm_win_screen_size_get(ourGlobals.win, &ourGlobals.win_x, &ourGlobals.win_y, &ourGlobals.scr_w, &ourGlobals.scr_h);
   ourGlobals.win_x = ourGlobals.win_x + (ourGlobals.scr_w / 3);
@@ -616,6 +614,8 @@ EAPI_MAIN int elm_main(int argc, char **argv)
   evas_object_move(ourGlobals.win, ourGlobals.win_x, ourGlobals.win_y);
   evas_object_resize(ourGlobals.win, ourGlobals.win_w, ourGlobals.win_h);
 
+  evas_object_event_callback_add(ourGlobals.win, EVAS_CALLBACK_RESIZE, _on_resize, &ourGlobals);
+
   /*  Our "layers".  TODO - This is out of date, I should update it.
 
       Elm win           - our real main window
@@ -694,7 +694,9 @@ EAPI_MAIN int elm_main(int argc, char **argv)
 
   if (ourGlobals.win)
   {
+    ecore_animator_del(ourGlobals.animator);
     Evas_3D_Demo_fini(&ourGlobals);
+    scenriDel(ourGlobals.scene);
     eo_unref(ourGlobals.tb);
     winFangDel(ourGlobals.mainWindow);
   }
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index d77c764..a41f4e0 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -264,6 +264,7 @@ void Evas_3D_Demo_fini(globals *ourGlobals);
 Scene_Data *scenriAdd(Evas_Object *win);
 Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *win);
 Eina_Bool animateCamera(Scene_Data *scene);
+void scenriDel(Scene_Data *scene);
 
 winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save);
 void     filesShow(winFang *me, Evas_Smart_Cb func, void *data);
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c
index eaec88e..0210a48 100644
--- a/src/extantz/scenri.c
+++ b/src/extantz/scenri.c
@@ -143,7 +143,20 @@ Scene_Data *scenriAdd(Evas_Object *win)
   return scene;
 }
 
-void scenriDel(globals *ourGlobals)
+void scenriDel(Scene_Data *scene)
 {
-  eo_unref(ourGlobals->scene->image);
+  // TODO - I should probably free up all this Evas_3D stuff.  Oddly Eo doesn't bitch about it, only valgrind.
+  //        Eo bitches if they are unref'd here.
+  //        So either Eo or valgrind bitches, depending on what I do.  I'll leave them commented out, let valgrind bitch, and blame Evas_3D.
+//  eo_unref(scene->light_node);
+//  eo_unref(scene->light);
+
+  // TODO - Should have a separate cameraDel() for these.
+  free(scene->move);
+//  eo_unref(scene->camera_node);
+
+  eo_unref(scene->image);
+  eo_unref(scene->scene);
+//  eo_unref(scene->root_node);
+  free(scene);
 }
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index 64df84c..ef10631 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -245,6 +245,7 @@ winFang *woMan_add(globals *ourGlobals)
     viewer_gic->func.del = NULL;
     for (i = 0; NULL != viewerTest[i][0]; i++)
     {
+        // TODO - Should free this later, but this entire thing needs a rewrite anyway.
         ezViewer *thisViewer = calloc(1, sizeof(ezViewer));
         
         if (thisViewer)
@@ -265,6 +266,7 @@ winFang *woMan_add(globals *ourGlobals)
 
     sprintf(buf, "%s/%s", elm_app_data_dir_get(), img3);
     tab = viewerList;                           tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Viewers", _promote, tab_it);
+    // TODO - This strdup leaks, but this is just temporary test code anyway, it will go away.
     tab = _content_image_new(me->win, strdup(buf));     tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Landmarks", _promote, tab_it);
     tab = gridList;                             tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it);
     elm_layout_box_append(me->win, WF_BOX, nf);