viking

commit baff75744be41e8e3453180f81b589753e558faf
parent 451239a1f34070b3d7ef5836f03ab7a970442438
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Mon, 15 Oct 2012 21:51:52 -0600

reenable the inspector, although not functional

Diffstat:
M
src/callbacks.c
 | 
20
+++++++++++---------
M
src/commands.c
 | 
8
++------

2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/callbacks.c b/src/callbacks.c
@@ -78,14 +78,15 @@ load_error_cb(void *data, Evas_Object *obj, void *event_info)
 	*/
 }
 
-/*
 static void
-webview_inspector_cb(void *data, Evas_Object *obj, void *event_info)
+inspector_cb(void *data, Evas_Object *obj, void *event_info)
 {
+	printf("inspector_cb()\n");
+	/*
 	Buffer_Data *bd = data;
 	Window_Data *wd = bd->window;
 
-	bd->web_inspector = ewk_view_single_add(evas_object_evas_get(wd->win));
+	bd->web_inspector = ewk_view_add(evas_object_evas_get(wd->win));
 	ewk_view_theme_set(bd->web_inspector, "/usr/share/ewebkit-0/themes/default.edj");
 
 	evas_object_size_hint_weight_set(bd->web_inspector, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -98,13 +99,14 @@ webview_inspector_cb(void *data, Evas_Object *obj, void *event_info)
 
 	evas_object_size_hint_weight_set(wd->web_inspector, EVAS_HINT_EXPAND, 0.66);
 	evas_object_show(wd->web_inspector);
+	*/
 }
-*/
 
-/*
 static void
-webview_inspector_close_cb(void *data, Evas_Object *obj, void *event_info)
+inspector_close_cb(void *data, Evas_Object *obj, void *event_info)
 {
+	printf("inspector_close_cb()\n");
+	/*
 	Buffer_Data *bd = data;
 	Window_Data *wd = bd->window;
 
@@ -113,8 +115,8 @@ webview_inspector_close_cb(void *data, Evas_Object *obj, void *event_info)
 	ewk_view_web_inspector_view_set(bd->view, NULL);
 
 	bd->web_inspector = NULL;
+	*/
 }
-*/
 
 static void
 uri_changed_cb(void *data, Evas_Object *obj, void *event_info)
@@ -1032,8 +1034,8 @@ setup_buffer_callbacks(Buffer_Data *bd)
 	// evas_object_smart_callback_add(v, "link,hover,in", hoverlink_cb, td);
 	// evas_object_smart_callback_add(v, "link,hover,out",hoverlink_out_cb, td);
 	// evas_object_smart_callback_add(v, "inputmethod,changed", inputmethod_changed_cb, td);
-	// evas_object_smart_callback_add(v, "inspector,view,create", inspector_cb, td);
-	// evas_object_smart_callback_add(v, "inspector,view,close", inspector_close_cb, td);
+	evas_object_smart_callback_add(v, "inspector,view,create", inspector_cb, bd);
+	evas_object_smart_callback_add(v, "inspector,view,close", inspector_close_cb, bd);
 
 	/* input events */
 	evas_object_event_callback_add(v, EVAS_CALLBACK_FREE, webview_free_cb, bd);
diff --git a/src/commands.c b/src/commands.c
@@ -1064,23 +1064,19 @@ switch_buffer(const Arg *arg, void *data)
 Eina_Bool
 inspector(const Arg *arg, void *data)
 {
-	/*
 	Window_Data *ad = data;
 	Buffer_Data *bd = ad->cur_buf;
 
 	if (!bd->inspector_enabled) {
-		ewk_view_setting_enable_developer_extras_set(bd->view, EINA_TRUE);
-		ewk_view_web_inspector_show(bd->view);
+		ewk_view_inspector_show(bd->view);
 		bd->inspector_enabled = EINA_TRUE;
 		update_url(ewk_view_url_get(bd->view), data);
 	}
 	else {
-		ewk_view_web_inspector_close(bd->view);
+		ewk_view_inspector_close(bd->view);
 		bd->inspector_enabled = EINA_FALSE;
-		ewk_view_setting_enable_developer_extras_set(bd->view, EINA_FALSE);
 		update_url(ewk_view_url_get(bd->view), data);
 	}
-	*/
 
 	return EINA_TRUE;
 }