Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtk+/configure.in,v
retrieving revision 1.483
diff -u -p -r1.483 configure.in
--- configure.in	20 Jan 2006 04:57:45 -0000	1.483
+++ configure.in	25 Jan 2006 19:52:40 -0000
@@ -515,6 +515,14 @@ AM_PATH_GLIB_2_0(glib_required_version, 
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
   gobject gmodule-no-export gthread)
 
+# See if it's safe to turn G_DISABLE_DEPRECATED on.
+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"`
+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo glib_required_version | sed "s/\.@<:@^.@:>@*\$//"`
+if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+  CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
+fi
+
+
 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 dnl
Index: contrib/gdk-pixbuf-xlib/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/contrib/gdk-pixbuf-xlib/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- contrib/gdk-pixbuf-xlib/Makefile.am	3 Mar 2004 20:53:23 -0000	1.10
+++ contrib/gdk-pixbuf-xlib/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -4,7 +4,6 @@ INCLUDES = \
 	-I$(top_srcdir) -I$(top_builddir) 	\
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_srcdir)/contrib 		\
-	-DG_DISABLE_DEPRECATED			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
Index: demos/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/demos/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- demos/Makefile.am	6 Jun 2003 00:52:19 -0000	1.27
+++ demos/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -5,7 +5,6 @@ SUBDIRS = gtk-demo
 INCLUDES = 						\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gdk				\
-	-DG_DISABLE_DEPRECATED	 			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED			\
Index: demos/gtk-demo/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/demos/gtk-demo/Makefile.am,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile.am
--- demos/gtk-demo/Makefile.am	12 Jul 2005 16:02:19 -0000	1.36
+++ demos/gtk-demo/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -36,7 +36,6 @@ INCLUDES = \
 	-DDEMOCODEDIR="\"$(democodedir)\""		\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gdk				\
-	-DG_DISABLE_DEPRECATED	 			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED 			\
Index: gdk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/Makefile.am,v
retrieving revision 1.123
diff -u -p -r1.123 Makefile.am
--- gdk/Makefile.am	22 Nov 2005 10:03:30 -0000	1.123
+++ gdk/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -23,7 +23,6 @@ INCLUDES =                              
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk-pixbuf 	\
-	-DG_DISABLE_DEPRECATED		\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGDK_DISABLE_DEPRECATED	\
 	$(GTK_DEBUG_FLAGS) 		\
Index: gdk/linux-fb/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/linux-fb/Makefile.am,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile.am
--- gdk/linux-fb/Makefile.am	10 Dec 2003 13:49:53 -0000	1.28
+++ gdk/linux-fb/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -15,7 +15,6 @@ INCLUDES = \
 	-I$(top_srcdir)		\
 	-I$(top_srcdir)/gdk	\
 	-I$(top_builddir)/gdk	\
-	-DG_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	$(GDK_DEP_CFLAGS)	\
 	$(GTK_DEBUG_FLAGS)
Index: gdk/quartz/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/quartz/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- gdk/quartz/Makefile.am	22 Nov 2005 10:03:31 -0000	1.1
+++ gdk/quartz/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -6,7 +6,6 @@ INCLUDES = 				\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
-	-DG_DISABLE_DEPRECATED		\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGDK_DISABLE_DEPRECATED	\
 	$(GTK_DEBUG_FLAGS) 		\
Index: gdk/x11/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/Makefile.am,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile.am
--- gdk/x11/Makefile.am	21 Jul 2005 13:59:22 -0000	1.34
+++ gdk/x11/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -8,7 +8,6 @@ INCLUDES = 				\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
-	-DG_DISABLE_DEPRECATED		\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGDK_DISABLE_DEPRECATED	\
 	$(GTK_DEBUG_FLAGS) 		\
Index: gdk-pixbuf/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/Makefile.am,v
retrieving revision 1.158
diff -u -p -r1.158 Makefile.am
--- gdk-pixbuf/Makefile.am	26 Oct 2005 18:00:56 -0000	1.158
+++ gdk-pixbuf/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -273,7 +273,6 @@ INCLUDES = \
 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
-	-DG_DISABLE_DEPRECATED			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	-DGTK_PREFIX=\"$(prefix)\"		\
 	$(INCLUDED_LOADER_DEFINE) 		\
Index: gdk-pixbuf/pixops/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/pixops/Makefile.am,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile.am
--- gdk-pixbuf/pixops/Makefile.am	6 May 2003 21:54:28 -0000	1.17
+++ gdk-pixbuf/pixops/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -4,7 +4,6 @@ INCLUDES = \
 	-I$(top_srcdir) -I$(top_builddir) 	\
 	$(GTK_DEBUG_FLAGS)			\
 	$(GDK_PIXBUF_DEP_CFLAGS)		\
-	-DG_DISABLE_DEPRECATED			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED
 
 noinst_PROGRAMS = timescale
Index: gtk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
retrieving revision 1.291
diff -u -p -r1.291 Makefile.am
--- gtk/Makefile.am	24 Jan 2006 03:35:53 -0000	1.291
+++ gtk/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -22,7 +22,6 @@ INCLUDES =						\
 	-I$(top_srcdir) -I../gdk			\
 	-I$(top_srcdir)/gdk				\
 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
-	-DG_DISABLE_DEPRECATED				\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED			\
Index: gtk/theme-bits/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/theme-bits/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- gtk/theme-bits/Makefile.am	6 May 2003 21:55:40 -0000	1.5
+++ gtk/theme-bits/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -1,5 +1,4 @@
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) 	\
-	-DG_DISABLE_DEPRECATED			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	$(GDK_PIXBUF_DEP_CFLAGS)
 
Index: modules/engines/ms-windows/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/modules/engines/ms-windows/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- modules/engines/ms-windows/Makefile.am	4 Jun 2005 20:19:36 -0000	1.6
+++ modules/engines/ms-windows/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -6,7 +6,6 @@ INCLUDES = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/gdk				\
 	-I$(top_builddir)/gdk				\
-	-DG_DISABLE_DEPRECATED	 			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	$(GTK_DEP_CFLAGS)
Index: modules/engines/pixbuf/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/modules/engines/pixbuf/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- modules/engines/pixbuf/Makefile.am	28 Nov 2004 17:21:06 -0000	1.10
+++ modules/engines/pixbuf/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -6,7 +6,6 @@ INCLUDES = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/gdk				\
 	-I$(top_builddir)/gdk				\
-	-DG_DISABLE_DEPRECATED	 			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	$(GTK_DEP_CFLAGS)
Index: modules/input/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/modules/input/Makefile.am,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile.am
--- modules/input/Makefile.am	4 Jun 2005 22:08:50 -0000	1.34
+++ modules/input/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -8,7 +8,6 @@ INCLUDES = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/gdk				\
 	-I$(top_builddir)/gdk				\
-	-DG_DISABLE_DEPRECATED	 			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED 			\
Index: perf/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/perf/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- perf/Makefile.am	26 Oct 2005 18:01:05 -0000	1.4
+++ perf/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -4,7 +4,6 @@ INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_builddir)/gdk			\
 	-I$(top_srcdir)/gdk			\
-	-DG_DISABLE_DEPRECATED			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGTK_DISABLE_DEPRECATED		\
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/tests/Makefile.am,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile.am
--- tests/Makefile.am	21 Jan 2006 06:25:33 -0000	1.56
+++ tests/Makefile.am	25 Jan 2006 19:52:40 -0000
@@ -4,7 +4,6 @@ INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_builddir)/gdk			\
 	-I$(top_srcdir)/gdk			\
-	-DG_DISABLE_DEPRECATED			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGTK_DISABLE_DEPRECATED		\