aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--src/uzbl-core.c2
-rw-r--r--tests/Makefile8
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 7724303..f33a626 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,12 @@ DOCDIR?=$(INSTALLDIR)/share/uzbl/docs
RUN_PREFIX?=$(PREFIX)
# gtk2
-REQ_PKGS = gtk+-2.0 webkit-1.0
+REQ_PKGS += gtk+-2.0 webkit-1.0
CPPFLAGS =
# gtk3
-#REQ_PKGS = gtk+-3.0 webkitgtk-3.0
-#CPPFLAGS = -DGTK3
+#REQ_PKGS += gtk+-3.0 webkitgtk-3.0
+#CPPFLAGS = -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
# --- configuration ends here ---
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index 592a8dd..b7b8b00 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -2261,7 +2261,7 @@ retrieve_geometry() {
void
set_webview_scroll_adjustments() {
-#ifdef GTK3
+#if GTK_CHECK_VERSION(2,91,0)
gtk_scrollable_set_hadjustment (GTK_SCROLLABLE(uzbl.gui.web_view), uzbl.gui.bar_h);
gtk_scrollable_set_vadjustment (GTK_SCROLLABLE(uzbl.gui.web_view), uzbl.gui.bar_v);
#else
diff --git a/tests/Makefile b/tests/Makefile
index bfe74c5..2a5e2b6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,10 +1,10 @@
# gtk2
-REQ_PKGS = gtk+-2.0 webkit-1.0
-CPPFLAGS = -DERRORCHECK_MUTEXES -I ../
+REQ_PKGS += gtk+-2.0 webkit-1.0
+CPPFLAGS = -I ../ -DERRORCHECK_MUTEXES
# gtk3
-#REQ_PKGS = gtk+-3.0 webkitgtk-3.0
-#CPPFLAGS = -DERRORCHECK_MUTEXES -DGTK3 -I ../
+#REQ_PKGS += gtk+-3.0 webkitgtk-3.0
+#CPPFLAGS = -I ../ -DERRORCHECK_MUTEXES -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
# --- configuration ends here ---