viking

commit 34cdaf0cedd40ad7ee80bdf840652dc1c004c89f
parent 31cade0c2e2424f74f1cde7ef3b9628fec68fd95
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Sat, 13 Oct 2012 21:53:37 -0600

use more appropriate variable name

Diffstat:
M
src/utilities.c
 | 
55
+++++++++++++++++++++++++++++++------------------------
M
src/viking.h
 | 
1
+

2 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/utilities.c b/src/utilities.c
@@ -625,61 +625,68 @@ setup_modkeys(void *data)
 Buffer_Data*
 buffer_add(const unsigned char flags, Window_Data *wd, const char *url, Session_Item *session_item)
 {
-	Buffer_Data *td;
+	Buffer_Data *bd;
 
-	td = calloc(1, sizeof(Buffer_Data));
-	if (!td) return NULL;
+	bd = calloc(1, sizeof(Buffer_Data));
+	if (!bd) return NULL;
 
 	/* if the InNewWindow flag is set, create the buffer in a new window */
 	if (flags & InNewWindow)
 		wd = window_add(wd->app, NULL);
 
 	wd->buf_total++;
-	wd->buffer_list = eina_list_append(wd->buffer_list, td);
+	wd->buffer_list = eina_list_append(wd->buffer_list, bd);
 
-	td->window = wd;
-	td->buf_number = wd->buf_total;
-	td->inspector_enabled = EINA_FALSE;
-	td->proxy_enabled = EINA_FALSE;
-	td->cookies_enabled = EINA_FALSE;
-	td->view = ewk_view_add(evas_object_evas_get(wd->win));
-	ewk_view_theme_set(td->view, "/usr/share/ewebkit-0/themes/default.edj");
+	bd->window = wd;
+	bd->buf_number = wd->buf_total;
+	bd->inspector_enabled = EINA_FALSE;
+	bd->proxy_enabled = EINA_FALSE;
+	bd->cookies_enabled = EINA_FALSE;
+	bd->view = ewk_view_add(evas_object_evas_get(wd->win));
+	ewk_view_theme_set(bd->view, "/usr/share/ewebkit-0/themes/default.edj");
 
 	// Ewk_Settings *settings = ewk_view_settings_get(td->view);
 	// ewk_settings_DNS_prefetching_enabled_set(settings, EINA_TRUE);
 
-	evas_object_size_hint_weight_set(td->view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_size_hint_align_set(td->view, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_size_hint_weight_set(bd->view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(bd->view, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-	elm_naviframe_item_simple_push(wd->naviframe, td->view);
+	elm_naviframe_item_simple_push(wd->naviframe, bd->view);
 
 	/*
 	if (wd->cur_buf)
-		elm_naviframe_item_insert_after(wd->naviframe, ad->cur_buf->view, );
+		bd->elm_obj = elm_naviframe_item_insert_after(wd->naviframe,
+				wd->cur_buf->elm_obj,
+				NULL,
+				NULL,
+				NULL,
+				bd->view,
+				NULL);
 	else
-		elm_naviframe_item_simple_push(ad->naviframe, td->web);
+		bd->elm_obj = elm_naviframe_item_simple_push(wd->naviframe, bd->view);
 	*/
 
-	setup_buffer_callbacks(td);
+	setup_buffer_callbacks(bd);
+
 
 	if (url)
-		ewk_view_url_set(td->view, url);
+		ewk_view_url_set(bd->view, url);
 	else
-		ewk_view_url_set(td->view, config_home_page_get(wd->app->config));
+		ewk_view_url_set(bd->view, config_home_page_get(wd->app->config));
 
 	if (flags & SwitchToBuffer)
-		buffer_current_set(td);
+		buffer_current_set(bd);
 
 	if (!session_item) {
-		if (!(session_item = session_item_new(ewk_view_url_get(td->view), EINA_FALSE, 0, 0)))
+		if (!(session_item = session_item_new(ewk_view_url_get(bd->view), EINA_FALSE, 0, 0)))
 			CRITICAL("Could not create session object");
 		session_window_tabs_add(wd->session_window, session_item);
 	}
 
-	evas_object_data_set(td->view, "session", session_item);
-	evas_object_data_set(td->view, "buffer_data", td);
+	evas_object_data_set(bd->view, "session", session_item);
+	evas_object_data_set(bd->view, "buffer_data", bd);
 
-	return td;
+	return bd;
 }
 
 void
diff --git a/src/viking.h b/src/viking.h
@@ -251,6 +251,7 @@ typedef struct
 
 struct _Buffer_Data
 {
+	// Elm_Object_Item *elm_obj;
 	Evas_Object *view;
 	unsigned int buf_number;