viking

commit 7e8ec4afaad18a1cfde09a1926caf5d50554db96
parent b2dcf34891b046de55eb0c48f02e709978380cbe
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Mon,  8 Oct 2012 15:49:06 -0600

free some variables to make valgrind happy

Diffstat:
M
src/callbacks.c
 | 
6
+++---
M
src/main.c
 | 
18
++++++++++++------

2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/callbacks.c b/src/callbacks.c
@@ -119,7 +119,7 @@ webview_inspector_close_cb(void *data, Evas_Object *obj, void *event_info)
 static void
 webview_uri_changed_cb(void *data, Evas_Object *obj, void *event_info) 
 {
-	Arg a = { .i = Silent, .s = strdup(JS_SETUP_HINTS) };
+	// Arg a = { .i = Silent, .s = strdup(JS_SETUP_HINTS) };
 	Buffer_Data *bd = data;
 	const char *uri = event_info;
 	// int i;
@@ -129,8 +129,8 @@ webview_uri_changed_cb(void *data, Evas_Object *obj, void *event_info)
 
 	// userscript_hooks_start(elm_web_uri_get(td->web));
 
-	script(&a, bd->window);
-	free(a.s);
+	// script(&a, bd->window);
+	// free(a.s);
 
 	if (bd->window->mode == ModeInsert || bd->window->mode == ModeHints) {
 		Arg a = { .i = ModeNormal };
diff --git a/src/main.c b/src/main.c
@@ -279,6 +279,7 @@ elm_main(int argc, char *argv[])
 		exit(0);
 	}
 
+	eet_init();
 	viking_state_init();
 
 	/* calloc zeros the memory!! */
@@ -390,14 +391,18 @@ elm_main(int argc, char *argv[])
 	if (ad->session_save_timer)
 		ecore_timer_del(ad->session_save_timer);
 
-	Eina_List *w;
-	void *data;
+	Eina_List *w, *b_itr, *b_next;
 	Window_Data *wd;
+	Buffer_Data *bd;
 	/* free window specific data */
-	EINA_LIST_FOREACH(ad->windows, w, data) {
-		wd = data;
-		//eina_list_free(wd->buffer_list);
+	EINA_LIST_FOREACH(ad->windows, w, wd) {
+		EINA_LIST_FOREACH_SAFE(wd->buffer_list, b_itr, b_next, bd)
+			evas_object_del(bd->view);
+
+		eina_list_free(wd->buffer_list);
 		eina_list_free(wd->commandhistory);
+		free(wd);
+		// evas_object_del(wd->win);
 	}
 
 	/* need to free ->keyslistroot here too */
@@ -407,9 +412,10 @@ elm_main(int argc, char *argv[])
 	free(ad);
 
 	// printf("viking was up for %0.3f seconds\n", ecore_con_server_uptime_get(svr));
-	ecore_con_shutdown();
 	elm_shutdown();
 	viking_state_shutdown();
+	eet_shutdown();
+	ecore_con_shutdown();
 
 	free(uri);