From 1509787676376447ca7ec41b15ff85ff90f0d842 Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Sat, 30 Apr 2011 08:34:38 -0600
Subject: GTK3 always has scrollbars, workaround for
 https://bugs.webkit.org/show_bug.cgi?id=59197

:(
---
 src/uzbl-core.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index 56d2f86..0dbff4f 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -137,7 +137,10 @@ const struct var_name_to_ptr_t {
     { "current_encoding",       PTR_V_STR(uzbl.behave.current_encoding,         1,   set_current_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)},
+
+#if !GTK_CHECK_VERSION(3,0,0)
     { "scrollbars_visible",     PTR_V_INT(uzbl.gui.scrollbars_visible,          1,   cmd_scrollbars_visibility)},
+#endif
 
     /* constants (not dumpable or writeable) */
     { "WEBKIT_MAJOR",           PTR_C_INT(uzbl.info.webkit_major,                    NULL)},
@@ -1254,8 +1257,7 @@ parse_command(const char *cmd, const char *params, GString *result) {
 
 void
 move_statusbar() {
-    if (!uzbl.gui.scrolled_win &&
-            !uzbl.gui.mainbar)
+    if (!uzbl.gui.scrolled_win && !uzbl.gui.mainbar)
         return;
 
     g_object_ref(uzbl.gui.scrolled_win);
@@ -1442,11 +1444,11 @@ create_scrolled_win() {
     g->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
     WebKitWebFrame *wf = webkit_web_view_get_main_frame (g->web_view);
 
-    gtk_scrolled_window_set_policy(
-        GTK_SCROLLED_WINDOW(g->scrolled_win),
-        GTK_POLICY_NEVER,
-        GTK_POLICY_NEVER
-    );
+#if !GTK_CHECK_VERSION(3,0,0)
+    /* hide the scrollbars by default */
+    uzbl.gui.scrollbars_visible = 0;
+    cmd_scrollbars_visibility();
+#endif
 
     gtk_container_add(
         GTK_CONTAINER(g->scrolled_win),
-- 
cgit v1.2.3