Merge remote branch 'Dieterbe/experimental' into experimental

1 files changed, 2 insertions, 1 deletions

diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index 3e164c6..f5b89df 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -139,6 +139,7 @@ const struct var_name_to_ptr_t {
     { "default_encoding",       PTR_V_STR(uzbl.behave.default_encoding,         1,   cmd_default_encoding)},
     { "enforce_96_dpi",         PTR_V_INT(uzbl.behave.enforce_96dpi,            1,   cmd_enforce_96dpi)},
     { "caret_browsing",         PTR_V_INT(uzbl.behave.caret_browsing,           1,   cmd_caret_browsing)},
+    { "scrollbars_visible",     PTR_V_INT(uzbl.gui.scrollbars_visible,          1,   cmd_scrollbars_visibility)},
 
     /* constants (not dumpable or writeable) */
     { "WEBKIT_MAJOR",           PTR_C_INT(uzbl.info.webkit_major,                    NULL)},
@@ -1078,7 +1079,7 @@ eval_js(WebKitWebView * web_view, gchar *script, GString *result) {
 
         JSStringRelease(js_result_string);
     }
-    else if (js_exc && JSValueIsObject(context, js_exc)) {
+    else if (js_exc) {
         size_t size;
         JSStringRef prop, val;
         JSObjectRef exc = JSValueToObject(context, js_exc, NULL);