diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2010-12-31 20:25:05 -0700 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2010-12-31 20:25:05 -0700 |
| commit | 3fdac9c8bc8be051524ce09f6b0affd38f2d93f8 (patch) | |
| tree | 60fab4f3769452c7d8d501c3ec1d77453d335b66 | |
| parent | 8c8bd0fbd5644d91ff3cdd2b13c07f28e7e0f716 (diff) | |
| parent | 4164140730a92a5abfda5545a9ff5ce2e44776cb (diff) | |
Merge remote branch 'keis/gtk3' into experimental
Conflicts:
Makefile
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/uzbl-core.c | 2 | ||||
| -rw-r--r-- | tests/Makefile | 8 |
3 files changed, 8 insertions, 8 deletions
@@ -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 --- |