From 771dfb3e4c29b7389478ae427de720864d155e38 Mon Sep 17 00:00:00 2001
From: keis <keijser@gmail.com>
Date: Tue, 28 Dec 2010 09:28:08 +0100
Subject: use gtk version check macro

---
 Makefile        | 2 +-
 src/uzbl-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 44a07a1..87d00c3 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CPPFLAGS  =
 
 # gtk3
 #REQ_PKGS += gtk+-3.0 webkitgtk-3.0
-#CPPFLAGS	 = -DGTK3
+#CPPFLAG =
 
 CFLAGS:=-std=c99 $(shell pkg-config --cflags $(REQ_PKGS)) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
 CFLAGS!=echo -std=c99 `pkg-config --cflags $(REQ_PKGS)` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index 73ed5c6..a33d51d 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -2279,7 +2279,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
-- 
cgit v1.2.3


From 4164140730a92a5abfda5545a9ff5ce2e44776cb Mon Sep 17 00:00:00 2001
From: keis <keijser@gmail.com>
Date: Tue, 28 Dec 2010 10:43:24 +0100
Subject: disable deprecated symbols when using gtk+ 3

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 87d00c3..0c2881f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@ REQ_PKGS  = libsoup-2.4 gthread-2.0 glib-2.0
 
 # gtk2
 REQ_PKGS += gtk+-2.0 webkit-1.0
-CPPFLAGS  =
+CPPFLAGS =
 
 # gtk3
 #REQ_PKGS += gtk+-3.0 webkitgtk-3.0
-#CPPFLAG =
+#CPPFLAG = -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 
 
 CFLAGS:=-std=c99 $(shell pkg-config --cflags $(REQ_PKGS)) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
 CFLAGS!=echo -std=c99 `pkg-config --cflags $(REQ_PKGS)` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-- 
cgit v1.2.3