summaryrefslogtreecommitdiff
path: root/src/view.c
diff options
context:
space:
mode:
authorportix <none@none>2012-10-23 01:40:04 +0200
committerportix <none@none>2012-10-23 01:40:04 +0200
commit78f702905ada582dbca9ec6fd7d0a7c7345fddf0 (patch)
tree577f417c0e6dd4528ad2a1049a01918ebc398098 /src/view.c
parent1bf336e63e1c46a3005d1e4d555d294dd45a9af0 (diff)
downloaddwb-78f702905ada582dbca9ec6fd7d0a7c7345fddf0.zip
Renaming hints.js -> base.js, hint_object -> js_base
--HG-- rename : scripts/hints.js => scripts/base.js
Diffstat (limited to 'src/view.c')
-rw-r--r--src/view.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/view.c b/src/view.c
index 4658ae0e..c6f81f94 100644
--- a/src/view.c
+++ b/src/view.c
@@ -630,12 +630,12 @@ view_load_status_after_cb(WebKitWebView *web, GParamSpec *pspec, GList *gl) {
WebKitLoadStatus status = webkit_web_view_get_load_status(web);
if (status == WEBKIT_LOAD_COMMITTED) {
dwb_execute_script(webkit_web_view_get_main_frame(web), dwb.misc.scripts, false);
- if (VIEW(gl)->hint_object != NULL) {
- JSValueUnprotect(JS_CONTEXT_REF(gl), VIEW(gl)->hint_object);
- VIEW(gl)->hint_object = NULL;
+ if (VIEW(gl)->js_base != NULL) {
+ JSValueUnprotect(JS_CONTEXT_REF(gl), VIEW(gl)->js_base);
+ VIEW(gl)->js_base = NULL;
}
- VIEW(gl)->hint_object = js_create_object(webkit_web_view_get_main_frame(web), dwb.misc.hints);
- js_call_as_function(webkit_web_view_get_main_frame(web), VIEW(gl)->hint_object, "init", dwb.misc.hint_style, kJSTypeObject, NULL);
+ VIEW(gl)->js_base = js_create_object(webkit_web_view_get_main_frame(web), dwb.misc.hints);
+ js_call_as_function(webkit_web_view_get_main_frame(web), VIEW(gl)->js_base, "init", dwb.misc.hint_style, kJSTypeObject, NULL);
}
}/*}}}*/
/* view_load_status_cb {{{*/
@@ -659,7 +659,7 @@ view_load_status_cb(WebKitWebView *web, GParamSpec *pspec, GList *gl) {
/* This is more or less a dummy call, to compile the script and speed up
* execution time
* */
- js_call_as_function(webkit_web_view_get_main_frame(web), v->hint_object, "createStyleSheet", NULL, kJSTypeUndefined, NULL);
+ js_call_as_function(webkit_web_view_get_main_frame(web), v->js_base, "createStyleSheet", NULL, kJSTypeUndefined, NULL);
break;
case WEBKIT_LOAD_COMMITTED:
if (v->status->scripts & SCRIPTS_ALLOWED_TEMPORARY) {
@@ -916,7 +916,7 @@ view_create_web_view() {
status->frames = NULL;
status->group = 0;
- v->hint_object = NULL;
+ v->js_base = NULL;
v->inspector_window = NULL;
v->plugins = plugins_new();
for (int i=0; i<SIG_LAST; i++)