Let the cleanup function be optional. (TestSpec): Replaced the

2006-08-31 Federico Mena Quintero <federico@novell.com> * tests/autotestfilesystem.c (run_test): Let the cleanup function be optional. (TestSpec): Replaced the "callback_must_be_called" field with a "callback_type" one. This is an enum that indicates whether the callback must be run, must not be run, or is irrelevant. This lets us run self-contained tests with no auxiliary machinery for callbacks. (tests): Added a test for loading a folder. (test_folder_load): New test function. Tests loading a folder, tests that the returned info matches the files on disk, and that the returned list of files is complete with respect to what is on disk. *** BRANCHED TO cancelation-changes ***
Updated Russian translation
2006-09-01 00:43:04 +00:00 · 2006-08-24 16:50:53 +00:00 · 2006-08-24 00:34:15 +00:00 · 2006-08-23 23:24:38 +00:00 · 2006-08-23 21:59:18 +00:00 · 2006-08-23 19:34:21 +00:00
2366 changed files with 482717 additions and 1030451 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,40 @@
+*.lo
+config.log
+config.h
+config.h.in
+libtool
+config.status
+stamp-h
+stamp-h1
+Makefile
+Makefile.in
+aclocal.m4
+configure
+config.h.win32
+gtk-config-2.0
+config.cache
+ABOUT-NLS
+intl
+stamp-h.in
+gtk+.spec
+gtk+-2.0.pc
+gtk+-2.0-uninstalled.pc
+gtk+-unix-print-2.0.pc
+gtk+-linux-fb-2.0.pc
+gtk+-nanox-2.0.pc
+gtk+-x11-2.0.pc
+gtk+-quartz-2.0.pc
+gdk-2.0.pc
+gdk-2.0-uninstalled.pc
+gdk-linux-fb-2.0.pc
+gdk-nanox-2.0.pc
+gdk-x11-2.0.pc
+gdk-quartz-2.0.pc
+gdk-pixbuf-2.0.pc
+gdk-pixbuf-2.0-uninstalled.pc
+gtk-zip.sh
+missing
+install-sh
+mkinstalldirs
+sgml
+autom4te.cache
--- a/9360
+++ b/9360
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -7981,7 +7981,7 @@ Thu Jun  4 02:20:42 1998  Tim Janik  <timj@gtk.org>
 	* gtk/gtkwidget.h:
 	* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
 	the emission of the "add-accelerator" signal on a widget. this is
-	useful to prevent accelerator installation on certain widgets.
+	usefull to prevent accelerator installation on certain widgets.

 	* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
 	labels left justified, by setting their alignment. stop accelerator
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -17108,7 +17108,7 @@ Tue Jan 16 13:13:13 GMT 2001  Tony Gale <gale@gtk.org>
 	Use fb_mem, fb_stride, fb_width, fb_height.
 	Added recompute_rowstride to reset the rowstride of all windows.
 	Added gdk_fb_recompute_all() which recomputes rootwindow size,
-	window abs positions and window rowstrides. Useful when the
+	window abs positions and window rowstrides. Usefull when the
 	rotation has changed.

 Thu Jan 11 13:16:50 GMT 2001  Tony Gale <gale@gtk.org>
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
--- a/ChangeLog.pre-2-14
+++ b/ChangeLog.pre-2-14
--- a/ChangeLog.pre-2-16
+++ b/ChangeLog.pre-2-16
--- a/79
+++ b/79
@@ -1,64 +1,55 @@
 If you want to hack on the GTK+ project, you'll need to have
 the following packages installed:

-        - GNU autoconf 2.54
-        - GNU automake 1.7
-        - GNU libtool 1.4
-        - indent (GNU indent 1.9.1 is known good)
-        - GNU gettext 10.40
+	- GNU autoconf 2.52
+	- GNU automake 1.4
+	- GNU libtool 1.4
+	- indent (GNU indent 1.9.1 is known good)
+	- GNU gettext 10.40

 These should be available by ftp from ftp.gnu.org or any of the
 fine GNU mirrors.  Beta software can be found at alpha.gnu.org.

-Up-to-date instructions about developing GNOME applications and libraries
-can be found here:
-
-        http://developer.gnome.org
-
-Information about using git with GNOME can be found here:
-
-        http://live.gnome.org/Git
-
-In order to get GIT gtk+ installed on your system, you need to have
-the most recent GIT versions of glib, pango, and atk installed as well.
+In order to get CVS gtk+ installed on your system, you need to have
+the most recent CVS version of glib, pango, and atk installed as well.
 The installation process of these libraries is similar to that of gtk+, but
 needs to be fulfilled prior to installation of gtk+.

-If at all possible, please use GIT to get the latest development version of
-gtk+ and glib. You can do the following to get glib and gtk+ from GIT:
-
-        $ git clone git://git.gnome.org/glib
-        $ git clone git://git.gnome.org/pango
-        $ git clone git://git.gnome.org/atk
-        $ git clone git://git.gnome.org/gtk+
-
-Note: if you plan to push changes to back to the master repository and
-have a gnome account, you want to use the following instead:
-
-        $ git clone ssh://<username>@git.gnome.org/git/gtk+
-
-To compile the GIT version of gtk+ on your system, you will need to take
+To compile a CVS version of gtk+ on your system, you will need to take
 several steps to setup the tree for compilation.  You can do all these
 steps at once by running:

-        gtk+$ ./autogen.sh
-
+        cvsroot/gtk+# ./autogen.sh
+   
 Basically this does the following for you:

-        gtk+$ aclocal; automake; autoconf
+  	cvsroot/gtk+# aclocal; automake; autoconf

-The above commands create the `configure' script.  Now you
-run the `configure' script in `gtk+/' to create all Makefiles.
-More information about that in `INSTALL'.
+        The above commands create the "configure" script.  Now you
+	can run the configure script in cvsroot/gtk+ to create all
+	the Makefiles.

-Before running `autogen.sh' or `configure', make sure you have libtool
-in your path.
+Before running autogen.sh or configure, make sure you have libtool 
+in your path.  

 Note that autogen.sh runs configure for you.  If you wish to pass
-options like `--prefix=/usr' to `configure' you can give those options
-to `autogen.sh' and they will be passed on to `configure'.
+options like --prefix=/usr to configure you can give those options
+to autogen.sh and they will be passed on to configure.
+
+If at all possible, please use CVS to get the latest development version of
+gtk+ and glib.  You can do the following to get glib and gtk+ from cvs:
+
+   $ export CVSROOT=':pserver:anonymous@cvs.gnome.org:/cvs/gnome'
+   $ cvs login
+     (there is no password, just hit return)
+   $ cvs -z3 checkout glib
+   $ cvs -z3 checkout pango
+   $ cvs -z3 checkout atk
+   $ cvs -z3 checkout gtk+
+
+For information about submitting patches and commiting changes
+to CVS, see the README and README.cvs-commits files. In particular, 
+don't, under any circumstances, commit anything to CVS before
+reading and understanding README.cvs-commmits.
+

-For information about submitting patches and pushing changes
-to GIT, see the `README' and `README.commits' files. In particular,
-don't, under any circumstances, push anything to GIT before
-reading and understanding `README.commmits'.
--- a/39
+++ b/39
@@ -0,0 +1,39 @@
+Prerequisites
+=============
+
+GTK+ requires the following packages:
+
+ - The GLib, Pango, ATK and cairo libraries, available at the same 
+   location as GTK+. GTK+ 2.10.2 requires at least GLib 2.12, 
+   Pango 1.13, ATK 1.9 and cairo 1.2.
+
+ - The TIFF, PNG, and JPEG image loading libraries. You most
+   likely have these installed on your system already. If not
+   these libraries are available from:
+
+    http://www.libtiff.org/
+    http://www.libpng.org/
+    http://www.ijg.org/
+
+Simple install procedure
+========================
+
+  % gzip -cd gtk+-2.10.2.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.10.2			   # change to the toplevel directory
+  % ./configure				   # run the `configure' script
+  % make				   # build GTK+
+  [ Become root if necessary ]
+  % make install			   # install GTK+
+
+The Details
+===========
+
+Complete information about installing GTK+ and related libraries can be found 
+in the file:
+
+ docs/reference/gtk/html/gtk-building.html
+
+Or online at:
+
+ http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
+
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -4,8 +4,8 @@ Prerequisites
 GTK+ requires the following packages:

 - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.17.6,
-   Pango 1.20, ATK 1.13.0 and cairo 1.6.0.
+   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.12, 
+   Pango 1.13, ATK 1.9 and cairo 1.2.

 - The TIFF, PNG, and JPEG image loading libraries. You most
   likely have these installed on your system already. If not
@@ -15,8 +15,6 @@ GTK+ requires the following packages:
    http://www.libpng.org/
    http://www.ijg.org/

-    libtiff must be version 3.6.0 or higher.
-
 Simple install procedure
 ========================

--- a/9
+++ b/9
@@ -1,10 +1,5 @@
-Matthias Clasen
-E-mail: mclasen@redhat.com
-Userid: matthiasc
-
-Tim Janik
-E-mail: timj@gtk.org
-Userid: timj
+Email: mclasen@redhat.com
+Email: timj@gtk.org

 Note that a lot of people are contributing to GTK+, and some parts of it 
 are technically maintained by other people. The people listed above are
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
 ## Makefile.am for GTK+
-include $(top_srcdir)/Makefile.decl

 SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
@@ -7,7 +6,7 @@ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.7

-EXTRA_DIST +=			\
+EXTRA_DIST =			\
 	HACKING			\
 	makecopyright		\
 	NEWS.pre-1-0		\
@@ -18,13 +17,9 @@ EXTRA_DIST +=			\
 	ChangeLog.pre-2-4	\
 	ChangeLog.pre-2-6	\
 	ChangeLog.pre-2-8	\
-	ChangeLog.pre-2-10	\
-	ChangeLog.pre-2-12	\
-	ChangeLog.pre-2-14	\
-	ChangeLog.pre-2-16	\
 	ChangeLog.gtk-async-file-chooser	\
 	ChangeLog.gtk-printing	\
-	README.commits	\
+	README.cvs-commits	\
 	README.win32		\
 	config.h.win32		\
 	makefile.msc	\
@@ -118,26 +113,6 @@ EXTRA_DIST +=			\
 	examples/spinbutton/spinbutton.c  \
 	examples/spinbutton/Makefile  \
 	examples/find-examples.sh
-MAINTAINERCLEANFILES = \
-	$(srcdir)/INSTALL \
-	$(srcdir)/README \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autoscan.log \
-	$(srcdir)/compile \
-	$(srcdir)/config.guess \
-	$(srcdir)/config.h.in \
-	$(srcdir)/config.sub \
-	$(srcdir)/configure.scan \
-	$(srcdir)/depcomp \
-	$(srcdir)/install-sh \
-	$(srcdir)/ltmain.sh \
-	$(srcdir)/missing \
-	$(srcdir)/mkinstalldirs \
-	$(srcdir)/omf.make \
-	$(srcdir)/xmldocs.make \
-	$(srcdir)/gtk-doc.make \
-	$(srcdir)/ChangeLog \
-	`find "$(srcdir)" -type f -name Makefile.in -print`

 GDKTARGET=@gdktarget@

@@ -159,40 +134,14 @@ gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
 	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc

 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
-
-if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-2.0.pc
-endif
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gtk+-unix-print-2.0.pc

 DISTCLEANFILES =				\
 	gtk+-unix-print-2.0.pc			\
 	gtk+-$(GDKTARGET)-2.0.pc		\
 	gdk-$(GDKTARGET)-2.0.pc			\
-	gail.pc					\
 	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gail-uninstalled.pc 			\
-	config.lt
-
-distclean-local:
-	if test "$(srcdir)" = "."; then :; else \
-		rm -f ChangeLog; \
-	fi
-
-ChangeLog:
-	@echo Creating $@
-	@if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
-	fi
+	gdk-$(GDKTARGET)-2.0-uninstalled.pc

 ## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
 DEFAULT_GDKTARGET=x11
@@ -218,7 +167,7 @@ dist-hook:
 	     && cp INSTALL README $(distdir) ; \
 	fi

-.PHONY: files release sanity snapshot ChangeLog
+.PHONY: files release sanity snapshot

 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
@@ -243,15 +192,3 @@ snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`

 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds
-
-GITIGNOREFILES = \
-	po-properties/Makefile.in.in \
-	po-properties/Makefile.in \
-	po-properties/Makefile \
-	po-properties/*.gmo \
-	po-properties/*.mo \
-	po-properties/POTFILES \
-	po-properties/stamp-it \
-	po-properties/.intltool-merge-cache
-
-include $(top_srcdir)/git.mk
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -1,82 +0,0 @@
-# GTK+ - The GIMP Toolkit
-
-GTESTER        = gtester		# in $PATH for non-GLIB packages
-GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages
-
-# initialize variables for unconditional += appending
-EXTRA_DIST =
-TEST_PROGS =
-
-### testing rules
-
-# Xvfb based test rules
-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
-XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
-   491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
-   991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
-  1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
-  9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
-  9995 9996 9997 9998 9999
-SKIP_GDKTARGET = \
-	test "$(gdktarget)" != "x11" \
-	&& echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
-XVFB_START = \
-	${XVFB} -help 2>/dev/null 1>&2 \
-	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
-	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
-	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
-	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
-	&& DISPLAY=:$$XID && export DISPLAY
-# call as: $(XVFB_START) && someprogram
-
-# test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
-	@$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-	  $(XVFB_START) && { set -e; ${GTESTER} --verbose ${TEST_PROGS}; }; \
-	}
-	@ for subdir in $(SUBDIRS) ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@ ignore_logdir=true ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then \
-	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-	    ignore_logdir=false ; \
-	  fi ; \
-	  for subdir in $(SUBDIRS) ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done ; \
-	  $(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-	    case $@ in \
-	    test-report) test_options="-k";; \
-	    perf-report) test_options="-k -m=perf";; \
-	    full-report) test_options="-k -m=perf -m=slow";; \
-	    esac ; \
-	    $(XVFB_START) && { \
-	      set -e; \
-	      if test -z "$$GTESTER_LOGDIR" ; then \
-	        ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-	      elif test -n "${TEST_PROGS}" ; then \
-	        ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-	      fi ; \
-	    }; \
-	  }; \
-	  $$ignore_logdir || { \
-	    echo '<?xml version="1.0"?>' > $@.xml ; \
-	    echo '<report-collection>'  >> $@.xml ; \
-	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	    done ; \
-	    echo >> $@.xml ; \
-	    echo '</report-collection>' >> $@.xml ; \
-	    rm -rf "$$GTESTER_LOGDIR"/ ; \
-	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
-check-local: test
--- a/2163
+++ b/2163
--- a/258
+++ b/258
@@ -0,0 +1,258 @@
+General Information
+===================
+
+This is GTK+ version 2.10.2. GTK+ is a multi-platform toolkit for
+creating graphical user interfaces. Offering a complete set of widgets,
+GTK+ is suitable for projects ranging from small one-off projects to
+complete application suites.
+
+GTK+ is free software and part of the GNU Project. However, the
+licensing terms for GTK+, the GNU LGPL, allow it to be used by all
+developers, including those developing proprietary software, without any
+license fees or royalties.
+
+The official ftp site is:
+  ftp://ftp.gtk.org/pub/gtk
+
+The official web site is:
+  http://www.gtk.org/
+
+Information about mailing lists can be found at
+  http://www.gtk.org/mailinglists.html
+
+
+Installation
+============
+
+See the file 'INSTALL'
+
+
+Release notes for 2.10
+======================
+
+* The hexadecimal Unicode input feature has been reworked. It no longer
+  blocks the use of the sixteen Ctrl-Shift-<hex digit> key sequences. Now
+  it only uses Ctrl-Shift-u.
+
+* A memory leak in GtkStyle handling has been fixed. This may expose bugs
+  in third-party widgets which forget to call gtk_style_attach() in their
+  realize functions.
+
+* Range widgets like GtkScrollbar now render their arrows insensitive
+  when the slider is at the end. Applications which react to arrow
+  clicks even if the slider is at the end may want to use the new
+  gtk_range_set_[upper/lower]_stepper_sensitivity() functions to
+  prevent the arrows from being rendered insensitive.
+
+* GtkObject now uses the "floating reference" support in GObject. 
+  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
+  of the GTK_FLOATING flag will no longer detect the floating 
+  reference. Details about floating references can be found in the docs:
+  http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#floating-ref
+
+* Accelerators like (_F) are now stripped from labels when they are 
+  displayed in toolbars. If this is not wanted, the feature can be 
+  suppressed by inserting a Unicode control character, e.g ZWNJ.
+
+* The pixbuf theme engine can now customize expanders (in GtkTreeView
+  and GtkExpander) and resize grips, using the new EXPANDER and
+  RESIZE_GRIP function values.
+
+* Dialogs created by gtk_about_dialog_new() no longer hide automatically
+  when the user clicks close. It is the applications responsibility to
+  hide or destroy the dialog.
+
+* Several new signals have been added to GtkNotebook. Care has been taken
+  to choose signal names which do not collide with signals added by well-known
+  derived classes. The names which can no longer be used for signals in 
+  objects derived from GtkNotebook are page-reordered, page-removed and
+  page-added.
+
+* Due to the interface changes in the file chooser backend interface, 
+  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
+  backends have to be ported to the new interface, other modules, such as 
+  theme engines, input method modules or pixbuf loaders have to be rebuilt 
+  so that they are installed in the right place for GTK+ to find them.
+
+
+Release notes for 2.8
+=====================
+
+* GTK+ 2.8 and Pango 1.10 require the cairo library.
+
+* The default theme has been renamed to "Raleigh". Existing configurations
+  specifying the "Default" theme name should still work.
+
+* The GtkTreeView::enable-search property has been changed to control
+  only typeahead search, not the C-f keybinding to start an interactive
+  search. To turn off interactive searching completely, you have to
+  set GtkTreeView::search-column to -1.
+
+* The restriction on using the same cell renderer in multiple columns
+  of a GtkTreeView is now more strictly enforced.
+
+* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
+  the first day of the week. Thus, it is possible to select the first day
+  of the week independently from the language, by setting LC_TIME.
+
+* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
+  in the icon caches, which will make the icon cache files larger than
+  the one produced by GTK+ 2.6. This change will reduce the memory
+  overhead of icon themes at runtime, since all GTK+ applications can
+  share the image data in memory.
+
+* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
+  grab is broken. On X11, this can happen if the same application grabs
+  again, or if the window used for the grab becomes unviewable. It happens
+  more often on Win32. Applications which use grabs should pay attention
+  to these events and do the necessary cleanups when the grab is lost.
+* The GIOChannel code for sockets on win32 has been rewritten.
+  Applications who make non-trivial use of GIOChannels on win32 should
+  be watched for possible problems.
+
+* GLib 2.8 uses atomic operations to implement reference counting, thus
+  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
+  can be used without locking in multithreaded applications. Note that
+  other modifications, like concurrent setting of properties still require
+  locking.
+
+* g_convert() and related character set conversion functions have been
+  fixed to emit pending shift states and to not cache iconv descriptors
+  across multiple calls, since that is problematic for some encodings.
+  Note that these functions are not suitable for streaming conversions;
+  use g_iconv() to do streaming conversion.
+
+
+Release notes for 2.6
+=====================
+
+* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
+  a clipboard manager following the specification at
+  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
+  must be running. A sample implementation of such a clipboard manager
+  is available at 
+  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
+  Applications can use the function gdk_display_supports_clipboard_persistence() 
+  to find out if clipboard persistence is available.
+
+* Notification on clipboard ownership changes via GdkOwnerChange events 
+  requires the XFIXES X extension. Applications can use the function
+  gdk_display_supports_selection_notification() to find out if ownerchip
+  change notification is available.
+
+* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
+  specification. Setting the XDG_DATA_DIRS environtment variable may be 
+  necessary if your icons aren't installed in the default location 
+  /usr/share/icons.
+
+* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
+  to avoid a lot of disk searching overhead. GTK+ includes a utility named
+  gtk-update-icon-cache to generate these cache files. For further details,
+  see the gtk-update-icon-cache man page or the GTK+ documentation.
+
+* To reduce code size and improve efficiency, GTK+, when compiled 
+  with the GNU toolchain, has separate internal and external entry 
+  points for exported functions. The internal names, which begin with 
+  IA__, may be seen when debugging a GTK+ program.
+
+* The following functions have been deprecated in GTK+ 2.6:
+  gdk_pango_context_set_colormap
+  gtk_cell_renderer_editing_canceled
+
+* The new GtkFileChooser widget emphasizes simplicity and thus does 
+  not provide a navigation entry by default when opening files. 
+  Experienced command line users will likely want to make heavy use of
+  the location dialog brought up by the Control-L key shortcut.
+
+* The GTK+ libraries use an '_' prefix to indicate private symbols that
+  must not be used by applications. On some platforms, symbols beginning 
+  with prefixes such as _gtk, _gdk, and _pango will be exported
+  from the library, on others not. In no case can applications
+  use these private symbols. In addition to that, GTK+ 2.6 makes several
+  symbols private which were not in any installed header files and
+  were never intended to be exported.
+
+* The gdk_pixbuf_xlib library included in the contrib/ directory 
+  and the framebuffer GDK backend included in the gdk/linux-fb directory
+  of GTK+ are provided on an as-is basis and have not been tested at all. 
+  No guarantees about the degree of workingness or about future
+  compatibility are provided.
+
+* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
+  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
+  the GTK+ developers consider that having filenames whose interpretation
+  depends on the current locale is fundamentally a bad idea.
+
+  If you have filenames encoded in the encoding of your locale, then you 
+  may want to set the G_FILENAME_ENCODING environment variable:
+  
+   G_FILENAME_ENCODING=@locale
+   export G_FILENAME_ENCODING
+
+  (Earlier versions of GLib 2.x required a different environment variable
+  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
+  is still supported, but G_FILENAME_ENCODING is preferred.)
+  Best integration of GTK+ 2.6 with the environment is achieved by 
+  using a UTF-8 locale.
+
+  On Windows, filenames passed to GTK+ should always be in UTF-8, as
+  in GLib 2.6. This is different than in previous versions of GTK+
+  where the system codepage was used. As in GLib, for DLL ABI
+  stability, applications built against previous versions of GTK+ will
+  use entry points providing the old semantics.
+
+  When compiling against GTK+ 2.6, applications intended to be
+  portable to Windows must take the UTF-8 file name encoding into
+  consideration, and use the gstdio wrappers to access files whose 
+  names have been constructed from strings returned from GTK+ or GLib.
+
+
+How to report bugs
+==================
+
+Bugs should be reported to the GNOME bug tracking system.
+(http://bugzilla.gnome.org, product gtk+.) You will need to create an
+account for yourself.
+  
+In the bug report please include:
+  
+* Information about your system. For instance:
+
+   - What operating system and version
+   - What version of X
+   - For Linux, what version of the C library
+
+  And anything else you think is relevant.
+
+* How to reproduce the bug. 
+
+  If you can reproduce it with one of the tests or demos built with GTK+, 
+  such as demos/gtk-demo/gtk-demo, that would be most convenient. Otherwise, 
+  please include a short test program that exhibits the behavior. As a 
+  last resort, you can also provide a pointer to a larger piece of software 
+  that can be downloaded.
+
+* If the bug was a crash, the exact text that was printed out when the
+  crash occured.
+
+* Further information such as stack traces may be useful, but is not
+  necessary. If you do send a stack trace, and the error is an X error,
+  it will be more useful if the stacktrace is produced running the test
+  program with the --sync command line option.
+
+
+Patches
+=======
+
+Patches should also be submitted to bugzilla.gnome.org. If the patch
+fixes an existing bug, add the patch as an attachment to that bug
+report.
+
+Otherwise, enter a new bug report that describes the patch, and attach
+the patch to that bug report.
+
+Bug reports containing patches should include the PATCH keyword in their
+keyword fields. If the patch adds to or changes the GTK+ programming
+interface, the API keyword should also be included.
+  
+Patches should be in unified diff form. (The -u option to GNU diff.)
--- a/README.commits
+++ b/README.commits
@@ -1,72 +0,0 @@
-GTK+ is part of the GNOME git repository. At the current time, any
-person with write access to the GNOME repository, can make changes to
-GTK+. This is a good thing, in that it encourages many people to work
-on GTK+, and progress can be made quickly. However, GTK+ is a fairly
-large and complicated package that many other things depend on, so to
-avoid unnecessary breakage, and to take advantage of the knowledge
-about GTK+ that has been built up over the years, we'd like to ask
-people committing to GTK+ to follow a few rules:
-
-0) Ask first. If your changes are major, or could possibly break existing
-   code, you should always ask. If your change is minor and you've
-   been working on GTK+ for a while it probably isn't necessary
-   to ask. But when in doubt, ask. Even if your change is correct,
-   somebody may know a better way to do things.
-
-   If you are making changes to GTK+, you should be subscribed
-   to gtk-devel-list@gnome.org. (Subscription address:
-   gtk-devel-list-request@gnome.org.) This is a good place to ask
-   about intended changes.
-
-   #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
-   is also a good place to find GTK+ developers to discuss changes with,
-   however, email to gtk-devel-list is the most certain and preferred
-   method.
-
-1) Ask _first_.
-
-2) With git, we no longer maintain a ChangeLog file, but you are expected
-   to produce a meaningful commit message. Changes without a sufficient
-   commit message will be reverted. See below for the expected format
-   of commit messages.
-
-Notes:
-
-* When developing larger features or complicated bug fixes, it is
-  advisable to work in a branch in your own cloned GTK+ repository.
-  You may even consider making your repository publically available
-  so that others can easily test and review your changes.
-
-* The expected format for git commit messages is as follows:
-
-=== begin example commit ===
-Short explanation of the commit
-
-Longer explanation explaining exactly what's changed, whether any
-external or private interfaces changed, what bugs were fixed (with bug
-tracker reference if applicable) and so forth. Be concise but not too brief.
-=== end example commit ===
-
-  - Always add a brief description of the commit to the _first_ line of
-    the commit and terminate by two newlines (it will work without the
-    second newline, but that is not nice for the interfaces).
-
-  - First line (the brief description) must only be one sentence and
-    should start with a capital letter unless it starts with a lowercase
-    symbol or identifier. Don't use a trailing period either. Don't exceed
-    72 characters.
-
-  - The main description (the body) is normal prose and should use normal
-    punctuation and capital letters where appropriate. Normally, for patches
-    sent to a mailing list it's copied from there.
-
-  - When committing code on behalf of others use the --author option, e.g.
-    git commit -a --author "Joe Coder <joe@coder.org>" and --signoff.
-
-
-Owen Taylor
-13 Aug 1998
-17 Apr 2001
-
-Matthias Clasen
-31 Mar 2009
--- a/README.cvs-commits
+++ b/README.cvs-commits
@@ -0,0 +1,54 @@
+GTK+ is part of the GNOME CVS repository. At the current time, any
+person with write access to the GNOME repository, can make changes to
+GTK+. This is a good thing, in that it encourages many people to work
+on GTK+, and progress can be made quickly. However, GTK+ is a fairly
+large and complicated package that many other things depend on, so to
+avoid unnecessary breakage, and to take advantage of the knowledge
+about GTK+ that has been built up over the last 4 years, we'd like
+to ask people commiting to GTK+ to follow a few rules:
+
+0) Ask first. If your changes are major, or could possibly break existing
+   code, you should always ask. If your change is minor and you've
+   been working on GTK+ for a while it probably isn't necessary
+   to ask. But when in doubt, ask. Even if your change is correct,
+   somebody may know a better way to do things.
+
+   If you are making changes to GTK+, you should be subscribed
+   to gtk-devel-list@gnome.org. (Subscription address:  
+   gtk-devel-list-request@gnome.org.) This is a good place to ask
+   about intended changes. 
+
+   #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
+   is also a good place to find GTK+ developers to discuss changes with,
+   however, email to gtk-devel-list is the most certain and preferred
+   method.
+
+1) Ask _first_.
+
+2) There must be a ChangeLog for every commit. (If you discover that
+   you only committed half the files you meant to and need to fix that
+   up, or something, you don't need a new ChangeLog entry. But in general,
+   ChangeLog entries are mandatory.) Changes without ChangeLog entries
+   will be reverted.
+
+3) There _must_ be a ChangeLog for every commit.
+
+Notes:
+
+* If you are going to be changing many files in an experimental fashion,
+  it probably is a good idea to create a separate branch for your changes.
+
+* The ChangeLog entries should preferably match in date format
+  with the existing entries. You can set how emacs does this
+  by using customize mode:
+
+  - M-x customize
+  - set Programming/Tools/ChangeLog/Add Log Time Format to
+    'Old Format'
+
+ Or, set the add-log-time-format to 'current-time-string in
+ your .emacs file.
+
+Owen Taylor
+13 Aug 1998
+17 Apr 2001
--- a/README.in
+++ b/README.in
@@ -27,182 +27,6 @@ Installation
 See the file 'INSTALL'


-Release notes for 2.18
-======================
-
-* gtk_tooltip_set_custom now accept a NULL custom_widget to unset the
-  old custom_widget. Custom_widget does not get destroyed when the
-  tooltip goes away.
-
-
-Release notes for 2.16
-======================
-
-* Password entries now display a caps-lock warning. This can be turned off
-  with the caps-lock-warning property.
-
-* Various orientation-related functions have been deprecated in favour
-  of the new GtkOrientable interface: gtk_scale_button_get_orientation,
-  gtk_scale_button_set_orientation, gtk_toolbar_set_orientation.
-
-* The action-proxy interaction has been changed. Widgets that operate as
-  proxies have to implement the GtkActivatable interface now. GtkActivatable
-  implementation are responsible for syncing their appearance with the
-  action and for activating the action. All GTK+ widgets that are commonly
-  used as proxies implement the GtkActivatable interface.
-
-* The handling of keyboard shortcuts has been changed, to help with a
-  longstanding complaint about the way GTK+ handles multiple layouts. GTK+
-  now only uses keys from groups other than the current group if they are
-  not present in the current group.
-
-Release notes for 2.14
-======================
-
-* gtkitemfactory.h is now completely deprecated.
-  As gtkactiongroup.h and gtkstock.h no longer include the gtkitemfactory.h
-  header, this might break application using gtk_item_factory_* symbols
-  without including gtkitemfactory.h - even though this behaviour has never
-  been supported in the first place.
-
-* The GtkFileSystem semi-private interface has been removed.
-  The GTK+ filechooser implementation now uses GIO directly, which has
-  rendered external filesystem implementations unnecessary. Consequently,
-  the GtkFileSystem interface is no longer available, nor the filechooser
-  will load any GtkFileSystem implementation.
-
-* GtkComboBox now renders the popdown button insensitive when
-  the model is empty. Applications which want to populate the list
-  only before displaying it can set gtk_combo_box_set_button_sensitivity
-  to GTK_SENSITIVITY_ON, so that the button is always sensitive or
-  GTK_SENSITIVITY_OFF to make it insensitive respectively.
-
-* In the early 2.14.x releases, GtkAdjustment was changed to enforce
-  that values are restricted to the range [lower, upper - page_size].
-  This has always been the documented behaviour, and the recommended
-  practice is to set page_size to 0 when using adjustments for simple
-  scalar values, like in a slider or spin button.
-  Due to the large number of applications that are affected by this
-  change, the behaviour has been reverted to the old behaviour in
-  2.14.3, with an explicit warning that this change will be
-  reintroduced in 2.90.
-
-* gdk-pixbuf will use GIO for mime type detection if possible. For
-  this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS
-  set accordingly at configure time. Otherwise, gdk-pixbuf falls
-  back to its built-in sniffing implementation.
-
-Release notes for 2.12
-======================
-
-* gtk_about_dialog_get/set_name() were deprecated in favour of
-  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
-  "program-name" property instead of the conflicting "name" property.
-
-* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
-
-* Support for Windows 9x/ME has officially been removed. It hasn't worked
-  since 2.6 anyway.
-
-* The GtkTextBufferTargetInfo enumeration values have been changed from
-  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
-  ANSI C limits.
-
-* A change in the handling of _NET_WM_USER_TIME properties on toplevel
-  windows can cause deadlock problems with window managers that are using
-  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
-  by this. The problem has been fixed in metacity 2.18.1.
-
-* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
-  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
-  and gtk_text_layout_cursors_changed(), which should be used in place of
-  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
-  is due to marks moved or changed selection; new GtkTextLineDisplay structure
-  member. Source compatibility is preserved; binary compatibility may break
-  only if GtkTextLineDisplay structure was created on stack or as a part
-  of another structure (in particular GnomeCanvas and its clones do not need
-  recompiling).
-
-* Another new signal has been added to GtkNotebook. The new signal
-  is called create-window, so this name can no longer be used for signals
-  in objects derived from GtkNotebook.
-
-* The gtk_notebook_set/get_group_id() functions were found to be insufficient
-  and have been deprecated in favour of gtk_notebook_set/get_group().
-
-* The move-focus signal has been moved to GtkWidget, to unify the 
-  various implementations of this signal in specific widgets. Great care 
-  has been taken to make sure that all code using this signal continues
-  to work.
-
-* An unused and hardly visible GtkFrame has been removed from the menu 
-  widget hierarchy when GtkComboBox::appears-as-list style property is 
-  set. Any RC file applying a different style to any widget below the 
-  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
-  account that the frame no longer exists.
-
-* The external print preview application used by GtkPrintOperationPreview 
-  is now passed the print settings on the command line with the 
-  --print-settings parameter pointing to a temp file containing the 
-  settings. The preview application assumes ownership of the file and 
-  should delete it once it does not need it anymore. The --print-settings 
-  commandline option is understood by Evince 0.9.0 and newer. To use a 
-  different print preview application, change the gtk-print-preview-command 
-  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
-
-* GtkMenuShell is now defined as an abstract type. It was already 
-  documented as an abstract class, and there is little reason to 
-  instantiate it.
-
-* The GtkTooltips struct (this is the old tooltips API) is now considered
-  private. Code that used to access this struct, in particular the
-  tips_data_list field, will need to change. All of the old tooltips
-  API has been deprecated in favour of a new implementation and
-  API. This affects all of the gtk_tooltips_ functions, and functions 
-  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
-  and gtk_menu_tool_button_set_arrow_tooltip().
-  
-* The memory management of the GtkRecentManager object has been changed,
-  as using the screen didn't guarantee that the singleton instance was
-  correctly destroyed. The screen-related functions have been deprecated,
-  and should not be used anymore; the GtkRecentManager instance returned by
-  the gtk_recent_manager_get_default() function is guaranteed to be valid
-  for the entire lifetime of an application.
-
-* A number of interfaces that have been superseded by newer interfaces for 
-  a long time have finally been deprecated. This includes 
-  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
-
-* The various coordinate systems in use in GtkTreeView widgets have
-  been clarified in the documentation, and in the cause of doing so, 
-  the functions gtk_tree_view_widget_to_tree_coords() and
-  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
-  favour of a new family of gtk_tree_view_convert_ functions.
-
-* gtk_menu_item_remove_submenu() has been deprecated in favour of
-  gtk_menu_item_set_submenu (..., NULL).
-
-* gtk_default_draw_check() has been fixed to really decrease the
-  indicator size by one pixel to ensure an odd size instead of
-  accidentially increasing it.
-  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
-  not subtract 1 from the size passed to gtk_paint_option(), which
-  was just a workaround for above off-by-two for even sizes (theme
-  engines now get the real indicator size passed).
-  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
-  has been changed to 13 to be consistent with GtkCheckButton.
-  The only visible change with default settings is that the indicator in
-  GtkCellRendererToggle has changed its size from 11 to 13 and is now
-  consistent with menus and toggle buttons.
-
-* GTK+ has always required that gtk_init() (or a variant thereof) is
-  called before any other GTK+ function. Some applications call functions
-  like gtk_clipboard_get() to check if they need to call gtk_init(),
-  anyway. A change in GLib 2.14 has recently broken this unsupported
-  practise. It is worth pointing out that calling gtk_init() twice
-  does no harm.
-
-
 Release notes for 2.10
 ======================

--- a/README.win32
+++ b/README.win32
@@ -1,82 +1,45 @@
-The Win32 backend in GTK+ is not as stable or correct as the X11 one.
+The Win32 backend in GTK+ is not as stable or correct as the X11
+one. 

 For prebuilt runtime and developer packages see
-http://ftp.gnome.org/pub/gnome/binaries/win32/
+http://www.gimp.org/win32/downloads.html .
+
+There is also a gtk-1-3-win32-production branch of GTK+ that was
+branched off from before the addition of the no-flicker and other
+functionality that was new in GTK+ 2.0.0. The vesion number used for
+that branch is 1.3.0. It corresponds most closely to GTK 1.2.7 on
+Unix. For new code, you shouldn't be using that.

 Building GTK+ on Win32
 ======================

-First you obviously need developer packages for the compile-time
-dependencies: Pango, atk, glib, gettext-runtime, libiconv, libpng,
-zlib, libtiff at least. See
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
+There are two ways to build GTK+ for win32.

-After installing the dependencies, there are two ways to build GTK+
-for win32.
+1) Use the autoconf-generated configure script, and the resulting
+Makefiles (which use libtool and gcc to do the compilation). I use
+this myself, but it can be hard to setup correctly.

-1) GNU tools, ./configure && make install
-----------------------------------------
+Personally I run configure with:
+CC='gcc -mpentium -fnative-struct' CPPFLAGS='-I/target/include' CFLAGS=-O2 LDFLAGS='-L/target/lib' ./configure --disable-static --prefix=/target --with-gdktarget=win32 --with-wintab=/src/wtkit126 --with-ie55=/src/workshop/ie55_lib --host=i386-pc-mingw32

-This requires you have mingw and MSYS.
+Then, in theory, you can just say "make", like on Unix. In reality,
+there are a few hickups that require manual intervention, and it's
+best to run make separately in each subdirectory. At least for me,
+when libtool creates an .exe file, it puts the real .exe in the .libs
+directory, and leaves a wrapper .exe in the work directory. For some
+reason that wrapper doesn't work for me, it doesn't do anything. So, I
+always do a "cp .libs/*.exe ." after running a make that has produced
+some exes.

-Use the configure script, and the resulting Makefiles (which use
-libtool and gcc to do the compilation). I use this myself, but it can
-be hard to setup correctly.
+Another issue is with the gdk-pixbuf.loaders file. It's probably best
+to do a "make install" in the gdk-pixbuf directory, and let that set
+up a mostly correct gdk-pixbuf.loaders in the target directory. Then
+copy that back to the source directory. It's needed in gtk/stock-icons
+where make runs gdk-pixbuf-csource.

-The full script I run to build GTK+ 2.10 unpacked from a source
-distribution is as below. This is from bulding GTK+ 2.10.9, slightly
-edited to make it match this 2.11 development branch. Actually I don't
-use any script like this to build the development branch, as I don't
-distribute any binaries from development branches.
+Etc, you get the idea. It can be a bit of a pain.

-MOD=gtk+
-VER=2.10.9
-THIS=$MOD-$VER
-HEX=`echo $THIS | md5sum | cut -d' ' -f1`
-TARGET=c:/devel/target/$HEX
-DEPS="`/devel/src/tml/latest.sh glib atk cairo pango`"
-sed -e 's/need_relink=yes/need_relink=no # no way --tml/' <ltmain.sh >ltmain.temp && mv ltmain.temp ltmain.sh
-usedev
-usemsvs6
-MY_PKG_CONFIG_PATH=""
-for D in $DEPS; do
-    PATH=/devel/dist/$D/bin:$PATH
-    MY_PKG_CONFIG_PATH=/devel/dist/$D/lib/pkgconfig:$MY_PKG_CONFIG_PATH
-done
-PKG_CONFIG_PATH=$MY_PKG_CONFIG_PATH:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3 -mthreads' CPPFLAGS='-I/opt/gnu/include -I/opt/gnuwin32/include -I/opt/misc/include' LDFLAGS='-L/opt/gnu/lib -L/opt/gnuwin32/lib -L/opt/misc/lib -Wl,--enable-auto-image-base' LIBS=-lintl CFLAGS=-O2 ./configure --with-gdktarget=win32 --enable-debug=yes --disable-gtk-doc --disable-static --prefix=$TARGET &&
-libtoolcacheize &&
-unset MY_PKG_CONFIG_PATH &&
-PATH=/devel/target/$HEX/bin:.libs:$PATH make install &&
-(cd $TARGET/bin; strip --strip-unneeded *.dll *.exe) &&
-(cd $TARGET/lib/gtk-2.0/2.10.0/loaders; strip --strip-unneeded *.dll) &&
-(cd $TARGET/lib/gtk-2.0/2.10.0/immodules; strip --strip-unneeded *.dll) &&
-(cd $TARGET/lib/gtk-2.0/2.10.0/engines; strip --strip-unneeded *.dll) &&
-PATH=$TARGET/bin:$PATH gdk-pixbuf-query-loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
-grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp &&
-mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
-grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/etc/gtk-2.0/gtk.immodules >$TARGET/etc/gtk-2.0/gtk.immodules.temp &&
-mv $TARGET/etc/gtk-2.0/gtk.immodules.temp $TARGET/etc/gtk-2.0/gtk.immodules &&
-./gtk-zip.sh &&
-(cd /devel/src/tml && zip /tmp/$MOD-dev-$VER.zip make/$THIS.make) &&
-manifestify /tmp/$MOD*-$VER.zip
-
-You should not just copy the above blindly. There are some things in
-the script that are very specific to *my* build setup on *my* current
-machine. For instance the "latest.sh" script, the "usedev" and
-"usemsvs6" shell functions, the /devel/dist folder. The above script
-is really just meant for reference, to give an idea. You really need
-to understand what things like PKG_CONFIG_PATH are and set them up
-properly after installing the dependencies before building GTK+.
-
-As you see above, after running configure, one can just say "make
-install", like on Unix. A post-build fix is needed, running
-gdk-pixbuf-query-loaders once more to get a correct gdk-pixbuf.loaders
-file.
-
-2) Microsoft's tools
--------------------
-
-Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
+2) Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
 makefile.msc in gdk and gtk. Be prepared to manually edit various
 makefile.msc files, and the makefile snippets in build/win32.

@@ -84,10 +47,10 @@ Alternative 1 also generates Microsoft import libraries (.lib), if you
 have lib.exe available. It might also work for cross-compilation from
 Unix.

-I use method 1 myself. Hans Breuer has been taking care of the MSVC
-makefiles. At times, we disagree a bit about various issues, and for
-instance the makefile.msc files might not produce identically named
-DLLs and import libraries as the "autoconfiscated" makefiles and
+Note that I use method 1 myself. Hans Breuer has been taking care of
+the MSVC makefiles. At times, we disagree a bit about various issues,
+and for instance the makefile.msc files will not produce identically
+named DLLs and import libraries as the "autoconfiscated" makefiles and
 libtool do. If this bothers you, you will have to fix the makefiles.

 Using GTK+ on Win32
@@ -109,9 +72,22 @@ all. Possible ways to fix this are being investigated.
 Wintab
 ======

-The tablet support uses the Wintab API. The Wintab development kit is
-no longer required. The wintab.h header file is bundled with GTK+
-sources. Unfortunately it seems that only Wacom tablets come with
-support for the Wintab API nowadays.
+The tablet support uses the Wintab API. The Wintab development kit can
+be downloaded from http://www.pointing.com. Pass the --with-wintab
+flag to configure if you use that. If you use nmake and you don't care
+for Wintab, undefine HAVE_WINTAB in config.h.win32 and remove
+references to the wntab32x library from the makefile before building.

--Tor Lillqvist <tml@iki.fi>, <tml@novell.com>
+ActiveIMM
+=========
+
+If you want to build a GTK+ that supports ActiveIMM (the Input Method
+Manager for non-EastAsia locales that can be used on Win9x/NT4), you
+need the dimm.h header file. That is somewhat difficult to find, but
+http://msdn.microsoft.com/downloads/samples/internet/wizard/ seems to
+be a good place to look nowadays. If you use "autoconfiscated" build,
+pass the --with-ie55 flag to configure specifying the location of the
+ie55_lib directory created by downloading the IE5.5 headers and libs
+from the above URL.
+
+--Tor Lillqvist <tml@iki.fi>
--- a/acconfig.h
+++ b/acconfig.h
@@ -0,0 +1,80 @@
+/* acconfig.h
+   This file is in the public domain.
+
+   Descriptive text for the C preprocessor macros that
+   the distributed Autoconf macros can define.
+   No software package will use all of them; autoheader copies the ones
+   your configure.in uses into your configuration header file templates.
+
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  Although this order
+   can split up related entries, it makes it easier to check whether
+   a given entry is in the file.
+
+   Leave the following blank line there!!  Autoheader needs it.  */
+
+
+/* Other stuff */
+#undef ENABLE_NLS
+#undef GTK_COMPILED_WITH_DEBUGGING
+
+#undef HAVE_CATGETS
+#undef HAVE_DIMM_H
+#undef HAVE_GETTEXT
+#undef HAVE_IPC_H
+#undef HAVE_LC_MESSAGES
+#undef HAVE_PROGRESSIVE_JPEG
+#undef HAVE_PWD_H
+#undef HAVE_SHM_H
+#undef HAVE_STPCPY
+#undef HAVE_XSHM_H
+#undef HAVE_SHAPE_EXT
+#undef HAVE_SOLARIS_XINERAMA
+#undef HAVE_SYS_SELECT_H
+#undef HAVE_SYS_TIME_H
+#undef HAVE_XFREE_XINERAMA
+#undef HAVE_XINERAMA
+#undef HAVE_WINTAB
+#undef HAVE_XCONVERTCASE
+#undef HAVE_XFT
+
+#undef HAVE_SIGSETJMP
+
+#undef NO_FD_SET
+
+#undef RESOURCE_BASE
+
+#undef USE_GMODULE
+#undef USE_MMX
+
+/* Define to use XKB extension */
+#undef HAVE_XKB
+
+/* Define to use shadowfb in the linux-fb port */
+#undef ENABLE_SHADOW_FB
+
+/* Define to use a fb manager in the linux-fb port */
+#undef ENABLE_FB_MANAGER
+
+#undef XINPUT_NONE
+#undef XINPUT_GXI
+#undef XINPUT_XFREE
+
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
+
+/* Most machines will be happy with int or void.  IRIX requires '...' */
+#undef SIGNAL_ARG_TYPE
+
+#undef GETTEXT_PACKAGE
+
+#undef HAVE_CUPS_API_1_2
+
+/* #undef PACKAGE */
+/* #undef VERSION */
+
+
+/* Leave that blank line there!!  Autoheader needs it.
+   If you're adding to this file, keep in mind:
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  */
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,7 +16,7 @@ have_libtool=false
 if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
 	libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	case $libtool_version in
-	    1.4*|1.5*|2.2*)
+	    1.4*|1.5*)
 		have_libtool=true
 		;;
 	esac
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -1,18 +1,95 @@
 /* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
-/* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
+/* acconfig.h
+   This file is in the public domain.
+
+   Descriptive text for the C preprocessor macros that
+   the distributed Autoconf macros can define.
+   No software package will use all of them; autoheader copies the ones
+   your configure.in uses into your configuration header file templates.
+
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  Although this order
+   can split up related entries, it makes it easier to check whether
+   a given entry is in the file.
+
+   Leave the following blank line there!!  Autoheader needs it.  */
+
+
+/* Other stuff */
+#define ENABLE_NLS 1
+#define GTK_COMPILED_WITH_DEBUGGING "yes"
+
+/* #undef HAVE_CATGETS */
+/* #undef HAVE_DIMM_H */
+#define HAVE_GETTEXT 1
+/* #undef HAVE_IPC_H */
+/* #undef HAVE_LC_MESSAGES */
+#define HAVE_PROGRESSIVE_JPEG 1
+/* #undef HAVE_PWD_H */
+/* #undef HAVE_SHM_H */
+/* #undef HAVE_STPCPY */
+/* #undef HAVE_XSHM_H */
+/* #undef HAVE_SHAPE_EXT */
+/* #undef HAVE_SOLARIS_XINERAMA */
+/* #undef HAVE_SYS_SELECT_H */
+#ifndef _MSC_VER
+#define HAVE_SYS_TIME_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_SYS_TIME_H */
+#endif /* _MSC_VER */
+/* #undef HAVE_XFREE_XINERAMA */
+/* #undef HAVE_XINERAMA */
+#define HAVE_WINTAB 1
+/* #undef HAVE_XCONVERTCASE */
+/* #undef HAVE_XFT */
+
+/* #undef HAVE_SIGSETJMP */
+
+#define NO_FD_SET 1
+
+/* #undef RESOURCE_BASE */
+
+#ifndef _MSC_VER
+#define USE_GMODULE 1
+#define USE_MMX 1
+#endif
+
+/* Define to use XKB extension */
+/* #undef HAVE_XKB */
+
+/* Define to use shadowfb in the linux-fb port */
+/* #undef ENABLE_SHADOW_FB */
+
+/* Define to use a fb manager in the linux-fb port */
+/* #undef ENABLE_FB_MANAGER */
+
+/* #undef XINPUT_NONE */
+/* #undef XINPUT_GXI */
+/* #undef XINPUT_XFREE */
+
+/* Define as the return type of signal handlers (int or void).  */
+#define RETSIGTYPE void
+
+/* Most machines will be happy with int or void.  IRIX requires '...' */
+/* #undef SIGNAL_ARG_TYPE */
+
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+
+/* #undef PACKAGE */
+/* #undef VERSION */
+
+
+/* Leave that blank line there!!  Autoheader needs it.
+   If you're adding to this file, keep in mind:
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  */

 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1

-/* The prefix for our gettext translation domains. */
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-
-/* Define if debugging is enabled */
-#define GTK_COMPILED_WITH_DEBUGGING "yes"
-
 /* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "c:/devel/target/HEAD/share/locale"
+#define GTK_LOCALEDIR "UNUSED"

 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
@@ -20,12 +97,6 @@
 /* Is the wctype implementation broken */
 /* #undef HAVE_BROKEN_WCTYPE */

-/* Define to 1 if you have the <crt_externs.h> header file. */
-/* #undef HAVE_CRT_EXTERNS_H */
-
-/* Define to 1 if CUPS 1.2 API is available */
-/* #undef HAVE_CUPS_API_1_2 */
-
 /* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1

@@ -35,18 +106,12 @@
 /* Define to 1 if you have the `flockfile' function. */
 /* #undef HAVE_FLOCKFILE */

-/* Define to 1 if you have the <ftw.h> header file. */
-/* #undef HAVE_FTW_H */
-
-/* Define to 1 if you have the `getc_unlocked' function. */
-/* #undef HAVE_GETC_UNLOCKED */
-
 /* Define to 1 if you have the `getpagesize' function. */
 #ifndef _MSC_VER
 #define HAVE_GETPAGESIZE 1
-#else
+#else /* _MSC_VER */
 /* #undef HAVE_GETPAGESIZE */
-#endif
+#endif /* _MSC_VER */

 /* Define to 1 if you have the `getresuid' function. */
 /* #undef HAVE_GETRESUID */
@@ -54,24 +119,12 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1

-/* Have GNU ftw */
-/* #undef HAVE_GNU_FTW */
-
-/* Define to 1 if you have the `httpGetAuthString' function. */
-/* #undef HAVE_HTTPGETAUTHSTRING */
-
-/* Define if cups http_t authstring field is accessible */
-/* #undef HAVE_HTTP_AUTHSTRING */
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_INTTYPES_H 1
-#else
+#else /* _MSC_VER */
 /* #undef HAVE_INTTYPES_H */
-#endif
-
-/* Define to 1 if ipc.h is available */
-/* #undef HAVE_IPC_H */
+#endif /* _MSC_VER */

 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
@@ -79,9 +132,6 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1

-/* Define to 1 if you have the `localtime_r' function. */
-/* #undef HAVE_LOCALTIME_R */
-
 /* Define to 1 if you have the `lstat' function. */
 /* #undef HAVE_LSTAT */

@@ -97,64 +147,37 @@
 /* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */

-/* Define to 1 is libjpeg supports progressive JPEG */
-/* #undef HAVE_PROGRESSIVE_JPEG */
-
 /* Define to 1 if you have the <pwd.h> header file. */
 /* #undef HAVE_PWD_H */

 /* Have the Xrandr extension library */
 /* #undef HAVE_RANDR */

-/* Define to 1 if the XShape extension is available */
-/* #undef HAVE_SHAPE_EXT */
-
-/* Define to 1 if shm.h is available */
-/* #undef HAVE_SHM_H */
-
-/* Define to 1 if sigsetjmp is available */
-/* #undef HAVE_SIGSETJMP */
-
-/* Have the sockaddr_un.sun_len member */
-/* #undef HAVE_SOCKADDR_UN_SUN_LEN */
-
-/* Define to 1 if solaris xinerama is available */
-/* #undef HAVE_SOLARIS_XINERAMA */
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_STDINT_H 1
-#else
+#else /* _MSC_VER */
 /* #undef HAVE_STDINT_H */
-#endif
+#endif /* _MSC_VER */

 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1

 /* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
+/* #undef HAVE_STRINGS_H */

 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1

-/* Define to 1 if sys/select.h is available */
-/* #undef HAVE_SYS_SELECT_H */
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1

-/* Define to 1 if sys/sysinfo.h is available */
-/* #undef HAVE_SYS_SYSINFO_H */
-
-/* Define to 1 if sys/systeminfo.h is available */
-/* #undef HAVE_SYS_SYSTEMINFO_H */
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_SYS_TIME_H 1
 #else /* _MSC_VER */
 /* #undef HAVE_SYS_TIME_H */
-#endif
+#endif /* _MSC_VER */

 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
@@ -165,9 +188,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_UNISTD_H 1
-#else
+#else /* _MSC_VER */
 /* #undef HAVE_UNISTD_H */
-#endif
+#endif /* _MSC_VER */

 /* Have uxtheme.h include file */
 #define HAVE_UXTHEME_H 1
@@ -181,60 +204,27 @@
 /* Define if we have X11R6 */
 /* #undef HAVE_X11R6 */

-/* Have the XCOMPOSITE X extension */
-/* #undef HAVE_XCOMPOSITE */
-
 /* Define to 1 if you have the `XConvertCase' function. */
 /* #undef HAVE_XCONVERTCASE */

 /* Have the Xcursor library */
 /* #undef HAVE_XCURSOR */

-/* Have the XDAMAGE X extension */
-/* #undef HAVE_XDAMAGE */
-
 /* Have the XFIXES X extension */
 /* #undef HAVE_XFIXES */

-/* Define to 1 if XFree Xinerama is available */
-/* #undef HAVE_XFREE_XINERAMA */
-
-/* Define to 1 is Xinerama is available */
-/* #undef HAVE_XINERAMA */
-
 /* Define to 1 if you have the `XInternAtoms' function. */
 /* #undef HAVE_XINTERNATOMS */

-/* Define to use XKB extension */
-/* #undef HAVE_XKB */
-
-/* Define to 1 if xshm.h is available */
-/* #undef HAVE_XSHM_H */
-
 /* Have the SYNC extension library */
 /* #undef HAVE_XSYNC */

-/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
-/* #undef HAVE__NL_MEASUREMENT_MEASUREMENT */
-
-/* Define if _NL_PAPER_HEIGHT is available */
-/* #undef HAVE__NL_PAPER_HEIGHT */
-
-/* Define if _NL_PAPER_WIDTH is available */
-/* #undef HAVE__NL_PAPER_WIDTH */
-
 /* Define if _NL_TIME_FIRST_WEEKDAY is available */
 /* #undef HAVE__NL_TIME_FIRST_WEEKDAY */

-/* Define to 1 if you have the `_NSGetEnviron' function. */
-/* #undef HAVE__NSGETENVIRON */
-
 /* Define if <X11/extensions/XIproto.h> needed for xReply */
 /* #undef NEED_XIPROTO_H_FOR_XREPLY */

-/* Define to 1 if fd_set is not available */
-#define NO_FD_SET 1
-
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"

@@ -242,7 +232,7 @@
 #define PACKAGE_NAME "gtk+"

 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gtk+ @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
+#define PACKAGE_STRING "gtk+ 2.9.0"

 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gtk+"
@@ -256,27 +246,9 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

-/* Define to 1 if gmodule works and should be used */
-#define USE_GMODULE 1
-
 /* Whether to load modules via .la files rather than directly */
 /* #undef USE_LA_MODULES */

-/* Define to 1 if medialib is available and should be used */
-/* #undef USE_MEDIALIB */
-
-/* Define to 1 if medialib 2.5 is available */
-/* #undef USE_MEDIALIB25 */
-
-/* Define to 1 if XXM is available and should be used */
-#define USE_MMX 1
-
-/* Define to 1 if no XInput should be used */
-/* #undef XINPUT_NONE */
-
-/* Define to 1 if XFree XInput should be used */
-/* #undef XINPUT_XFREE */
-
 /* Define to 1 if the X Window System is missing or not being used. */
 /* #undef X_DISPLAY_MISSING */

--- a/configure.in
+++ b/configure.in
--- a/contrib/.cvsignore
+++ b/contrib/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,8 +1,5 @@
-include $(top_srcdir)/Makefile.decl

 SUBDIRS =
 if USE_X11
 SUBDIRS += gdk-pixbuf-xlib
 endif
-
-include $(top_srcdir)/git.mk
--- a/contrib/gdk-pixbuf-xlib/.cvsignore
+++ b/contrib/gdk-pixbuf-xlib/.cvsignore
@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+.libs
+.deps
+gdk-pixbuf-xlib-2.0.pc
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,127 +1,3 @@
-=== ChangeLog discontinued ===
-
-	With the move to git, GTK+ is switching from a ChangeLog file
-	to relying on commit messages to provide change history. Please
-	see README.commits for guidance on the expected message format.
-
-2009-03-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.16.0 ===
-
-2009-03-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.5 ===
-
-2009-02-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.4 ===
-
-2009-02-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.3 ===
-
-2009-01-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.2 ===
-
-2009-01-23  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.1 ===
-
-2009-01-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.0 ===
-
-2008-09-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.14.2 ===
-
-2008-09-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.14.1 ===
-
-2008-09-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.14.0 ===
-
-2008-08-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* ==== Released 2.13.7 ===
-
-2008-08-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.6 ===
-
-2008-07-21  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.5 ===
-
-2008-07-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.4 ===
-
-2008-06-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.3 ===
-
-2008-06-03  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.2 ===
-
-2008-05-29  Matthias Clasen <mclasen@redhat.com>
-
-	* === Released 2.13.1 ===
-
-2008-05-26  Michael Natterer  <mitch@imendio.com>
-
-	* gdk-pixbuf-xlib.h
-	* gdk-pixbuf-xlibrgb.h: use G_BEGIN/END_DECLS.
-
-2008-02-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.0 ===
-
-2007-10-16  Matthias Clasen <mclasen@redhat.com>
-
-	* === Released 2.12.1 ===
-
-2007-09-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.12.0 ===
-
-2007-07-21  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.6 ===
-
-2007-07-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.5 ===
-
-2007-06-19  Matthias Clasen <mclasen@redhat.com>
-
-	* === Released 2.11.4 ===
-
-2007-06-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.3 ===
-
-2007-06-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.2 ===
-
-2007-06-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.1 ===
-
-2007-05-24   Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.0 ===
-
-2006-10-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf-xlib.c: Apply a cleanup patch by
-	Kjartan	Maraas  (#341812)
-
 2006-08-17  Matthias Clasen  <mclasen@redhat.com>

 	* === Released 2.10.2 ===
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/Makefile.decl
-
 if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
@@ -10,6 +8,7 @@ INCLUDES = \
 	-I$(top_srcdir) -I$(top_builddir) 	\
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_srcdir)/contrib 		\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)

 libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
@@ -37,6 +36,4 @@ libgdk_pixbuf_xlibinclude_HEADERS =         		\
 pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc

-EXTRA_DIST += gdk-pixbuf-xlib-2.0.pc.in
-
-include $(top_srcdir)/git.mk
+EXTRA_DIST = gdk-pixbuf-xlib-2.0.pc.in
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
@@ -26,7 +26,7 @@
 /* Ported to Xlib by John Harper <john@dcs.warwick.ac.uk> */


-#include "config.h"
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf-private.h>
@@ -152,6 +152,7 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int xx, yy;
 	int width, height;
 	int bpl;
+	guint8 *s;
 	register guint8 data;
 	guint8 *o;
 	guint8 *srow = image->data, *orow = pixels;
@@ -166,6 +167,7 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	bpl = image->bytes_per_line;

 	for (yy = 0; yy < height; yy++) {
+		s = srow;
 		o = orow;

 		for (xx = 0; xx < width; xx ++) {
@@ -189,6 +191,7 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int xx, yy;
 	int width, height;
 	int bpl;
+	guint8 *s;
 	register guint8 data;
 	guint8 *o;
 	guint8 *srow = image->data, *orow = pixels;
@@ -218,6 +221,7 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	}

 	for (yy = 0; yy < height; yy++) {
+		s = srow;
 		o = orow;

 		for (xx = 0; xx < width; xx ++) {
@@ -984,6 +988,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 	int width, height;
 	int bpl;
 	guint8 *srow = image->data, *orow = pixels;
+	guint8 *s;
 	guint8 *o;
 	guint32 pixel;
 	Visual *v;
@@ -1006,6 +1011,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 		 red_prec, green_prec, blue_prec));

 	for (yy = 0; yy < height; yy++) {
+		s = srow;
 		o = orow;
 		for (xx = 0; xx < width; xx++) {
 			pixel = XGetPixel (image, xx, yy);
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
@@ -22,7 +22,7 @@

 /* Trivially ported to Xlib(RGB) by John Harper. */

-#include "config.h"
+#include <config.h>
 #include "gdk-pixbuf-private.h"
 #include "gdk-pixbuf-xlib-private.h"

--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
@@ -18,7 +18,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#include "config.h"
+#include <config.h>
 #include <X11/Xlib.h>
 #include <gdk-pixbuf/gdk-pixbuf-private.h>
 #include "gdk-pixbuf-xlib-private.h"
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -21,11 +21,12 @@
 #ifndef GDK_PIXBUF_XLIB_H
 #define GDK_PIXBUF_XLIB_H

+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
-
-G_BEGIN_DECLS
-
 #include <X11/Xlib.h>


@@ -82,6 +83,9 @@ GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
 					      int dest_x, int dest_y,
 					      int width, int height);

-G_END_DECLS
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+

 #endif /* GDK_PIXBUF_XLIB_H */
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
@@ -51,13 +51,15 @@
 #ifndef __XLIB_RGB_H__
 #define __XLIB_RGB_H__

-#include <glib.h>
-
-G_BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */

 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

+#include <glib.h>
+
 typedef struct _XlibRgbCmap XlibRgbCmap;

 struct _XlibRgbCmap {
@@ -183,6 +185,9 @@ xlib_rgb_get_display (void);
 Screen *
 xlib_rgb_get_screen (void);

-G_END_DECLS
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+

 #endif /* __XLIB_RGB_H__ */
--- a/demos/.cvsignore
+++ b/demos/.cvsignore
@@ -0,0 +1,11 @@
+Makefile
+Makefile.in
+.libs
+.deps
+testanimation
+test-inline-pixbufs.h
+testpixbuf-drawable
+testpixbuf-scale
+testpixbuf-save
+testpixbuf
+pixbuf-demo
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,14 +1,14 @@
 ## Makefile.am for gtk+/demos
-include $(top_srcdir)/Makefile.decl

 SUBDIRS = gtk-demo

-INCLUDES = 				\
-	-I$(top_srcdir) 		\
-	-I$(top_builddir)/gdk		\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
-	$(GTK_DEBUG_FLAGS)		\
+INCLUDES = 						\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gdk				\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+	-DGDK_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED			\
+	$(GTK_DEBUG_FLAGS)				\
 	$(GTK_DEP_CFLAGS)

 DEPS = 									\
@@ -70,7 +70,7 @@ testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
 testanimation_SOURCES = testanimation.c pixbuf-init.c
 pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c

-EXTRA_DIST +=			\
+EXTRA_DIST =			\
 	apple-red.png		\
 	background.jpg		\
 	gnome-applets.png	\
@@ -82,5 +82,3 @@ EXTRA_DIST +=			\
 	gnu-keys.png

 DISTCLEANFILES = test-inline-pixbufs.h
-
-include $(top_srcdir)/git.mk
--- a/demos/gtk-demo/.cvsignore
+++ b/demos/gtk-demo/.cvsignore
@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+.libs
+.deps
+gtk-demo
+demos.h
+geninclude.pl
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,14 +1,12 @@
 ## Makefile.am for gtk+/demos
-include $(top_srcdir)/Makefile.decl

 democodedir=$(datadir)/gtk-2.0/demo

-## These should be in the order you want them to appear in the
+## These should be in the order you want them to appear in the 
 ## demo app, which means alphabetized by demo title, not filename
 demos =						\
 	appwindow.c				\
 	assistant.c				\
-	builder.c				\
 	button_box.c				\
 	changedisplay.c				\
 	clipboard.c				\
@@ -23,30 +21,27 @@ demos =						\
 	iconview.c				\
 	iconview_edit.c				\
 	images.c				\
-        links.c					\
 	list_store.c				\
 	menus.c					\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
 	printing.c				\
-	resolution_independence.c		\
 	rotated_text.c				\
-	search_entry.c				\
 	sizegroup.c				\
 	stock_browser.c				\
 	textview.c				\
-	textscroll.c				\
 	tree_store.c				\
 	ui_manager.c

 INCLUDES = \
-	-DDEMOCODEDIR="\"$(democodedir)\""	\
-	-I$(top_srcdir) 			\
-	-I$(top_builddir)/gdk			\
-	-DGDK_DISABLE_DEPRECATED		\
-	-DGTK_DISABLE_DEPRECATED 		\
-	$(GTK_DEBUG_FLAGS)			\
+	-DDEMOCODEDIR="\"$(democodedir)\""		\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gdk				\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+	-DGDK_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED 			\
+	$(GTK_DEBUG_FLAGS)				\
 	$(GTK_DEP_CFLAGS)

 DEPS = \
@@ -63,9 +58,8 @@ bin_PROGRAMS = gtk-demo

 BUILT_SOURCES = demos.h

-EXTRA_DIST += 		\
-	$(IMAGEFILES)	\
-	demo.ui
+EXTRA_DIST = 		\
+	$(IMAGEFILES)

 demos.h: @REBUILD@ $(demos) geninclude.pl
 	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
@@ -78,7 +72,6 @@ gtk_demo_SOURCES = 		\

 gtk_demo_DEPENDENCIES = $(DEPS)
 gtk_demo_LDADD = $(LDADDS)
-gtk_demo_LDFLAGS = -export-dynamic

 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -95,8 +88,6 @@ IMAGEFILES=	alphatest.png		\
 		gnu-keys.png		\
 		gtk-logo-rgb.gif		

-democode_DATA = $(demos) $(IMAGEFILES) demo.ui
+democode_DATA = $(demos) $(IMAGEFILES)

 DISTCLEANFILES = demos.h
-
-include $(top_srcdir)/git.mk
--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -8,8 +8,6 @@
 #include "demo-common.h"

 static GtkWidget *window = NULL;
-static GtkWidget *infobar = NULL;
-static GtkWidget *messagelabel = NULL;

 static void
 activate_action (GtkAction *action)
@@ -18,7 +16,7 @@ activate_action (GtkAction *action)
  const gchar *typename = G_OBJECT_TYPE_NAME (action);

  GtkWidget *dialog;
-
+  
  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_INFO,
@@ -31,7 +29,7 @@ activate_action (GtkAction *action)
                    "response",
                    G_CALLBACK (gtk_widget_destroy),
                    NULL);
-
+  
  gtk_widget_show (dialog);
 }

@@ -43,32 +41,37 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)
  gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
  gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));

-  if (active)
+  if (active) 
    {
-      gchar *text;
+      GtkWidget *dialog;
+  
+      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+				       GTK_DIALOG_DESTROY_WITH_PARENT,
+				       GTK_MESSAGE_INFO,
+				       GTK_BUTTONS_CLOSE,
+				       "You activated radio action: \"%s\" of type \"%s\".\n"
+				       "Current value: %d",
+				       name, typename, value);

-      text = g_strdup_printf ("You activated radio action: \"%s\" of type \"%s\".\n"
-                              "Current value: %d",
-                              name, typename, value);
-      gtk_label_set_text (GTK_LABEL (messagelabel), text);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), (GtkMessageType)value);
-      gtk_widget_show (infobar);
-      g_free (text);
+      /* Close dialog on user response */
+      g_signal_connect (dialog,
+			"response",
+			G_CALLBACK (gtk_widget_destroy),
+			NULL);
+      
+      gtk_widget_show (dialog);
    }
 }

-static void
+static void 
 activate_email (GtkAboutDialog *about,
 		const gchar    *link,
 		gpointer        data)
 {
-  gchar *text;
-  text = g_strdup_printf ("send mail to %s", link);
-  g_print ("%s\n", text);
-  g_free (text);
+  g_print ("send mail to %s\n", link);
 }

-static void
+static void 
 activate_url (GtkAboutDialog *about,
 	      const gchar    *link,
 	      gpointer        data)
@@ -129,32 +132,31 @@ about_cb (GtkAction *action,
  gtk_about_dialog_set_email_hook (activate_email, NULL, NULL);
  gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
  gtk_show_about_dialog (GTK_WINDOW (window),
-			 "program-name", "GTK+ Code Demos",
+			 "name", "GTK+ Code Demos",
 			 "version", PACKAGE_VERSION,
-			 "copyright", "(C) 1997-2009 The GTK+ Team",
+			 "copyright", "(C) 1997-2005 The GTK+ Team",
 			 "license", license,
 			 "website", "http://www.gtk.org",
 			 "comments", "Program to demonstrate GTK+ functions.",
 			 "authors", authors,
 			 "documenters", documentors,
 			 "logo", transparent,
-                         "title", "About GTK+ Code Demos",
 			 NULL);

  g_object_unref (transparent);
 }

-typedef struct
+typedef struct 
 {
  GtkAction action;
 } ToolMenuAction;

-typedef struct
+typedef struct 
 {
  GtkActionClass parent_class;
 } ToolMenuActionClass;

-G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION)
+G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION);

 static void
 tool_menu_action_class_init (ToolMenuActionClass *class)
@@ -176,30 +178,30 @@ static GtkActionEntry entries[] = {
  { "HelpMenu", NULL, "_Help" },               /* name, stock id, label */
  { "New", GTK_STOCK_NEW,                      /* name, stock id */
    "_New", "<control>N",                      /* label, accelerator */
-    "Create a new file",                       /* tooltip */
-    G_CALLBACK (activate_action) },
+    "Create a new file",                       /* tooltip */ 
+    G_CALLBACK (activate_action) },      
  { "File1", NULL,                             /* name, stock id */
-    "File1", NULL,                             /* label, accelerator */
+    "File1", NULL,                             /* label, accelerator */     
    "Open first file",                         /* tooltip */
-    G_CALLBACK (activate_action) },
+    G_CALLBACK (activate_action) }, 
  { "Save", GTK_STOCK_SAVE,                    /* name, stock id */
-    "_Save","<control>S",                      /* label, accelerator */
+    "_Save","<control>S",                      /* label, accelerator */     
    "Save current file",                       /* tooltip */
    G_CALLBACK (activate_action) },
  { "SaveAs", GTK_STOCK_SAVE,                  /* name, stock id */
-    "Save _As...", NULL,                       /* label, accelerator */
+    "Save _As...", NULL,                       /* label, accelerator */     
    "Save to a file",                          /* tooltip */
    G_CALLBACK (activate_action) },
  { "Quit", GTK_STOCK_QUIT,                    /* name, stock id */
-    "_Quit", "<control>Q",                     /* label, accelerator */
+    "_Quit", "<control>Q",                     /* label, accelerator */     
    "Quit",                                    /* tooltip */
    G_CALLBACK (activate_action) },
  { "About", NULL,                             /* name, stock id */
-    "_About", "<control>A",                    /* label, accelerator */
-    "About",                                   /* tooltip */
+    "_About", "<control>A",                    /* label, accelerator */     
+    "About",                                   /* tooltip */  
    G_CALLBACK (about_cb) },
  { "Logo", "demo-gtk-logo",                   /* name, stock id */
-     NULL, NULL,                               /* label, accelerator */
+     NULL, NULL,                               /* label, accelerator */     
    "GTK+",                                    /* tooltip */
    G_CALLBACK (activate_action) },
 };
@@ -208,9 +210,9 @@ static guint n_entries = G_N_ELEMENTS (entries);

 static GtkToggleActionEntry toggle_entries[] = {
  { "Bold", GTK_STOCK_BOLD,                    /* name, stock id */
-     "_Bold", "<control>B",                    /* label, accelerator */
+     "_Bold", "<control>B",                    /* label, accelerator */     
    "Bold",                                    /* tooltip */
-    G_CALLBACK (activate_action),
+    G_CALLBACK (activate_action), 
    TRUE },                                    /* is_active */
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
@@ -223,13 +225,13 @@ enum {

 static GtkRadioActionEntry color_entries[] = {
  { "Red", NULL,                               /* name, stock id */
-    "_Red", "<control>R",                      /* label, accelerator */
+    "_Red", "<control>R",                      /* label, accelerator */     
    "Blood", COLOR_RED },                      /* tooltip, value */
  { "Green", NULL,                             /* name, stock id */
-    "_Green", "<control>G",                    /* label, accelerator */
+    "_Green", "<control>G",                    /* label, accelerator */     
    "Grass", COLOR_GREEN },                    /* tooltip, value */
  { "Blue", NULL,                              /* name, stock id */
-    "_Blue", "<control>B",                     /* label, accelerator */
+    "_Blue", "<control>B",                     /* label, accelerator */     
    "Sky", COLOR_BLUE },                       /* tooltip, value */
 };
 static guint n_color_entries = G_N_ELEMENTS (color_entries);
@@ -242,18 +244,18 @@ enum {

 static GtkRadioActionEntry shape_entries[] = {
  { "Square", NULL,                            /* name, stock id */
-    "_Square", "<control>S",                   /* label, accelerator */
+    "_Square", "<control>S",                   /* label, accelerator */     
    "Square",  SHAPE_SQUARE },                 /* tooltip, value */
  { "Rectangle", NULL,                         /* name, stock id */
-    "_Rectangle", "<control>R",                /* label, accelerator */
+    "_Rectangle", "<control>R",                /* label, accelerator */     
    "Rectangle", SHAPE_RECTANGLE },            /* tooltip, value */
  { "Oval", NULL,                              /* name, stock id */
-    "_Oval", "<control>O",                     /* label, accelerator */
-    "Egg", SHAPE_OVAL },                       /* tooltip, value */
+    "_Oval", "<control>O",                     /* label, accelerator */     
+    "Egg", SHAPE_OVAL },                       /* tooltip, value */  
 };
 static guint n_shape_entries = G_N_ELEMENTS (shape_entries);

-static const gchar *ui_info =
+static const gchar *ui_info = 
 "<ui>"
 "  <menubar name='MenuBar'>"
 "    <menu action='FileMenu'>"
@@ -285,7 +287,7 @@ static const gchar *ui_info =
 "    <toolitem action='Open'>"
 "      <menu action='OpenMenu'>"
 "        <menuitem action='File1'/>"
-"      </menu>"
+"      </menu>"  
 "    </toolitem>"
 "    <toolitem action='Quit'/>"
 "    <separator action='Sep1'/>"
@@ -305,7 +307,7 @@ static void
 register_stock_icons (void)
 {
  static gboolean registered = FALSE;
-
+  
  if (!registered)
    {
      GdkPixbuf *pixbuf;
@@ -317,17 +319,17 @@ register_stock_icons (void)
          "_GTK!",
          0, 0, NULL }
      };
-
+      
      registered = TRUE;

      /* Register our stock items */
      gtk_stock_add (items, G_N_ELEMENTS (items));
-
+      
      /* Add our custom icon factory to the list of defaults */
      factory = gtk_icon_factory_new ();
      gtk_icon_factory_add_default (factory);

-      /* demo_find_file() looks in the current directory first,
+      /* demo_find_file() looks in the the current directory first,
       * so you can run gtk-demo without installing GTK, then looks
       * in the location where the file is installed.
       */
@@ -347,7 +349,7 @@ register_stock_icons (void)

          /* The gtk-logo-rgb icon has a white background, make it transparent */
          transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-
+          
          icon_set = gtk_icon_set_new_from_pixbuf (transparent);
          gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
          gtk_icon_set_unref (icon_set);
@@ -356,7 +358,7 @@ register_stock_icons (void)
        }
      else
        g_warning ("failed to load GTK logo for toolbar");
-
+      
      /* Drop our reference to the factory, GTK will hold a reference. */
      g_object_unref (factory);
    }
@@ -370,9 +372,9 @@ update_statusbar (GtkTextBuffer *buffer,
  gint row, col;
  gint count;
  GtkTextIter iter;
-
-  gtk_statusbar_pop (statusbar, 0); /* clear any previous message,
-				     * underflow is allowed
+  
+  gtk_statusbar_pop (statusbar, 0); /* clear any previous message, 
+				     * underflow is allowed 
 				     */

  count = gtk_text_buffer_get_char_count (buffer);
@@ -406,21 +408,21 @@ update_resize_grip (GtkWidget           *widget,
 		    GdkEventWindowState *event,
 		    GtkStatusbar        *statusbar)
 {
-  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED |
+  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED | 
 			     GDK_WINDOW_STATE_FULLSCREEN))
    {
      gboolean maximized;

-      maximized = event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED |
+      maximized = event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | 
 					     GDK_WINDOW_STATE_FULLSCREEN);
      gtk_statusbar_set_has_resize_grip (statusbar, !maximized);
    }
 }
-
+		    

 GtkWidget *
 do_appwindow (GtkWidget *do_widget)
-{
+{  
  if (!window)
    {
      GtkWidget *table;
@@ -435,10 +437,10 @@ do_appwindow (GtkWidget *do_widget)
      GError *error = NULL;

      register_stock_icons ();
-
+      
      /* Create the toplevel window
       */
-
+      
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
@@ -450,46 +452,45 @@ do_appwindow (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed),
                        &window);

-      table = gtk_table_new (1, 5, FALSE);
-
+      table = gtk_table_new (1, 4, FALSE);
+      
      gtk_container_add (GTK_CONTAINER (window), table);
-
+      
      /* Create the menubar and toolbar
       */
-
+      
      action_group = gtk_action_group_new ("AppWindowActions");
-      open_action = g_object_new (tool_menu_action_get_type (),
+      open_action = g_object_new (tool_menu_action_get_type (), 
 				  "name", "Open",
 				  "label", "_Open",
 				  "tooltip", "Open a file",
 				  "stock-id", GTK_STOCK_OPEN,
 				  NULL);
      gtk_action_group_add_action (action_group, open_action);
-      g_object_unref (open_action);
-      gtk_action_group_add_actions (action_group,
-				    entries, n_entries,
+      gtk_action_group_add_actions (action_group, 
+				    entries, n_entries, 
 				    window);
-      gtk_action_group_add_toggle_actions (action_group,
-					   toggle_entries, n_toggle_entries,
+      gtk_action_group_add_toggle_actions (action_group, 
+					   toggle_entries, n_toggle_entries, 
 					   NULL);
-      gtk_action_group_add_radio_actions (action_group,
-					  color_entries, n_color_entries,
+      gtk_action_group_add_radio_actions (action_group, 
+					  color_entries, n_color_entries, 
 					  COLOR_RED,
-					  G_CALLBACK (activate_radio_action),
+					  G_CALLBACK (activate_radio_action), 
 					  NULL);
-      gtk_action_group_add_radio_actions (action_group,
-					  shape_entries, n_shape_entries,
+      gtk_action_group_add_radio_actions (action_group, 
+					  shape_entries, n_shape_entries, 
 					  SHAPE_SQUARE,
-					  G_CALLBACK (activate_radio_action),
+					  G_CALLBACK (activate_radio_action), 
 					  NULL);

      merge = gtk_ui_manager_new ();
-      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge,
+      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge, 
 			      g_object_unref);
      gtk_ui_manager_insert_action_group (merge, action_group, 0);
-      gtk_window_add_accel_group (GTK_WINDOW (window),
+      gtk_window_add_accel_group (GTK_WINDOW (window), 
 				  gtk_ui_manager_get_accel_group (merge));
-
+      
      if (!gtk_ui_manager_add_ui_from_string (merge, ui_info, -1, &error))
 	{
 	  g_message ("building menus failed: %s", error->message);
@@ -499,16 +500,17 @@ do_appwindow (GtkWidget *do_widget)
      bar = gtk_ui_manager_get_widget (merge, "/MenuBar");
      gtk_widget_show (bar);
      gtk_table_attach (GTK_TABLE (table),
-			bar,
+			bar, 
                        /* X direction */          /* Y direction */
                        0, 1,                      0, 1,
                        GTK_EXPAND | GTK_FILL,     0,
                        0,                         0);

      bar = gtk_ui_manager_get_widget (merge, "/ToolBar");
+      gtk_toolbar_set_tooltips (GTK_TOOLBAR (bar), TRUE);
      gtk_widget_show (bar);
      gtk_table_attach (GTK_TABLE (table),
-			bar,
+			bar, 
                        /* X direction */       /* Y direction */
                        0, 1,                   1, 2,
                        GTK_EXPAND | GTK_FILL,  0,
@@ -517,25 +519,6 @@ do_appwindow (GtkWidget *do_widget)
      /* Create document
       */

-      infobar = gtk_info_bar_new ();
-      gtk_widget_set_no_show_all (infobar, TRUE);
-      messagelabel = gtk_label_new ("");
-      gtk_widget_show (messagelabel);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar))),
-                          messagelabel,
-                          TRUE, TRUE, 0);
-      gtk_info_bar_add_button (GTK_INFO_BAR (infobar),
-                               GTK_STOCK_OK, GTK_RESPONSE_OK);
-      g_signal_connect (infobar, "response",
-                        G_CALLBACK (gtk_widget_hide), NULL);
-
-      gtk_table_attach (GTK_TABLE (table),
-                        infobar,
-                        /* X direction */       /* Y direction */
-                        0, 1,                   2, 3,
-                        GTK_EXPAND | GTK_FILL,  0,
-                        0,                      0);
-
      sw = gtk_scrolled_window_new (NULL, NULL);

      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
@@ -544,21 +527,20 @@ do_appwindow (GtkWidget *do_widget)

      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
                                           GTK_SHADOW_IN);
-
+      
      gtk_table_attach (GTK_TABLE (table),
                        sw,
                        /* X direction */       /* Y direction */
-                        0, 1,                   3, 4,
+                        0, 1,                   2, 3,
                        GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
                        0,                      0);

      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   GTK_SIZE_ONE_TWELFTH_EM (200),
-				   GTK_SIZE_ONE_TWELFTH_EM (200));
-
+                                   200, 200);
+      
      contents = gtk_text_view_new ();
      gtk_widget_grab_focus (contents);
-
+      
      gtk_container_add (GTK_CONTAINER (sw),
                         contents);

@@ -568,7 +550,7 @@ do_appwindow (GtkWidget *do_widget)
      gtk_table_attach (GTK_TABLE (table),
                        statusbar,
                        /* X direction */       /* Y direction */
-                        0, 1,                   4, 5,
+                        0, 1,                   3, 4,
                        GTK_EXPAND | GTK_FILL,  0,
                        0,                      0);

@@ -587,12 +569,12 @@ do_appwindow (GtkWidget *do_widget)
                               statusbar,
                               0);

-      g_signal_connect_object (window,
-			       "window_state_event",
+      g_signal_connect_object (window, 
+			       "window_state_event", 
 			       G_CALLBACK (update_resize_grip),
 			       statusbar,
 			       0);
-
+      
      update_statusbar (buffer, GTK_STATUSBAR (statusbar));
    }

@@ -601,11 +583,9 @@ do_appwindow (GtkWidget *do_widget)
      gtk_widget_show_all (window);
    }
  else
-    {
+    {    
      gtk_widget_destroy (window);
      window = NULL;
-      infobar = NULL;
-      messagelabel = NULL;
    }

  return window;
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -58,32 +58,14 @@ on_entry_changed (GtkWidget *widget, gpointer data)
    gtk_assistant_set_page_complete (assistant, current_page, FALSE);
 }

-static void
-on_unit_changed (GtkWidget *assistant,
-                 gpointer user_data)
-{
-  int n;
-  GdkPixbuf *pixbuf;
-  GtkWidget *page;
-
-  /* update icons on all pages */
-  for (n = 0; n < 3; n++)
-    {
-      page = gtk_assistant_get_nth_page (GTK_ASSISTANT (assistant), n);
-      pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-      gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), page, pixbuf);
-      g_object_unref (pixbuf);
-    }
-}
-
 static void
 create_page1 (GtkWidget *assistant)
 {
  GtkWidget *box, *label, *entry;
  GdkPixbuf *pixbuf;

-  box = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (10));
-  gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (10));
+  box = gtk_hbox_new (FALSE, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (box), 12);

  label = gtk_label_new ("You must fill out this entry to continue:");
  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
@@ -109,8 +91,8 @@ create_page2 (GtkWidget *assistant)
  GtkWidget *box, *checkbutton;
  GdkPixbuf *pixbuf;

-  box = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (10));
-  gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (10));
+  box = gtk_vbox_new (12, FALSE);
+  gtk_container_set_border_width (GTK_CONTAINER (box), 12);

  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
 						 "even if you do not check this");
@@ -152,7 +134,7 @@ do_assistant (GtkWidget *do_widget)
    {
      assistant = gtk_assistant_new ();

-      gtk_window_set_default_size (GTK_WINDOW (assistant), -1, GTK_SIZE_ONE_TWELFTH_EM (300));
+	 gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);

      gtk_window_set_screen (GTK_WINDOW (assistant),
 			     gtk_widget_get_screen (do_widget));
@@ -169,10 +151,6 @@ do_assistant (GtkWidget *do_widget)
 			G_CALLBACK (on_assistant_apply), NULL);
      g_signal_connect (G_OBJECT (assistant), "prepare",
 			G_CALLBACK (on_assistant_prepare), NULL);
-
-      /* need to reset the header pixbufs to correct size when the units change */
-      g_signal_connect (G_OBJECT (assistant), "unit-changed",
-                        G_CALLBACK (on_unit_changed), NULL);
    }

  if (!GTK_WIDGET_VISIBLE (assistant))
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -1,68 +0,0 @@
-/* Builder
- *
- * Demonstrates an interface loaded from a XML description.
- */
-
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-static GtkBuilder *builder;
-
-G_MODULE_EXPORT void
-quit_activate (GtkAction *action)
-{
-  GtkWidget *window;
-
-  window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-  gtk_widget_destroy (window);
-}
-
-G_MODULE_EXPORT void
-about_activate (GtkAction *action)
-{
-  GtkWidget *about_dlg;
-
-  about_dlg = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
-  gtk_dialog_run (GTK_DIALOG (about_dlg));
-  gtk_widget_hide (about_dlg);
-}
-
-GtkWidget *
-do_builder (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GError *err = NULL;
-  gchar *filename;
-  
-  if (!window)
-    {
-      builder = gtk_builder_new ();
-      filename = demo_find_file ("demo.ui", NULL);
-      gtk_builder_add_from_file (builder, filename, &err);
-      g_free (filename);
-      if (err)
-	{
-	  g_error ("ERROR: %s\n", err->message);
-	  return NULL;
-	}
-      gtk_builder_connect_signals (builder, NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {	 
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-
-  return window;
-}
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -6,10 +6,10 @@
 #include <gtk/gtk.h>

 static GtkWidget *
-create_bbox (gint    horizontal,
-	     char   *title, 
-	     GtkSize spacing,
-	     gint    layout)
+create_bbox (gint  horizontal,
+	     char *title, 
+	     gint  spacing,
+	     gint  layout)
 {
  GtkWidget *frame;
  GtkWidget *bbox;
@@ -22,7 +22,7 @@ create_bbox (gint    horizontal,
  else
    bbox = gtk_vbutton_box_new ();

-  gtk_container_set_border_width (GTK_CONTAINER (bbox), GTK_SIZE_ONE_TWELFTH_EM (5));
+  gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
  gtk_container_add (GTK_CONTAINER (frame), bbox);

  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
@@ -61,56 +61,56 @@ do_button_box (GtkWidget *do_widget)
 		      G_CALLBACK (gtk_widget_destroyed),
 		      &window);
    
-    gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (10));
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

    main_vbox = gtk_vbox_new (FALSE, 0);
    gtk_container_add (GTK_CONTAINER (window), main_vbox);
    
    frame_horz = gtk_frame_new ("Horizontal Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (10));
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
    
    vbox = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (10));
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);

    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Spread", GTK_SIZE_ONE_TWELFTH_EM (40), GTK_BUTTONBOX_SPREAD),
+			create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
 			TRUE, TRUE, 0);

    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Edge", GTK_SIZE_ONE_TWELFTH_EM (40), GTK_BUTTONBOX_EDGE),
-			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
+			create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
+			TRUE, TRUE, 5);
    
    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Start", GTK_SIZE_ONE_TWELFTH_EM (40), GTK_BUTTONBOX_START),
-			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
+			create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
+			TRUE, TRUE, 5);
    
    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "End", GTK_SIZE_ONE_TWELFTH_EM (40), GTK_BUTTONBOX_END),
-			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
+			create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
+			TRUE, TRUE, 5);

    frame_vert = gtk_frame_new ("Vertical Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (10));
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
    
    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (10));
+    gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);

    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Spread", GTK_SIZE_ONE_TWELFTH_EM (30), GTK_BUTTONBOX_SPREAD),
+			create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
 			TRUE, TRUE, 0);

    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Edge", GTK_SIZE_ONE_TWELFTH_EM (30), GTK_BUTTONBOX_EDGE),
-			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
+			create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
+			TRUE, TRUE, 5);

    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Start", GTK_SIZE_ONE_TWELFTH_EM (30), GTK_BUTTONBOX_START),
-			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
+			create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
+			TRUE, TRUE, 5);

    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "End", GTK_SIZE_ONE_TWELFTH_EM (30), GTK_BUTTONBOX_END),
-			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
+			create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
+			TRUE, TRUE, 5);
  }

  if (!GTK_WIDGET_VISIBLE (window))
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -1,5 +1,5 @@
 /* Change Display
- *
+ * 
 * Demonstrates migrating a window between different displays and
 * screens. A display is a mouse and keyboard with some number of
 * associated monitors. A screen is a set of monitors grouped
@@ -21,7 +21,7 @@
 *  - Changing the screen for a window
 *
 *  - Letting the user choose a window by clicking on it
- *
+ * 
 *  - Using GtkListStore and GtkTreeView
 *
 *  - Using GtkDialog
@@ -45,7 +45,7 @@ struct _ChangeDisplayInfo
  GtkTreeModel *display_model;
  GtkTreeModel *screen_model;
  GtkTreeSelection *screen_selection;
-
+  
  GdkDisplay *current_display;
  GdkScreen *current_screen;
 };
@@ -81,11 +81,7 @@ find_toplevel_at_pointer (GdkDisplay *display)
   * to the widget that created it.
   */
  if (pointer_window)
-    {
-      gpointer widget_ptr;
-      gdk_window_get_user_data (pointer_window, &widget_ptr);
-      widget = widget_ptr;
-    }
+    gdk_window_get_user_data (pointer_window, (gpointer*) &widget);

  return widget ? gtk_widget_get_toplevel (widget) : NULL;
 }
@@ -111,23 +107,23 @@ query_for_toplevel (GdkScreen  *screen,
  GtkWidget *popup, *label, *frame;
  GdkCursor *cursor;
  GtkWidget *toplevel = NULL;
-
+  
  popup = gtk_window_new (GTK_WINDOW_POPUP);
  gtk_window_set_screen (GTK_WINDOW (popup), screen);
  gtk_window_set_modal (GTK_WINDOW (popup), TRUE);
  gtk_window_set_position (GTK_WINDOW (popup), GTK_WIN_POS_CENTER);
-
+  
  frame = gtk_frame_new (NULL);
  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
  gtk_container_add (GTK_CONTAINER (popup), frame);
-
+  
  label = gtk_label_new (prompt);
  gtk_misc_set_padding (GTK_MISC (label), 10, 10);
  gtk_container_add (GTK_CONTAINER (frame), label);
-
+  
  gtk_widget_show_all (popup);
  cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
-
+  
  if (gdk_pointer_grab (popup->window, FALSE,
 			GDK_BUTTON_RELEASE_MASK,
 			NULL,
@@ -135,26 +131,26 @@ query_for_toplevel (GdkScreen  *screen,
 			GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
    {
      gboolean clicked = FALSE;
-
+      
      g_signal_connect (popup, "button-release-event",
 			G_CALLBACK (button_release_event_cb), &clicked);
-
+      
      /* Process events until clicked is set by button_release_event_cb.
       * We pass in may_block=TRUE since we want to wait if there
       * are no events currently.
       */
      while (!clicked)
 	g_main_context_iteration (NULL, TRUE);
-
+      
      toplevel = find_toplevel_at_pointer (gdk_screen_get_display (screen));
      if (toplevel == popup)
 	toplevel = NULL;
    }
-
+      
  gdk_cursor_unref (cursor);
  gtk_widget_destroy (popup);
  gdk_flush ();			/* Really release the grab */
-
+  
  return toplevel;
 }

@@ -188,12 +184,12 @@ fill_screens (ChangeDisplayInfo *info)
    {
      gint n_screens = gdk_display_get_n_screens (info->current_display);
      gint i;
-
+      
      for (i = 0; i < n_screens; i++)
 	{
 	  GdkScreen *screen = gdk_display_get_screen (info->current_display, i);
 	  GtkTreeIter iter;
-
+	  
 	  gtk_list_store_append (GTK_LIST_STORE (info->screen_model), &iter);
 	  gtk_list_store_set (GTK_LIST_STORE (info->screen_model), &iter,
 			      SCREEN_COLUMN_NUMBER, i,
@@ -234,7 +230,7 @@ open_display_cb (GtkWidget         *button,
  GtkWidget *dialog_label;
  gchar *new_screen_name = NULL;
  GdkDisplay *result = NULL;
-
+  
  dialog = gtk_dialog_new_with_buttons ("Open Display",
 					GTK_WINDOW (info->window),
 					GTK_DIALOG_MODAL,
@@ -253,13 +249,13 @@ open_display_cb (GtkWidget         *button,

  gtk_widget_grab_focus (display_entry);
  gtk_widget_show_all (GTK_BIN (dialog)->child);
-
+  
  while (!result)
    {
      gint response_id = gtk_dialog_run (GTK_DIALOG (dialog));
      if (response_id != GTK_RESPONSE_OK)
 	break;
-
+      
      new_screen_name = gtk_editable_get_chars (GTK_EDITABLE (display_entry),
 						0, -1);

@@ -278,7 +274,7 @@ open_display_cb (GtkWidget         *button,
 	  g_free (new_screen_name);
 	}
    }
-
+  
  gtk_widget_destroy (dialog);
 }

@@ -304,8 +300,6 @@ display_changed_cb (GtkTreeSelection  *selection,
  GtkTreeModel *model;
  GtkTreeIter iter;

-  if (info->current_display)
-    g_object_unref (info->current_display);
  if (gtk_tree_selection_get_selected (selection, &model, &iter))
    gtk_tree_model_get (model, &iter,
 			DISPLAY_COLUMN_DISPLAY, &info->current_display,
@@ -326,8 +320,6 @@ screen_changed_cb (GtkTreeSelection  *selection,
  GtkTreeModel *model;
  GtkTreeIter iter;

-  if (info->current_screen)
-    g_object_unref (info->current_screen);
  if (gtk_tree_selection_get_selected (selection, &model, &iter))
    gtk_tree_model_get (model, &iter,
 			SCREEN_COLUMN_SCREEN, &info->current_screen,
@@ -351,11 +343,11 @@ create_frame (ChangeDisplayInfo *info,
  GtkTreeSelection *selection;
  GtkWidget *scrollwin;
  GtkWidget *hbox;
-
+  
  *frame = gtk_frame_new (title);

-  hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+  hbox = gtk_hbox_new (FALSE, 8);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
  gtk_container_add (GTK_CONTAINER (*frame), hbox);

  scrollwin = gtk_scrolled_window_new (NULL, NULL);
@@ -372,12 +364,12 @@ create_frame (ChangeDisplayInfo *info,
  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*tree_view));
  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);

-  *button_vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
+  *button_vbox = gtk_vbox_new (FALSE, 5);
  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE, 0);

  if (!info->size_group)
    info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
+  
  gtk_size_group_add_widget (GTK_SIZE_GROUP (info->size_group), *button_vbox);
 }

@@ -413,7 +405,7 @@ create_display_frame (ChangeDisplayInfo *info)
  button = left_align_button_new ("_Open...");
  g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
-
+  
  button = left_align_button_new ("_Close");
  g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
@@ -484,7 +476,7 @@ display_closed_cb (GdkDisplay        *display,
       valid = gtk_tree_model_iter_next (info->display_model, &iter))
    {
      GdkDisplay *tmp_display;
-
+      
      gtk_tree_model_get (info->display_model, &iter,
 			  DISPLAY_COLUMN_DISPLAY, &tmp_display,
 			  -1);
@@ -506,7 +498,7 @@ add_display (ChangeDisplayInfo *info,
 {
  const gchar *name = gdk_display_get_name (display);
  GtkTreeIter iter;
-
+  
  gtk_list_store_append (GTK_LIST_STORE (info->display_model), &iter);
  gtk_list_store_set (GTK_LIST_STORE (info->display_model), &iter,
 		      DISPLAY_COLUMN_NAME, name,
@@ -514,7 +506,7 @@ add_display (ChangeDisplayInfo *info,
 		      -1);

  g_signal_connect (display, "closed",
-		    G_CALLBACK (display_closed_cb), info);
+		    G_CALLBACK (display_closed_cb), info); 
 }

 /* Called when a new display is opened
@@ -543,7 +535,7 @@ initialize_displays (ChangeDisplayInfo *info)

  g_slist_free (tmp_list);

-  g_signal_connect (manager, "display-opened",
+  g_signal_connect (manager, "display_opened",
 		    G_CALLBACK (display_opened_cb), info);
 }

@@ -566,18 +558,10 @@ destroy_info (ChangeDisplayInfo *info)
    g_signal_handlers_disconnect_by_func (tmp_list->data,
 					  display_closed_cb,
 					  info);
-
+  
  g_slist_free (tmp_list);

  g_object_unref (info->size_group);
-  g_object_unref (info->display_model);
-  g_object_unref (info->screen_model);
-
-  if (info->current_display)
-    g_object_unref (info->current_display);
-  if (info->current_screen)
-    g_object_unref (info->current_screen);
-
  g_free (info);
 }

@@ -605,28 +589,28 @@ do_changedisplay (GtkWidget *do_widget)
      info = g_new0 (ChangeDisplayInfo, 1);

      info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
-					    GTK_WINDOW (do_widget),
+					    GTK_WINDOW (do_widget), 
 					    GTK_DIALOG_NO_SEPARATOR,
 					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
 					    "Change",         GTK_RESPONSE_OK,
 					    NULL);

-      gtk_window_set_default_size (GTK_WINDOW (info->window), GTK_SIZE_ONE_TWELFTH_EM (300), GTK_SIZE_ONE_TWELFTH_EM (400));
+      gtk_window_set_default_size (GTK_WINDOW (info->window), 300, 400);

      g_signal_connect (info->window, "response",
 			G_CALLBACK (response_cb), info);
      g_signal_connect (info->window, "destroy",
 			G_CALLBACK (destroy_cb), &info);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
-
+      vbox = gtk_vbox_new (FALSE, 5);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+	
      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (info->window)->vbox), vbox,
 			  TRUE, TRUE, 0);

      frame = create_display_frame (info);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
+      
      frame = create_screen_frame (info);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);

--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -1,9 +1,9 @@
 /* Clipboard
 *
 * GtkClipboard is used for clipboard handling. This demo shows how to
- * copy and paste text to and from the clipboard.
+ * copy and paste text to and from the clipboard. 
 *
- * It also shows how to transfer images via the clipboard or via
+ * It also shows how to transfer images via the clipboard or via 
 * drag-and-drop, and how to make clipboard contents persist after
 * the application exits. Clipboard persistence requires a clipboard
 * manager to run.
@@ -22,7 +22,7 @@ copy_button_clicked (GtkWidget *button,
  GtkClipboard *clipboard;

  entry = GTK_WIDGET (user_data);
-
+  
  /* Get the clipboard object */
  clipboard = gtk_widget_get_clipboard (entry,
                                        GDK_SELECTION_CLIPBOARD);
@@ -39,7 +39,7 @@ paste_received (GtkClipboard *clipboard,
  GtkWidget *entry;

  entry = GTK_WIDGET (user_data);
-
+  
  /* Set the entry text */
  if(text)
    gtk_entry_set_text (GTK_ENTRY (entry), text);
@@ -53,7 +53,7 @@ paste_button_clicked (GtkWidget *button,
  GtkClipboard *clipboard;

  entry = GTK_WIDGET (user_data);
-
+  
  /* Get the clipboard object */
  clipboard = gtk_widget_get_clipboard (entry,
                                        GDK_SELECTION_CLIPBOARD);
@@ -80,7 +80,7 @@ get_image_pixbuf (GtkImage *image)
      return gtk_widget_render_icon (GTK_WIDGET (image),
                                     stock_id, size, NULL);
    default:
-      g_warning ("Image storage type %d not handled",
+      g_warning ("Image storage type %d not handled", 
                 gtk_image_get_storage_type (image));
      return NULL;
    }
@@ -98,7 +98,7 @@ drag_begin (GtkWidget      *widget,
  g_object_unref (pixbuf);
 }

-void
+void  
 drag_data_get  (GtkWidget        *widget,
                GdkDragContext   *context,
                GtkSelectionData *selection_data,
@@ -171,12 +171,12 @@ button_press (GtkWidget      *widget,
 {
  GtkWidget *menu;
  GtkWidget *item;
-
+  
  if (button->button != 3)
    return FALSE;

  menu = gtk_menu_new ();
-
+  
  item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
  g_signal_connect (item, "activate", G_CALLBACK (copy_image), data);
  gtk_widget_show (item);
@@ -201,28 +201,28 @@ do_clipboard (GtkWidget *do_widget)
      GtkWidget *entry, *button;
      GtkWidget *ebox, *image;
      GtkClipboard *clipboard;
-
+      
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_vbox_new (FALSE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
-
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      
      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
-
+      
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

-      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (4));
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+      hbox = gtk_hbox_new (FALSE, 4);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);

      /* Create the first entry */
      entry = gtk_entry_new ();
      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-
+      
      /* Create the button */
      button = gtk_button_new_from_stock (GTK_STOCK_COPY);
      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
@@ -232,29 +232,29 @@ do_clipboard (GtkWidget *do_widget)
      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

-      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (4));
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+      hbox = gtk_hbox_new (FALSE, 4);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);

      /* Create the second entry */
      entry = gtk_entry_new ();
      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-
+      
      /* Create the button */
      button = gtk_button_new_from_stock (GTK_STOCK_PASTE);
      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (paste_button_clicked), entry);
-
+      
      label = gtk_label_new ("Images can be transferred via the clipboard, too");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

-      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (4));
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+      hbox = gtk_hbox_new (FALSE, 4);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);

      /* Create the first image */
-      image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
+      image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, 
                                        GTK_ICON_SIZE_BUTTON);
      ebox = gtk_event_box_new ();
      gtk_container_add (GTK_CONTAINER (ebox), image);
@@ -263,24 +263,24 @@ do_clipboard (GtkWidget *do_widget)
      /* make ebox a drag source */
      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
      gtk_drag_source_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-begin",
+      g_signal_connect (ebox, "drag_begin", 
                        G_CALLBACK (drag_begin), image);
-      g_signal_connect (ebox, "drag-data-get",
+      g_signal_connect (ebox, "drag_data_get", 
                        G_CALLBACK (drag_data_get), image);
-
+      
      /* accept drops on ebox */
-      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL,
+      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL, 
                         NULL, 0, GDK_ACTION_COPY);
      gtk_drag_dest_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-data-received",
+      g_signal_connect (ebox, "drag_data_received", 
                        G_CALLBACK (drag_data_received), image);
-
+      
      /* context menu on ebox */
-      g_signal_connect (ebox, "button-press-event",
+      g_signal_connect (ebox, "button_press_event", 
                        G_CALLBACK (button_press), image);

      /* Create the second image */
-      image = gtk_image_new_from_stock (GTK_STOCK_STOP,
+      image = gtk_image_new_from_stock (GTK_STOCK_STOP, 
                                        GTK_ICON_SIZE_BUTTON);
      ebox = gtk_event_box_new ();
      gtk_container_add (GTK_CONTAINER (ebox), image);
@@ -289,22 +289,22 @@ do_clipboard (GtkWidget *do_widget)
      /* make ebox a drag source */
      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
      gtk_drag_source_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-begin",
+      g_signal_connect (ebox, "drag_begin", 
                        G_CALLBACK (drag_begin), image);
-      g_signal_connect (ebox, "drag-data-get",
+      g_signal_connect (ebox, "drag_data_get", 
                        G_CALLBACK (drag_data_get), image);
-
+      
      /* accept drops on ebox */
-      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL,
+      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL, 
                         NULL, 0, GDK_ACTION_COPY);
      gtk_drag_dest_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-data-received",
+      g_signal_connect (ebox, "drag_data_received", 
                        G_CALLBACK (drag_data_received), image);
-
+      
      /* context menu on ebox */
-      g_signal_connect (ebox, "button-press-event",
+      g_signal_connect (ebox, "button_press_event", 
                        G_CALLBACK (button_press), image);
-
+      
      /* tell the clipboard manager to make the data persistent */
      clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
      gtk_clipboard_set_can_store (clipboard, NULL, 0);
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -87,10 +87,10 @@ do_colorsel (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);

-      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+      vbox = gtk_vbox_new (FALSE, 8);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      /*
@@ -108,7 +108,7 @@ do_colorsel (GtkWidget *do_widget)
 			G_CALLBACK (expose_event_callback), NULL);

      /* set a minimum size */
-      gtk_widget_set_size_request (da, GTK_SIZE_ONE_TWELFTH_EM (200), GTK_SIZE_ONE_TWELFTH_EM (200));
+      gtk_widget_set_size_request (da, 200, 200);
      /* set the color */
      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
      
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -11,10 +11,8 @@

 enum 
 {
-  STOCK_ID_COL,
-  TEXT_COL,
-
-  NUM_COLUMNS,
+  PIXBUF_COL,
+  TEXT_COL
 };

 static gchar *
@@ -52,6 +50,7 @@ create_stock_icon_store (void)
  };

  GtkStockItem item;
+  GdkPixbuf *pixbuf;
  GtkWidget *cellview;
  GtkTreeIter iter;
  GtkListStore *store;
@@ -60,17 +59,19 @@ create_stock_icon_store (void)

  cellview = gtk_cell_view_new ();
  
-  store = gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
+  store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);

  for (i = 0; i < G_N_ELEMENTS (stock_id); i++)
    {
      if (stock_id[i])
 	{
-          gtk_stock_lookup (stock_id[i], &item);
+	  pixbuf = gtk_widget_render_icon (cellview, stock_id[i],
+					   GTK_ICON_SIZE_BUTTON, NULL);
+	  gtk_stock_lookup (stock_id[i], &item);
 	  label = strip_underscore (item.label);
 	  gtk_list_store_append (store, &iter);
 	  gtk_list_store_set (store, &iter,
-                              STOCK_ID_COL, stock_id[i],
+			      PIXBUF_COL, pixbuf,
 			      TEXT_COL, label,
 			      -1);
 	  g_free (label);
@@ -79,6 +80,7 @@ create_stock_icon_store (void)
 	{
 	  gtk_list_store_append (store, &iter);
 	  gtk_list_store_set (store, &iter,
+			      PIXBUF_COL, NULL,
 			      TEXT_COL, "separator",
 			      -1);
 	}
@@ -243,87 +245,11 @@ fill_combo_entry (GtkWidget *entry)
  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Three");
 }

-
-/* A simple validating entry */
-
-#define TYPE_MASK_ENTRY             (mask_entry_get_type ())
-#define MASK_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MASK_ENTRY, MaskEntry))
-#define MASK_ENTRY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TYPE_MASK_ENTRY, MaskEntryClass))
-#define IS_MASK_ENTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MASK_ENTRY))
-#define IS_MASK_ENTRY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TYPE_MASK_ENTRY))
-#define MASK_ENTRY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TYPE_MASK_ENTRY, MaskEntryClass))
-
-
-typedef struct _MaskEntry MaskEntry;
-struct _MaskEntry
-{
-  GtkEntry entry;
-  gchar *mask;
-};
-
-typedef struct _MaskEntryClass MaskEntryClass;
-struct _MaskEntryClass
-{
-  GtkEntryClass parent_class;
-};
-
-
-static void mask_entry_editable_init (GtkEditableClass *iface);
-
-G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
-			 G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
-						mask_entry_editable_init));
-
-
-static void
-mask_entry_set_background (MaskEntry *entry)
-{
-  static const GdkColor error_color = { 0, 65535, 60000, 60000 };
-
-  if (entry->mask)
-    {
-      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
-	{
-	  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &error_color);
-	  return;
-	}
-    }
-
-  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
-}
-
-
-static void
-mask_entry_changed (GtkEditable *editable)
-{
-  mask_entry_set_background (MASK_ENTRY (editable));
-}
-
-
-static void
-mask_entry_init (MaskEntry *entry)
-{
-  entry->mask = NULL;
-}
-
-
-static void
-mask_entry_class_init (MaskEntryClass *klass)
-{ }
-
-
-static void
-mask_entry_editable_init (GtkEditableClass *iface)
-{
-  iface->changed = mask_entry_changed;
-}
-
-
 GtkWidget *
 do_combobox (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
-  GtkWidget *vbox, *frame, *box, *combo, *entry;
+  GtkWidget *vbox, *frame, *box, *combo;
  GtkTreeModel *model;
  GtkCellRenderer *renderer;
  GtkTreePath *path;
@@ -340,9 +266,9 @@ do_combobox (GtkWidget *do_widget)
                      G_CALLBACK (gtk_widget_destroyed),
                      &window);
    
-    gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (10));
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

-    vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (2));
+    vbox = gtk_vbox_new (FALSE, 2);
    gtk_container_add (GTK_CONTAINER (window), vbox);

    /* A combobox demonstrating cell renderers, separators and
@@ -352,7 +278,7 @@ do_combobox (GtkWidget *do_widget)
    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
    
    box = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (5));
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
    gtk_container_add (GTK_CONTAINER (frame), box);
    
    model = create_stock_icon_store ();
@@ -363,7 +289,7 @@ do_combobox (GtkWidget *do_widget)
    renderer = gtk_cell_renderer_pixbuf_new ();
    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-				    "stock-id", STOCK_ID_COL, 
+				    "pixbuf", PIXBUF_COL, 
 				    NULL);

    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
@@ -393,7 +319,7 @@ do_combobox (GtkWidget *do_widget)
    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);

    box = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (5));
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
    gtk_container_add (GTK_CONTAINER (frame), box);
    
    model = create_capital_store ();
@@ -416,25 +342,19 @@ do_combobox (GtkWidget *do_widget)
    gtk_tree_path_free (path);
    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);

-    /* A GtkComboBoxEntry with validation.
+    /* A GtkComboBoxEntry 
     */
    frame = gtk_frame_new ("Editable");
    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
    
    box = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (5));
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
    gtk_container_add (GTK_CONTAINER (frame), box);
    
    combo = gtk_combo_box_entry_new_text ();
    fill_combo_entry (combo);
    gtk_container_add (GTK_CONTAINER (box), combo);
    
-    entry = g_object_new (TYPE_MASK_ENTRY, NULL);
-    MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
-     
-    gtk_container_remove (GTK_CONTAINER (combo), GTK_BIN (combo)->child);
-    gtk_container_add (GTK_CONTAINER (combo), entry);
-  
  }

  if (!GTK_WIDGET_VISIBLE (window))
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -1,259 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<interface domain="gtk20">
-    <object class="GtkListStore" id="liststore1">
-      <columns>
-        <column type="gchararray"/>
-        <column type="gchararray"/>
-        <column type="gint"/>
-        <column type="gchararray"/>
-      </columns>
-      <data>
-        <row>
-          <col id="0" translatable="yes">John</col>
-          <col id="1" translatable="yes">Doe</col>
-          <col id="2">25</col>
-          <col id="3" translatable="yes">This is the John Doe row</col>
-        </row>
-        <row>
-          <col id="0" translatable="yes">Mary</col>
-          <col id="1" translatable="yes">Unknown</col>
-          <col id="2">50</col>
-          <col id="3" translatable="yes">This is the Mary Unknown row</col>
-        </row>
-      </data>
-    </object>
-    <object class="GtkUIManager" id="uimanager">
-        <child>
-            <object class="GtkActionGroup" id="DefaultActions">
-                <child>
-                    <object class="GtkAction" id="Copy">
-                        <property name="name">Copy</property>
-                        <property name="tooltip" translatable="yes">Copy selected object into the clipboard</property>
-                        <property name="stock_id">gtk-copy</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Cut">
-                        <property name="name">Cut</property>
-                        <property name="tooltip" translatable="yes">Cut selected object into the clipboard</property>
-                        <property name="stock_id">gtk-cut</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="EditMenu">
-                        <property name="name">EditMenu</property>
-                        <property name="label" translatable="yes">_Edit</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="FileMenu">
-                        <property name="name">FileMenu</property>
-                        <property name="label" translatable="yes">_File</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="New">
-                        <property name="name">New</property>
-                        <property name="tooltip" translatable="yes">Create a new file</property>
-                        <property name="stock_id">gtk-new</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Open">
-                        <property name="name">Open</property>
-                        <property name="tooltip" translatable="yes">Open a file</property>
-                        <property name="stock_id">gtk-open</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Paste">
-                        <property name="name">Paste</property>
-                        <property name="tooltip" translatable="yes">Paste object from the Clipboard</property>
-                        <property name="stock_id">gtk-paste</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Quit">
-                        <property name="name">Quit</property>
-                        <property name="tooltip" translatable="yes">Quit the program</property>
-                        <property name="stock_id">gtk-quit</property>
-                        <signal handler="quit_activate" name="activate"/>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Save">
-                        <property name="name">Save</property>
-                        <property name="is_important">True</property>
-                        <property name="tooltip" translatable="yes">Save a file</property>
-                        <property name="stock_id">gtk-save</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="SaveAs">
-                        <property name="name">SaveAs</property>
-                        <property name="tooltip" translatable="yes">Save with a different name</property>
-                        <property name="stock_id">gtk-save-as</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="HelpMenu">
-                        <property name="name">HelpMenu</property>
-                        <property name="label" translatable="yes">_Help</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="About">
-                        <property name="name">About</property>
-                        <property name="stock_id">gtk-about</property>
-                        <signal handler="about_activate" name="activate"/>
-                    </object>
-                    <accelerator key="F1"/>
-                </child>
-            </object>
-        </child>
-        <ui>
-          <menubar name="menubar1">
-            <menu action="FileMenu" name="FileMenu">
-              <menuitem action="New" name="New"/>
-              <menuitem action="Open" name="Open"/>
-              <menuitem action="Save" name="Save"/>
-              <menuitem action="SaveAs" name="SaveAs"/>
-              <separator/>
-              <menuitem action="Quit" name="Quit"/>
-            </menu>
-            <menu action="EditMenu">
-              <menuitem action="Copy" name="Copy"/>
-              <menuitem action="Cut" name="Cut"/>
-              <menuitem action="Paste" name="Paste"/>
-            </menu>
-            <menu action="HelpMenu" name="HelpMenu">
-              <menuitem action="About" name="About"/>
-            </menu>
-          </menubar>
-          <toolbar name="toolbar1">
-            <toolitem action="New" name="New"/>
-            <toolitem action="Open" name="Open"/>
-            <toolitem action="Save" name="Save"/>
-            <separator/>
-            <toolitem action="Copy" name="Copy"/>
-            <toolitem action="Cut" name="Cut"/>
-            <toolitem action="Paste" name="Paste"/>
-          </toolbar>
-        </ui>
-    </object>
-    <object class="GtkAboutDialog" id="aboutdialog1">
-        <property name="program-name" translatable="yes">GtkBuilder demo</property>
-         <accessibility>
-	     <relation target="window1" type="subwindow-of"/>
-	 </accessibility>
-    </object>
-    <object class="GtkWindow" id="window1">
-        <!-- 100 mm = 10 cm ~= 4 inches -->
-        <property name="default_height">100 mm</property>
-        <property name="default_width">36.6667em</property>
-        <property name="title">GtkBuilder demo</property>
-        <child>
-            <object class="GtkVBox" id="vbox1">
-                <property name="visible">True</property>
-                <child>
-                    <object constructor="uimanager" class="GtkMenuBar" id="menubar1">
-                        <property name="visible">True</property>
-	            	<child internal-child="accessible">
-	            	    <object class="AtkObject" id="a11y-menubar">
-	            	        <property name="AtkObject::accessible-name">The menubar</property>
-	            	    </object>
-	            	</child>
-	            </object>
-                    <packing>
-                        <property name="expand">False</property>
-                    </packing>
-                </child>
-                <child>
-                    <object constructor="uimanager" class="GtkToolbar" id="toolbar1">
-                        <property name="visible">True</property>
-	            	<child internal-child="accessible">
-	            	    <object class="AtkObject" id="a11y-toolbar">
-	            	        <property name="AtkObject::accessible-name">The toolbar</property>
-	            	    </object>
-	            	</child>
-                    </object>
-                    <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkScrolledWindow" id="scrolledwindow1">
-                      <property name="hscrollbar_policy">automatic</property>
-                      <property name="shadow_type">in</property>
-                      <property name="visible">True</property>
-                      <property name="vscrollbar_policy">automatic</property>
-                      <child>
-                        <object class="GtkTreeView" id="treeview1">
-                          <property name="visible">True</property>
-                          <property name="model">liststore1</property>
-                          <property name="tooltip-column">3</property>
-	            	  <child internal-child="accessible">
-	            	      <object class="AtkObject" id="a11y-treeview">
-	            	          <property name="AtkObject::accessible-name">Name list</property>
-                                  <property name="AtkObject::accessible-description">
-                                    A list of person with name, surname and age columns
-                                  </property>
-	            	      </object>
-	            	  </child>
-                          <child>
-                            <object class="GtkTreeViewColumn" id="column1">
-                              <property name="title">Name</property>
-                              <child>
-                                <object class="GtkCellRendererText" id="renderer1"/>
-                                <attributes>
-                                  <attribute name="text">0</attribute>
-                                </attributes>
-                              </child>
-                            </object>
-                          </child>
-                          <child>
-                            <object class="GtkTreeViewColumn" id="column2">
-                              <property name="title">Surname</property>
-                              <child>
-                                <object class="GtkCellRendererText" id="renderer2"/>
-                                <attributes>
-                                  <attribute name="text">1</attribute>
-                                </attributes>
-                              </child>
-                            </object>
-                          </child>
-                          <child>
-                            <object class="GtkTreeViewColumn" id="column3">
-                              <property name="title">Age</property>
-                              <child>
-                                <object class="GtkCellRendererText" id="renderer3"/>
-                                <attributes>
-                                  <attribute name="text">2</attribute>
-                                </attributes>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
-		    <accessibility>
-		      	<action action_name="move-cursor" description="Move the cursor to select another person."/>
-		    </accessibility>
-                    </object>
-                    <packing>
-                        <property name="position">2</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkStatusbar" id="statusbar1">
-                        <property name="visible">True</property>
-                    </object>
-                    <packing>
-                        <property name="expand">False</property>
-                        <property name="position">3</property>
-                    </packing>
-                </child>
-            </object>
-        </child>
-    </object>
-</interface>
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -51,16 +51,16 @@ interactive_dialog_clicked (GtkButton *button,
                                        GTK_RESPONSE_CANCEL,
 					NULL);

-  hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+  hbox = gtk_hbox_new (FALSE, 8);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);

  stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
  gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);

  table = gtk_table_new (2, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (4));
-  gtk_table_set_col_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (4));
+  gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
  gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
  label = gtk_label_new_with_mnemonic ("_Entry 1");
  gtk_table_attach_defaults (GTK_TABLE (table),
@@ -112,17 +112,17 @@ do_dialog (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Dialogs");

      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

      frame = gtk_frame_new ("Dialogs");
      gtk_container_add (GTK_CONTAINER (window), frame);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+      vbox = gtk_vbox_new (FALSE, 8);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (frame), vbox);

      /* Standard message dialog */
-      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      hbox = gtk_hbox_new (FALSE, 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
      button = gtk_button_new_with_mnemonic ("_Message Dialog");
      g_signal_connect (button, "clicked",
@@ -132,7 +132,7 @@ do_dialog (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);

      /* Interactive dialog*/
-      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      hbox = gtk_hbox_new (FALSE, 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
      vbox2 = gtk_vbox_new (FALSE, 0);

@@ -143,8 +143,8 @@ do_dialog (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);

      table = gtk_table_new (2, 2, FALSE);
-      gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (4));
-      gtk_table_set_col_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (4));
+      gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 4);
      gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);

      label = gtk_label_new_with_mnemonic ("_Entry 1");
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -21,25 +21,25 @@ static GdkPixmap *pixmap = NULL;

 /* Create a new pixmap of the appropriate size to store our scribbles */
 static gboolean
-scribble_configure_event (GtkWidget         *widget,
-                          GdkEventConfigure *event,
-                          gpointer           data)
+scribble_configure_event (GtkWidget	    *widget,
+			  GdkEventConfigure *event,
+			  gpointer	     data)
 {
  if (pixmap)
    g_object_unref (pixmap);

  pixmap = gdk_pixmap_new (widget->window,
-                           widget->allocation.width,
-                           widget->allocation.height,
-                           -1);
+			   widget->allocation.width,
+			   widget->allocation.height,
+			   -1);

  /* Initialize the pixmap to white */
  gdk_draw_rectangle (pixmap,
-                      widget->style->white_gc,
-                      TRUE,
-                      0, 0,
-                      widget->allocation.width,
-                      widget->allocation.height);
+		      widget->style->white_gc,
+		      TRUE,
+		      0, 0,
+		      widget->allocation.width,
+		      widget->allocation.height);

  /* We've handled the configure event, no need for further processing. */
  return TRUE;
@@ -48,30 +48,30 @@ scribble_configure_event (GtkWidget         *widget,
 /* Redraw the screen from the pixmap */
 static gboolean
 scribble_expose_event (GtkWidget      *widget,
-                       GdkEventExpose *event,
-                       gpointer        data)
+		       GdkEventExpose *event,
+		       gpointer	       data)
 {
  /* We use the "foreground GC" for the widget since it already exists,
   * but honestly any GC would work. The only thing to worry about
   * is whether the GC has an inappropriate clip region set.
   */
-
+  
  gdk_draw_drawable (widget->window,
-                     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-                     pixmap,
-                     /* Only copy the area that was exposed. */
-                     event->area.x, event->area.y,
-                     event->area.x, event->area.y,
-                     event->area.width, event->area.height);
-
+		     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+		     pixmap,
+		     /* Only copy the area that was exposed. */
+		     event->area.x, event->area.y,
+		     event->area.x, event->area.y,
+		     event->area.width, event->area.height);
+  
  return FALSE;
 }

 /* Draw a rectangle on the screen */
 static void
 draw_brush (GtkWidget *widget,
-            gdouble    x,
-            gdouble    y)
+	    gdouble    x,
+	    gdouble    y)
 {
  GdkRectangle update_rect;

@@ -82,25 +82,25 @@ draw_brush (GtkWidget *widget,

  /* Paint to the pixmap, where we store our state */
  gdk_draw_rectangle (pixmap,
-                      widget->style->black_gc,
-                      TRUE,
-                      update_rect.x, update_rect.y,
-                      update_rect.width, update_rect.height);
+		      widget->style->black_gc,
+		      TRUE,
+		      update_rect.x, update_rect.y,
+		      update_rect.width, update_rect.height);

  /* Now invalidate the affected region of the drawing area. */
  gdk_window_invalidate_rect (widget->window,
-                              &update_rect,
-                              FALSE);
+			      &update_rect,
+			      FALSE);
 }

 static gboolean
-scribble_button_press_event (GtkWidget      *widget,
-                             GdkEventButton *event,
-                             gpointer        data)
+scribble_button_press_event (GtkWidget	    *widget,
+			     GdkEventButton *event,
+			     gpointer	     data)
 {
  if (pixmap == NULL)
    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
-
+  
  if (event->button == 1)
    draw_brush (widget, event->x, event->y);

@@ -109,9 +109,9 @@ scribble_button_press_event (GtkWidget      *widget,
 }

 static gboolean
-scribble_motion_notify_event (GtkWidget      *widget,
-                              GdkEventMotion *event,
-                              gpointer        data)
+scribble_motion_notify_event (GtkWidget	     *widget,
+			      GdkEventMotion *event,
+			      gpointer	      data)
 {
  int x, y;
  GdkModifierType state;
@@ -129,9 +129,9 @@ scribble_motion_notify_event (GtkWidget      *widget,
   * we avoid getting a huge number of events faster than we
   * can cope.
   */
-
+  
  gdk_window_get_pointer (event->window, &x, &y, &state);
-
+    
  if (state & GDK_BUTTON1_MASK)
    draw_brush (widget, x, y);

@@ -141,17 +141,17 @@ scribble_motion_notify_event (GtkWidget      *widget,


 static gboolean
-checkerboard_expose (GtkWidget      *da,
-                     GdkEventExpose *event,
-                     gpointer        data)
+checkerboard_expose (GtkWidget	    *da,
+		     GdkEventExpose *event,
+		     gpointer	     data)
 {
  gint i, j, xcount, ycount;
  GdkGC *gc1, *gc2;
  GdkColor color;
-
+  
 #define CHECK_SIZE 10
 #define SPACING 2
-
+  
  /* At the start of an expose handler, a clip region of event->area
   * is set on the window, and event->area has been cleared to the
   * widget's background color. The docs for
@@ -174,7 +174,7 @@ checkerboard_expose (GtkWidget      *da,
  color.green = 65535;
  color.blue = 65535;
  gdk_gc_set_rgb_fg_color (gc2, &color);
-
+  
  xcount = 0;
  i = SPACING;
  while (i < da->allocation.width)
@@ -182,52 +182,42 @@ checkerboard_expose (GtkWidget      *da,
      j = SPACING;
      ycount = xcount % 2; /* start with even/odd depending on row */
      while (j < da->allocation.height)
-        {
-          GdkGC *gc;
+	{
+	  GdkGC *gc;
+	  
+	  if (ycount % 2)
+	    gc = gc1;
+	  else
+	    gc = gc2;

-          if (ycount % 2)
-            gc = gc1;
-          else
-            gc = gc2;
+	  /* If we're outside event->area, this will do nothing.
+	   * It might be mildly more efficient if we handled
+	   * the clipping ourselves, but again we're feeling lazy.
+	   */
+	  gdk_draw_rectangle (da->window,
+			      gc,
+			      TRUE,
+			      i, j,
+			      CHECK_SIZE,
+			      CHECK_SIZE);

-          /* If we're outside event->area, this will do nothing.
-           * It might be mildly more efficient if we handled
-           * the clipping ourselves, but again we're feeling lazy.
-           */
-          gdk_draw_rectangle (da->window,
-                              gc,
-                              TRUE,
-                              i, j,
-                              CHECK_SIZE,
-                              CHECK_SIZE);
-
-          j += CHECK_SIZE + SPACING;
-          ++ycount;
-        }
+	  j += CHECK_SIZE + SPACING;
+	  ++ycount;
+	}

      i += CHECK_SIZE + SPACING;
      ++xcount;
    }
-
+  
  g_object_unref (gc1);
  g_object_unref (gc2);
-
+  
  /* return TRUE because we've handled this event, so no
   * further processing is required.
   */
  return TRUE;
 }

-static void
-close_window (void)
-{
-  window = NULL;
-
-  if (pixmap)
-    g_object_unref (pixmap);
-  pixmap = NULL;
-}
-
 GtkWidget *
 do_drawingarea (GtkWidget *do_widget)
 {
@@ -235,93 +225,98 @@ do_drawingarea (GtkWidget *do_widget)
  GtkWidget *vbox;
  GtkWidget *da;
  GtkWidget *label;
-
+  
  if (!window)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");

-      g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

-      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+      vbox = gtk_vbox_new (FALSE, 8);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      /*
       * Create the checkerboard area
       */
-
+      
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Checkerboard pattern</u>");
+			    "<u>Checkerboard pattern</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
+      
      da = gtk_drawing_area_new ();
      /* set a minimum size */
-      gtk_widget_set_size_request (da, GTK_SIZE_ONE_TWELFTH_EM (100), GTK_SIZE_ONE_TWELFTH_EM (100));
+      gtk_widget_set_size_request (da, 100, 100);

      gtk_container_add (GTK_CONTAINER (frame), da);

-      g_signal_connect (da, "expose-event",
-                        G_CALLBACK (checkerboard_expose), NULL);
+      g_signal_connect (da, "expose_event",
+			G_CALLBACK (checkerboard_expose), NULL);

      /*
       * Create the scribble area
       */
-
+      
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Scribble area</u>");
+			    "<u>Scribble area</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
+      
      da = gtk_drawing_area_new ();
      /* set a minimum size */
-      gtk_widget_set_size_request (da, GTK_SIZE_ONE_TWELFTH_EM (100), GTK_SIZE_ONE_TWELFTH_EM (100));
+      gtk_widget_set_size_request (da, 100, 100);

      gtk_container_add (GTK_CONTAINER (frame), da);

      /* Signals used to handle backing pixmap */
-
-      g_signal_connect (da, "expose-event",
-                        G_CALLBACK (scribble_expose_event), NULL);
-      g_signal_connect (da,"configure-event",
-                        G_CALLBACK (scribble_configure_event), NULL);
-
+      
+      g_signal_connect (da, "expose_event",
+			G_CALLBACK (scribble_expose_event), NULL);
+      g_signal_connect (da,"configure_event",
+			G_CALLBACK (scribble_configure_event), NULL);
+      
      /* Event signals */
-
-      g_signal_connect (da, "motion-notify-event",
-                        G_CALLBACK (scribble_motion_notify_event), NULL);
-      g_signal_connect (da, "button-press-event",
-                        G_CALLBACK (scribble_button_press_event), NULL);
+      
+      g_signal_connect (da, "motion_notify_event",
+			G_CALLBACK (scribble_motion_notify_event), NULL);
+      g_signal_connect (da, "button_press_event",
+			G_CALLBACK (scribble_button_press_event), NULL);


      /* Ask to receive events the drawing area doesn't normally
       * subscribe to
       */
      gtk_widget_set_events (da, gtk_widget_get_events (da)
-                             | GDK_LEAVE_NOTIFY_MASK
-                             | GDK_BUTTON_PRESS_MASK
-                             | GDK_POINTER_MOTION_MASK
-                             | GDK_POINTER_MOTION_HINT_MASK);
+			     | GDK_LEAVE_NOTIFY_MASK
+			     | GDK_BUTTON_PRESS_MASK
+			     | GDK_POINTER_MOTION_MASK
+			     | GDK_POINTER_MOTION_HINT_MASK);

    }

  if (!GTK_WIDGET_VISIBLE (window))
+    {
      gtk_widget_show_all (window);
+    }
  else
+    {
      gtk_widget_destroy (window);
+      window = NULL;
+    }

  return window;
 }
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -328,11 +328,11 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
-      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (5));
+      gtk_container_set_border_width (GTK_CONTAINER (window), 5);
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
+      vbox = gtk_vbox_new (FALSE, 5);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      gtk_box_pack_start (GTK_BOX (vbox),
@@ -365,7 +365,7 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (sw), treeview);

      /* some buttons */
-      hbox = gtk_hbox_new (TRUE, GTK_SIZE_ONE_TWELFTH_EM (4));
+      hbox = gtk_hbox_new (TRUE, 4);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);

      button = gtk_button_new_with_label ("Add item");
@@ -378,7 +378,7 @@ do_editable_cells (GtkWidget *do_widget)
                        G_CALLBACK (remove_item), treeview);
      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);

-      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (320), GTK_SIZE_ONE_TWELFTH_EM (200));
+      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
    }

  if (!GTK_WIDGET_VISIBLE (window))
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -1,4 +1,4 @@
-/* Entry/Entry Completion
+/* Entry Completion
 *
 * GtkEntryCompletion provides a mechanism for adding support for
 * completion in GtkEntry.
@@ -58,9 +58,9 @@ do_entry_completion (GtkWidget *do_widget)
    g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);

-    vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
+    vbox = gtk_vbox_new (FALSE, 5);
    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (5));
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

    label = gtk_label_new (NULL);
    gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -32,9 +32,9 @@ do_expander (GtkWidget *do_widget)
    g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);

-    vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
+    vbox = gtk_vbox_new (FALSE, 5);
    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (5));
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

    label = gtk_label_new ("Expander demo. Click on the triangle for details.");
    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -16,16 +16,16 @@
 */
 static void 
 insert_link (GtkTextBuffer *buffer, 
-             GtkTextIter   *iter, 
-             gchar         *text, 
-             gint           page)
+	     GtkTextIter   *iter, 
+	     gchar         *text, 
+	     gint           page)
 {
  GtkTextTag *tag;
  
  tag = gtk_text_buffer_create_tag (buffer, NULL, 
-                                    "foreground", "blue", 
-                                    "underline", PANGO_UNDERLINE_SINGLE, 
-                                    NULL);
+				    "foreground", "blue", 
+				    "underline", PANGO_UNDERLINE_SINGLE, 
+				    NULL);
  g_object_set_data (G_OBJECT (tag), "page", GINT_TO_POINTER (page));
  gtk_text_buffer_insert_with_tags (buffer, iter, text, -1, tag, NULL);
 }
@@ -35,7 +35,7 @@ insert_link (GtkTextBuffer *buffer,
 */
 static void
 show_page (GtkTextBuffer *buffer, 
-           gint           page)
+	   gint           page)
 {
  GtkTextIter iter;

@@ -52,12 +52,12 @@ show_page (GtkTextBuffer *buffer,
  else if (page == 2)
    {
      gtk_text_buffer_insert (buffer, &iter, 
-                              "A tag is an attribute that can be applied to some range of text. "
-                              "For example, a tag might be called \"bold\" and make the text inside "
-                              "the tag bold. However, the tag concept is more general than that; "
-                              "tags don't have to affect appearance. They can instead affect the "
-                              "behavior of mouse and key presses, \"lock\" a range of text so the "
-                              "user can't edit it, or countless other things.\n", -1);
+			      "A tag is an attribute that can be applied to some range of text. "
+			      "For example, a tag might be called \"bold\" and make the text inside "
+			      "the tag bold. However, the tag concept is more general than that; "
+			      "tags don't have to affect appearance. They can instead affect the "
+			      "behavior of mouse and key presses, \"lock\" a range of text so the "
+			      "user can't edit it, or countless other things.\n", -1);
      insert_link (buffer, &iter, "Go back", 1);
    }
  else if (page == 3) 
@@ -65,12 +65,12 @@ show_page (GtkTextBuffer *buffer,
      GtkTextTag *tag;
  
      tag = gtk_text_buffer_create_tag (buffer, NULL, 
-                                        "weight", PANGO_WEIGHT_BOLD, 
-                                        NULL);
+					"weight", PANGO_WEIGHT_BOLD, 
+					NULL);
      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext:\n", -1, tag, NULL);
      gtk_text_buffer_insert (buffer, &iter, 
-                              "machine-readable text that is not sequential but is organized "
-                              "so that related items of information are connected.\n", -1);
+			      "machine-readable text that is not sequential but is organized "
+			      "so that related items of information are connected.\n", -1);
      insert_link (buffer, &iter, "Go back", 1);
    }
 }
@@ -81,7 +81,7 @@ show_page (GtkTextBuffer *buffer,
 */
 static void
 follow_if_link (GtkWidget   *text_view, 
-                GtkTextIter *iter)
+		GtkTextIter *iter)
 {
  GSList *tags = NULL, *tagp = NULL;

@@ -93,8 +93,8 @@ follow_if_link (GtkWidget   *text_view,

      if (page != 0)
        {
-          show_page (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)), page);
-          break;
+	  show_page (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)), page);
+	  break;
        }
    }

@@ -106,7 +106,7 @@ follow_if_link (GtkWidget   *text_view,
 */
 static gboolean
 key_press_event (GtkWidget *text_view,
-                 GdkEventKey *event)
+		 GdkEventKey *event)
 {
  GtkTextIter iter;
  GtkTextBuffer *buffer;
@@ -132,7 +132,7 @@ key_press_event (GtkWidget *text_view,
 */
 static gboolean
 event_after (GtkWidget *text_view,
-             GdkEvent  *ev)
+	     GdkEvent  *ev)
 {
  GtkTextIter start, end, iter;
  GtkTextBuffer *buffer;
@@ -165,9 +165,9 @@ event_after (GtkWidget *text_view,
  return FALSE;
 }

-static gboolean hovering_over_link = FALSE;
-static GdkCursor *hand_cursor = NULL;
-static GdkCursor *regular_cursor = NULL;
+gboolean hovering_over_link = FALSE;
+GdkCursor *hand_cursor = NULL;
+GdkCursor *regular_cursor = NULL;

 /* Looks at all tags covering the position (x, y) in the text view, 
 * and if one of them is a link, change the cursor to the "hands" cursor
@@ -179,9 +179,12 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
                           gint            y)
 {
  GSList *tags = NULL, *tagp = NULL;
+  GtkTextBuffer *buffer;
  GtkTextIter iter;
  gboolean hovering = FALSE;

+  buffer = gtk_text_view_get_buffer (text_view);
+
  gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
  
  tags = gtk_text_iter_get_tags (&iter);
@@ -215,7 +218,7 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
 */
 static gboolean
 motion_notify_event (GtkWidget      *text_view,
-                     GdkEventMotion *event)
+		     GdkEventMotion *event)
 {
  gint x, y;

@@ -234,7 +237,7 @@ motion_notify_event (GtkWidget      *text_view,
 */
 static gboolean
 visibility_notify_event (GtkWidget          *text_view,
-                         GdkEventVisibility *event)
+			 GdkEventVisibility *event)
 {
  gint wx, wy, bx, by;
  
@@ -265,12 +268,12 @@ do_hypertext (GtkWidget *do_widget)
      
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   GTK_SIZE_ONE_TWELFTH_EM (450), GTK_SIZE_ONE_TWELFTH_EM (450));
+				   450, 450);
      
      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
@@ -278,20 +281,20 @@ do_hypertext (GtkWidget *do_widget)
      view = gtk_text_view_new ();
      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
      g_signal_connect (view, "key-press-event", 
-                        G_CALLBACK (key_press_event), NULL);
+			G_CALLBACK (key_press_event), NULL);
      g_signal_connect (view, "event-after", 
-                        G_CALLBACK (event_after), NULL);
+			G_CALLBACK (event_after), NULL);
      g_signal_connect (view, "motion-notify-event", 
-                        G_CALLBACK (motion_notify_event), NULL);
+			G_CALLBACK (motion_notify_event), NULL);
      g_signal_connect (view, "visibility-notify-event", 
-                        G_CALLBACK (visibility_notify_event), NULL);
+			G_CALLBACK (visibility_notify_event), NULL);

      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
      
      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
+				      GTK_POLICY_AUTOMATIC,
+				      GTK_POLICY_AUTOMATIC);
      gtk_container_add (GTK_CONTAINER (window), sw);
      gtk_container_add (GTK_CONTAINER (sw), view);

--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -1,7 +1,7 @@
 /* Icon View/Icon View Basics
 *
- * The GtkIconView widget is used to display and manipulate icons.
- * It uses a GtkTreeModel for data storage, so the list store
+ * The GtkIconView widget is used to display and manipulate icons.  
+ * It uses a GtkTreeModel for data storage, so the list store 
 * example might be helpful.
 */

@@ -37,7 +37,7 @@ load_pixbufs (GError **error)
  if (file_pixbuf)
    return TRUE; /* already loaded earlier */

-  /* demo_find_file() looks in the current directory first,
+  /* demo_find_file() looks in the the current directory first,
   * so you can run gtk-demo without installing GTK, then looks
   * in the location where the file is installed.
   */
@@ -47,10 +47,10 @@ load_pixbufs (GError **error)

  file_pixbuf = gdk_pixbuf_new_from_file (filename, error);
  g_free (filename);
-
+  
  if (!file_pixbuf)
    return FALSE; /* Note that "error" was filled with a GError */
-
+  
  filename = demo_find_file (FOLDER_NAME, error);
  if (!filename)
    return FALSE; /* note that "error" was filled in and returned */
@@ -67,7 +67,7 @@ fill_store (GtkListStore *store)
  GDir *dir;
  const gchar *name;
  GtkTreeIter iter;
-
+  
  /* First clear the store */
  gtk_list_store_clear (store);

@@ -82,14 +82,14 @@ fill_store (GtkListStore *store)
    {
      gchar *path, *display_name;
      gboolean is_dir;
-
+      
      /* We ignore hidden files that start with a '.' */
      if (name[0] != '.')
 	{
 	  path = g_build_filename (parent, name, NULL);

 	  is_dir = g_file_test (path, G_FILE_TEST_IS_DIR);
-
+	  
 	  display_name = g_filename_to_utf8 (name, -1, NULL, NULL, NULL);

 	  gtk_list_store_append (store, &iter);
@@ -103,7 +103,7 @@ fill_store (GtkListStore *store)
 	  g_free (display_name);
 	}

-      name = g_dir_read_name (dir);
+      name = g_dir_read_name (dir);      
    }
 }

@@ -121,7 +121,7 @@ sort_func (GtkTreeModel *model,
   * folders before files.
   */

-
+  
  gtk_tree_model_get (model, a,
 		      COL_IS_DIRECTORY, &is_dir_a,
 		      COL_DISPLAY_NAME, &name_a,
@@ -153,12 +153,12 @@ create_store (void)
  GtkListStore *store;

  store = gtk_list_store_new (NUM_COLS,
-			      G_TYPE_STRING,
-			      G_TYPE_STRING,
+			      G_TYPE_STRING, 
+			      G_TYPE_STRING, 
 			      GDK_TYPE_PIXBUF,
 			      G_TYPE_BOOLEAN);

-  /* Set sort column and function */
+  /* Set sort column and function */ 
  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
 					   sort_func,
 					   NULL, NULL);
@@ -178,7 +178,7 @@ item_activated (GtkIconView *icon_view,
  gchar *path;
  GtkTreeIter iter;
  gboolean is_dir;
-
+  
  store = GTK_LIST_STORE (user_data);

  gtk_tree_model_get_iter (GTK_TREE_MODEL (store),
@@ -193,7 +193,7 @@ item_activated (GtkIconView *icon_view,
      g_free (path);
      return;
    }
-
+  
  /* Replace parent with path and re-fill the model*/
  g_free (parent);
  parent = path;
@@ -215,7 +215,7 @@ up_clicked (GtkToolItem *item,

  dir_name = g_path_get_dirname (parent);
  g_free (parent);
-
+  
  parent = dir_name;

  fill_store (store);
@@ -243,34 +243,22 @@ home_clicked (GtkToolItem *item,
 			    TRUE);
 }

-static void close_window(void)
-{
-  gtk_widget_destroy (window);
-  window = NULL;
-
-  g_object_unref (file_pixbuf);
-  file_pixbuf = NULL;
-
-  g_object_unref (folder_pixbuf);
-  folder_pixbuf = NULL;
-}
-
 GtkWidget *
 do_iconview (GtkWidget *do_widget)
 {
  if (!window)
    {
      GError *error;
-
+            
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (650), GTK_SIZE_ONE_TWELFTH_EM (400));
-
+      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
+      
      gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");

      g_signal_connect (window, "destroy",
-			G_CALLBACK (close_window), NULL);
+			G_CALLBACK (gtk_widget_destroyed), &window);

      error = NULL;
      if (!load_pixbufs (&error))
@@ -299,13 +287,13 @@ do_iconview (GtkWidget *do_widget)
 	  GtkWidget *vbox;
 	  GtkWidget *tool_bar;
 	  GtkToolItem *home_button;
-
+	  
 	  vbox = gtk_vbox_new (FALSE, 0);
 	  gtk_container_add (GTK_CONTAINER (window), vbox);

 	  tool_bar = gtk_toolbar_new ();
 	  gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0);
-
+	  
 	  up_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
 	  gtk_tool_item_set_is_important (up_button, TRUE);
 	  gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
@@ -314,17 +302,17 @@ do_iconview (GtkWidget *do_widget)
 	  home_button = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
 	  gtk_tool_item_set_is_important (home_button, TRUE);
 	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);
-
-
+	  
+	  
 	  sw = gtk_scrolled_window_new (NULL, NULL);
 	  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
 					       GTK_SHADOW_ETCHED_IN);
 	  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
 					  GTK_POLICY_AUTOMATIC,
 					  GTK_POLICY_AUTOMATIC);
-
+	  
 	  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
-
+	  
 	  /* Create the store and fill it with the contents of '/' */
 	  parent = g_strdup ("/");
 	  store = create_store ();
@@ -334,7 +322,7 @@ do_iconview (GtkWidget *do_widget)
 	  gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
 					    GTK_SELECTION_MULTIPLE);
 	  g_object_unref (store);
-
+	  
 	  /* Connect to the "clicked" signal of the "Up" tool button */
 	  g_signal_connect (up_button, "clicked",
 			    G_CALLBACK (up_clicked), store);
@@ -342,22 +330,22 @@ do_iconview (GtkWidget *do_widget)
 	  /* Connect to the "clicked" signal of the "Home" tool button */
 	  g_signal_connect (home_button, "clicked",
 			    G_CALLBACK (home_clicked), store);
-
+	  
 	  /* We now set which model columns that correspond to the text
 	   * and pixbuf of each item
 	   */
 	  gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);
 	  gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF);

-	  /* Connect to the "item-activated" signal */
-	  g_signal_connect (icon_view, "item-activated",
+	  /* Connect to the "item_activated" signal */
+	  g_signal_connect (icon_view, "item_activated",
 			    G_CALLBACK (item_activated), store);
 	  gtk_container_add (GTK_CONTAINER (sw), icon_view);

 	  gtk_widget_grab_focus (icon_view);
 	}
    }
-
+  
  if (!GTK_WIDGET_VISIBLE (window))
    gtk_widget_show_all (window);
  else
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -31,14 +31,14 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
  GtkWidget *image;

  image = GTK_WIDGET (data);
-
+  
  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);

  /* Avoid displaying random memory contents, since the pixbuf
   * isn't filled in yet.
   */
  gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
-
+  
  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 }

@@ -51,7 +51,7 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                              gpointer	   data)
 {
  GtkWidget *image;
-
+  
  image = GTK_WIDGET (data);

  /* We know the pixbuf inside the GtkImage has changed, but the image
@@ -61,7 +61,7 @@ progressive_updated_callback (GdkPixbufLoader *loader,
   * the pixbuf on the display, then we could queue a draw for only
   * the updated area of the image.
   */
-
+  
  gtk_widget_queue_draw (image);
 }

@@ -71,24 +71,24 @@ progressive_timeout (gpointer data)
  GtkWidget *image;

  image = GTK_WIDGET (data);
-
+  
  /* This shows off fully-paranoid error handling, so looks scary.
   * You could factor out the error handling code into a nice separate
   * function to make things nicer.
   */
-
+  
  if (image_stream)
    {
      size_t bytes_read;
      guchar buf[256];
      GError *error = NULL;
-
+      
      bytes_read = fread (buf, 1, 256, image_stream);

      if (ferror (image_stream))
 	{
 	  GtkWidget *dialog;
-
+	  
 	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
@@ -103,7 +103,7 @@ progressive_timeout (gpointer data)
 	  image_stream = NULL;

 	  gtk_widget_show (dialog);
-
+	  
 	  load_timeout = 0;

 	  return FALSE; /* uninstall the timeout */
@@ -114,7 +114,7 @@ progressive_timeout (gpointer data)
 				    &error))
 	{
 	  GtkWidget *dialog;
-
+	  
 	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
@@ -123,13 +123,13 @@ progressive_timeout (gpointer data)
 					   error->message);

 	  g_error_free (error);
-
+	  
 	  g_signal_connect (dialog, "response",
 			    G_CALLBACK (gtk_widget_destroy), NULL);

 	  fclose (image_stream);
 	  image_stream = NULL;
-
+	  
 	  gtk_widget_show (dialog);

 	  load_timeout = 0;
@@ -151,29 +151,29 @@ progressive_timeout (gpointer data)
 					&error))
 	    {
 	      GtkWidget *dialog;
-
+	      
 	      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					       GTK_DIALOG_DESTROY_WITH_PARENT,
 					       GTK_MESSAGE_ERROR,
 					       GTK_BUTTONS_CLOSE,
 					       "Failed to load image: %s",
 					       error->message);
-
+	      
 	      g_error_free (error);
-
+	      
 	      g_signal_connect (dialog, "response",
 				G_CALLBACK (gtk_widget_destroy), NULL);
-
+	      
 	      gtk_widget_show (dialog);

 	      g_object_unref (pixbuf_loader);
 	      pixbuf_loader = NULL;
-
+	      
 	      load_timeout = 0;
-
+	      
 	      return FALSE; /* uninstall the timeout */
 	    }
-
+	  
 	  g_object_unref (pixbuf_loader);
 	  pixbuf_loader = NULL;
 	}
@@ -182,9 +182,9 @@ progressive_timeout (gpointer data)
    {
      gchar *filename;
      gchar *error_message = NULL;
-      GError *error = NULL;
+      GError *error = NULL; 

-      /* demo_find_file() looks in the current directory first,
+      /* demo_find_file() looks in the the current directory first,
       * so you can run gtk-demo without installing GTK, then looks
       * in the location where the file is installed.
       */
@@ -207,7 +207,7 @@ progressive_timeout (gpointer data)
      if (image_stream == NULL)
 	{
 	  GtkWidget *dialog;
-
+	  
 	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
@@ -217,7 +217,7 @@ progressive_timeout (gpointer data)

 	  g_signal_connect (dialog, "response",
 			    G_CALLBACK (gtk_widget_destroy), NULL);
-
+	  
 	  gtk_widget_show (dialog);

 	  load_timeout = 0;
@@ -231,13 +231,13 @@ progressive_timeout (gpointer data)
 	  g_object_unref (pixbuf_loader);
 	  pixbuf_loader = NULL;
 	}
-
+      
      pixbuf_loader = gdk_pixbuf_loader_new ();
-
-      g_signal_connect (pixbuf_loader, "area-prepared",
+      
+      g_signal_connect (pixbuf_loader, "area_prepared",
 			G_CALLBACK (progressive_prepared_callback), image);
-
-      g_signal_connect (pixbuf_loader, "area-updated",
+      
+      g_signal_connect (pixbuf_loader, "area_updated",
 			G_CALLBACK (progressive_updated_callback), image);
    }

@@ -255,7 +255,7 @@ start_progressive_loading (GtkWidget *image)
   * The timeout simply simulates a slow data source by inserting
   * pauses in the reading process.
   */
-  load_timeout = gdk_threads_add_timeout (150,
+  load_timeout = g_timeout_add (150,
 				progressive_timeout,
 				image);
 }
@@ -269,7 +269,7 @@ cleanup_callback (GtkObject *object,
      g_source_remove (load_timeout);
      load_timeout = 0;
    }
-
+  
  if (pixbuf_loader)
    {
      gdk_pixbuf_loader_close (pixbuf_loader, NULL);
@@ -289,7 +289,7 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
  GtkContainer *container = user_data;
  GList *list;
  GList *tmp;
-
+  
  list = gtk_container_get_children (container);

  tmp = list;
@@ -299,13 +299,13 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
      if (GTK_WIDGET (tmp->data) != togglebutton)
        gtk_widget_set_sensitive (GTK_WIDGET (tmp->data),
                                  !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
-
+      
      tmp = tmp->next;
    }

  g_list_free (list);
 }
-
+  

 GtkWidget *
 do_images (GtkWidget *do_widget)
@@ -319,7 +319,7 @@ do_images (GtkWidget *do_widget)
  GdkPixbuf *pixbuf;
  GError *error = NULL;
  char *filename;
-
+  
  if (!window)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -332,17 +332,17 @@ do_images (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
 			G_CALLBACK (cleanup_callback), NULL);

-      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+      vbox = gtk_vbox_new (FALSE, 8);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
 			    "<u>Image loaded from a file</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      /* The alignment keeps the frame from growing when users resize
@@ -352,7 +352,7 @@ do_images (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (align), frame);
      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);

-      /* demo_find_file() looks in the current directory first,
+      /* demo_find_file() looks in the the current directory first,
       * so you can run gtk-demo without installing GTK, then looks
       * in the location where the file is installed.
       */
@@ -373,7 +373,7 @@ do_images (GtkWidget *do_widget)
 	   * be displayed instead.
 	   */
 	  GtkWidget *dialog;
-
+	  
 	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
@@ -381,13 +381,13 @@ do_images (GtkWidget *do_widget)
 					   "Unable to open image file 'gtk-logo-rgb.gif': %s",
 					   error->message);
 	  g_error_free (error);
-
+	  
 	  g_signal_connect (dialog, "response",
 			    G_CALLBACK (gtk_widget_destroy), NULL);
-
+	  
 	  gtk_widget_show (dialog);
 	}
-
+	  
      image = gtk_image_new_from_pixbuf (pixbuf);

      gtk_container_add (GTK_CONTAINER (frame), image);
@@ -399,7 +399,7 @@ do_images (GtkWidget *do_widget)
      gtk_label_set_markup (GTK_LABEL (label),
 			    "<u>Animation loaded from a file</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      /* The alignment keeps the frame from growing when users resize
@@ -414,16 +414,16 @@ do_images (GtkWidget *do_widget)
      g_free (filename);

      gtk_container_add (GTK_CONTAINER (frame), image);
-
+      

      /* Progressive */
-
-
+      
+      
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
 			    "<u>Progressive image loading</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      /* The alignment keeps the frame from growing when users resize
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -1,85 +0,0 @@
-/* Links
- *
- * GtkLabel can show hyperlinks. The default action is to call
- * gtk_show_uri() on their URI, but it is possible to override
- * this with a custom handler.
- */
-
-#include <gtk/gtk.h>
-
-static void
-response_cb (GtkWidget *dialog,
-             gint       response_id,
-             gpointer   data)
-{
-  gtk_widget_destroy (dialog);
-}
-
-static gboolean
-activate_link (GtkWidget   *label,
-               const gchar *uri,
-               gpointer     data)
-{
-  if (g_strcmp0 (uri, "keynav") == 0)
-    {
-      GtkWidget *dialog;
-      GtkWidget *parent;
-
-      parent = gtk_widget_get_toplevel (label);
-      dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (parent),
-                 GTK_DIALOG_DESTROY_WITH_PARENT,
-                 GTK_MESSAGE_INFO,
-                 GTK_BUTTONS_OK,
-                 "The term <i>keynav</i> is a shorthand for "
-                 "keyboard navigation and refers to the process of using "
-                 "a program (exclusively) via keyboard input.");
-
-      gtk_window_present (GTK_WINDOW (dialog));
-      g_signal_connect (dialog, "response", G_CALLBACK (response_cb), NULL);
-
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-GtkWidget *
-do_links (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *box;
-  GtkWidget *label;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-      g_signal_connect (window, "destroy",
-			G_CALLBACK(gtk_widget_destroyed), &window);
-      g_signal_connect (window, "delete-event",
-			G_CALLBACK (gtk_true), NULL);
-
-      label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
-                             "title=\"plain text\">text</a> may be marked up\n"
-                             "as hyperlinks, which can be clicked\n"
-                             "or activated via <a href=\"keynav\">keynav</a>");
-      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-      g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
-      gtk_container_add (GTK_CONTAINER (window), label);
-      gtk_widget_show (label);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -173,9 +173,9 @@ do_list_store (GtkWidget *do_widget)

      g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      vbox = gtk_vbox_new (FALSE, 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
@@ -206,7 +206,7 @@ do_list_store (GtkWidget *do_widget)
      add_columns (GTK_TREE_VIEW (treeview));

      /* finish & show */
-      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (280), GTK_SIZE_ONE_TWELFTH_EM (250));
+      gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
    }

  if (!GTK_WIDGET_VISIBLE (window))
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -7,7 +7,7 @@
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>

-#include "demos.h"
+#include <demos.h>

 static GtkTextBuffer *info_buffer;
 static GtkTextBuffer *source_buffer;
@@ -41,7 +41,7 @@ get_democodedir (void)

  if (result == NULL)
    {
-      result = g_win32_get_package_installation_directory_of_module (NULL);
+      result = g_win32_get_package_installation_directory (NULL, NULL);
      if (result == NULL)
 	result = "unknown-location";

@@ -195,12 +195,11 @@ static gchar *types[] =
  "const ",
  "void",
  "gint",
-  " int ",
-  " char ",
+  "int ",
+  "char ",
  "gchar ",
  "gfloat",
  "float",
-  "double",
  "gint8",
  "gint16",
  "gint32",
@@ -235,87 +234,6 @@ static gchar *types[] =
  "GdkPixbuf ",
  "GError",
  "size_t",
-  "GtkAboutDialog ",
-  "GtkAction ",
-  "GtkActionEntry ",
-  "GtkRadioActionEntry ",
-  "GtkIconFactory ",
-  "GtkStockItem ",
-  "GtkIconSet ",
-  "GtkTextBuffer ",
-  "GtkStatusbar ",
-  "GtkTextIter ",
-  "GtkTextMark ",
-  "GdkEventWindowState ",
-  "GtkActionGroup ",
-  "GtkUIManager ",
-  "GtkRadioAction ",
-  "GtkActionClass ",
-  "GtkToggleActionEntry ",
-  "GtkAssistant ",
-  "GtkBuilder ",
-  "GtkSizeGroup ",
-  "GtkTreeModel ",
-  "GtkTreeSelection ",
-  "GdkDisplay ",
-  "GdkScreen ",
-  "GdkWindow ",
-  "GdkEventButton ",
-  "GdkCursor ",
-  "GtkTreeIter ",
-  "GtkTreeViewColumn ",
-  "GdkDisplayManager ",
-  "GtkClipboard ",
-  "GtkIconSize ",
-  "GtkImage ",
-  "GdkDragContext ",
-  "GtkSelectionData ",
-  "GtkDialog ",
-  "GtkMenuItem ",
-  "GtkListStore ",
-  "GtkCellLayout ",
-  "GtkCellRenderer ",
-  "GtkTreePath ",
-  "GtkTreeStore ",
-  "GtkEntry ",
-  "GtkEditable ",
-  "GtkEditableClass ",
-  "GdkPixmap ",
-  "GdkEventConfigure ",
-  "GdkEventMotion ",
-  "GdkModifierType ",
-  "GtkEntryCompletion ",
-  "GtkToolItem ",
-  "GDir ",
-  "GtkIconView ",
-  "GtkCellRendererText ",
-  "GtkContainer ",
-  "GtkAccelGroup ",
-  "GtkPaned ",
-  "GtkPrintOperation ",
-  "GtkPrintContext ",
-  "cairo_t ",
-  "PangoLayout "
-  "PangoFontDescription ",
-  "PangoRenderer ",
-  "PangoMatrix ",
-  "PangoContext ",
-  "PangoLayout ",
-  "GtkTable ",
-  "GtkToggleButton ",
-  "GString ",
-  "GtkIconSize ",
-  "GtkTreeView ",
-  "GtkTextTag ",
-  "GdkEvent ",
-  "GdkEventKey ",
-  "GtkTextView ",
-  "GdkEventVisibility ",
-  "GdkBitmap ",
-  "GtkTextChildAnchor ",
-  "GArray ",
-  "GtkCellEditable ",
-  "GtkCellRendererToggle ",
  NULL
 };

@@ -390,8 +308,7 @@ parse_chars (gchar     *text,
    }
  /* check for types */
  for (i = 0; types[i] != NULL; i++)
-    if (!strncmp (text, types[i], strlen (types[i])) ||
-        (start && types[i][0] == ' ' && !strncmp (text, types[i] + 1, strlen (types[i]) - 1)))
+    if (!strncmp (text, types[i], strlen (types[i])))
      {
 	*end_ptr = text + strlen (types[i]);
 	*tag = "type";
@@ -658,8 +575,6 @@ load_file (const gchar *filename)
 	}
    }

-  fclose (file);
-  
  fontify ();

  g_string_free (buffer, TRUE);
@@ -764,9 +679,9 @@ create_text (GtkTextBuffer **buffer,
      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
                                   GTK_WRAP_WORD);
      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (text_view),
-                                            GTK_SIZE_ONE_TWELFTH_EM (2));
+                                            2);
      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view),
-                                            GTK_SIZE_ONE_TWELFTH_EM (2));
+                                            2);
    }
  
  return scrolled_window;
@@ -792,7 +707,7 @@ create_tree (void)

  gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
 			       GTK_SELECTION_BROWSE);
-  gtk_widget_set_size_request (tree_view, GTK_SIZE_ONE_TWELFTH_EM (200), -1);
+  gtk_widget_set_size_request (tree_view, 200, -1);

  /* this code only supports 1 level of children. If we
   * want more we probably have to use a recursing function.
@@ -867,8 +782,6 @@ create_tree (void)

  gtk_widget_grab_focus (tree_view);

-   g_object_unref (model);
-
  return box;
 }

@@ -946,14 +859,13 @@ main (int argc, char **argv)
    }
  /* -- End of hack -- */
  
-  gtk_enable_resolution_independence ();
  gtk_init (&argc, &argv);

  setup_default_icon ();
  
  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
  gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
-  g_signal_connect_after (window, "destroy",
+  g_signal_connect (window, "destroy",
 		    G_CALLBACK (gtk_main_quit), NULL);

  hbox = gtk_hbox_new (FALSE, 0);
@@ -969,15 +881,13 @@ main (int argc, char **argv)
 			    create_text (&info_buffer, FALSE),
 			    gtk_label_new_with_mnemonic ("_Info"));

-  tag = gtk_text_buffer_create_tag (info_buffer, "title",
-                                    "scale", PANGO_SCALE_XX_LARGE,
-                                    NULL);
-   g_object_unref (info_buffer);
-
  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 			    create_text (&source_buffer, TRUE),
 			    gtk_label_new_with_mnemonic ("_Source"));

+  tag = gtk_text_buffer_create_tag (info_buffer, "title",
+                                    "font", "Sans 18",
+                                    NULL);

  tag = gtk_text_buffer_create_tag (source_buffer, "comment",
 				    "foreground", "DodgerBlue",
@@ -1000,9 +910,8 @@ main (int argc, char **argv)
 				    "weight", PANGO_WEIGHT_BOLD,
 				    "foreground", "DarkGoldenrod4",
                                    NULL);
-  g_object_unref (source_buffer);
  
-  gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (600), GTK_SIZE_ONE_TWELFTH_EM (400));
+  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
  gtk_widget_show_all (window);
  

--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -179,8 +179,8 @@ do_menus (GtkWidget *do_widget)
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
      gtk_widget_show (menuitem);
      
-      box2 = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (10));
-      gtk_container_set_border_width (GTK_CONTAINER (box2), GTK_SIZE_ONE_TWELFTH_EM (10));
+      box2 = gtk_vbox_new (FALSE, 10);
+      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
      gtk_widget_show (box2);

--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -24,13 +24,13 @@ toggle_resize (GtkWidget *widget,
  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;

-  g_object_ref (child);
+  gtk_widget_ref (child);
  gtk_container_remove (GTK_CONTAINER (child->parent), child);
  if (is_child1)
    gtk_paned_pack1 (paned, child, !resize, shrink);
  else
    gtk_paned_pack2 (paned, child, !resize, shrink);
-  g_object_unref (child);
+  gtk_widget_unref (child);
 }

 void
@@ -44,13 +44,13 @@ toggle_shrink (GtkWidget *widget,
  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;

-  g_object_ref (child);
+  gtk_widget_ref (child);
  gtk_container_remove (GTK_CONTAINER (child->parent), child);
  if (is_child1)
    gtk_paned_pack1 (paned, child, resize, !shrink);
  else
    gtk_paned_pack2 (paned, child, resize, !shrink);
-  g_object_unref (child);
+  gtk_widget_unref (child);
 }

 GtkWidget *
@@ -65,7 +65,7 @@ create_pane_options (GtkPaned	 *paned,
  GtkWidget *check_button;
  
  frame = gtk_frame_new (frame_label);
-  gtk_container_set_border_width (GTK_CONTAINER (frame), GTK_SIZE_ONE_TWELFTH_EM (4));
+  gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
  
  table = gtk_table_new (3, 2, TRUE);
  gtk_container_add (GTK_CONTAINER (frame), table);
@@ -138,14 +138,14 @@ do_panes (GtkWidget *do_widget)
      
      vpaned = gtk_vpaned_new ();
      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER(vpaned), GTK_SIZE_ONE_TWELFTH_EM (5));
+      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);

      hpaned = gtk_hpaned_new ();
      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, GTK_SIZE_ONE_TWELFTH_EM (60), GTK_SIZE_ONE_TWELFTH_EM (60));
+      gtk_widget_set_size_request (frame, 60, 60);
      gtk_paned_add1 (GTK_PANED (hpaned), frame);
      
      button = gtk_button_new_with_mnemonic ("_Hi there");
@@ -153,12 +153,12 @@ do_panes (GtkWidget *do_widget)

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, GTK_SIZE_ONE_TWELFTH_EM (80), GTK_SIZE_ONE_TWELFTH_EM (60));
+      gtk_widget_set_size_request (frame, 80, 60);
      gtk_paned_add2 (GTK_PANED (hpaned), frame);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, GTK_SIZE_ONE_TWELFTH_EM (60), GTK_SIZE_ONE_TWELFTH_EM (80));
+      gtk_widget_set_size_request (frame, 60, 80);
      gtk_paned_add2 (GTK_PANED (vpaned), frame);

      /* Now create toggle buttons to control sizing */
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -18,20 +18,19 @@ do_pickers (GtkWidget *do_widget)
    gtk_window_set_screen (GTK_WINDOW (window),
                           gtk_widget_get_screen (do_widget));
    gtk_window_set_title (GTK_WINDOW (window), "Pickers");
-    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
   
    g_signal_connect (window, "destroy",
                      G_CALLBACK (gtk_widget_destroyed),
                      &window);
    
-    gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (10));
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

    table = gtk_table_new (4, 2, FALSE);    
-    gtk_table_set_col_spacing (GTK_TABLE (table), 0, GTK_SIZE_ONE_TWELFTH_EM (10));
-    gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (3));
+    gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 3);
    gtk_container_add (GTK_CONTAINER (window), table);

-    gtk_container_set_border_width (GTK_CONTAINER (table), GTK_SIZE_ONE_TWELFTH_EM (10));
+    gtk_container_set_border_width (GTK_CONTAINER (table), 10);

    label = gtk_label_new ("Color:");
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -61,7 +61,7 @@ load_pixbufs (GError **error)
  if (background)
    return TRUE; /* already loaded earlier */

-  /* demo_find_file() looks in the current directory first,
+  /* demo_find_file() looks in the the current directory first,
   * so you can run gtk-demo without installing GTK, then looks
   * in the location where the file is installed.
   */
@@ -82,13 +82,13 @@ load_pixbufs (GError **error)
    {
      filename = demo_find_file (image_names[i], error);
      if (!filename)
-        return FALSE; /* Note that "error" was filled with a GError */
+	return FALSE; /* Note that "error" was filled with a GError */
      
      images[i] = gdk_pixbuf_new_from_file (filename, error);
      g_free (filename);
      
      if (!images[i])
-        return FALSE; /* Note that "error" was filled with a GError */
+	return FALSE; /* Note that "error" was filled with a GError */
    }

  return TRUE;
@@ -96,9 +96,9 @@ load_pixbufs (GError **error)

 /* Expose callback for the drawing area */
 static gint
-expose_cb (GtkWidget      *widget,
-           GdkEventExpose *event,
-           gpointer        data)
+expose_cb (GtkWidget	  *widget,
+	   GdkEventExpose *event,
+	   gpointer	   data)
 {
  guchar *pixels;
  int rowstride;
@@ -108,12 +108,12 @@ expose_cb (GtkWidget      *widget,
  pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;

  gdk_draw_rgb_image_dithalign (widget->window,
-                                widget->style->black_gc,
-                                event->area.x, event->area.y,
-                                event->area.width, event->area.height,
-                                GDK_RGB_DITHER_NORMAL,
-                                pixels, rowstride,
-                                event->area.x, event->area.y);
+				widget->style->black_gc,
+				event->area.x, event->area.y,
+				event->area.width, event->area.height,
+				GDK_RGB_DITHER_NORMAL,
+				pixels, rowstride,
+				event->area.x, event->area.y);

  return TRUE;
 }
@@ -132,7 +132,7 @@ timeout (gpointer data)
  double radius;

  gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
-                        frame, 0, 0);
+			frame, 0, 0);

  f = (double) (frame_num % CYCLE_LEN) / CYCLE_LEN;

@@ -175,21 +175,19 @@ timeout (gpointer data)
      r2.height = back_height;

      if (gdk_rectangle_intersect (&r1, &r2, &dest))
-        gdk_pixbuf_composite (images[i],
-                              frame,
-                              dest.x, dest.y,
-                              dest.width, dest.height,
-                              xpos, ypos,
-                              k, k,
-                              GDK_INTERP_NEAREST,
-                              ((i & 1)
-                               ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
-                               : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
+	gdk_pixbuf_composite (images[i],
+			      frame,
+			      dest.x, dest.y,
+			      dest.width, dest.height,
+			      xpos, ypos,
+			      k, k,
+			      GDK_INTERP_NEAREST,
+			      ((i & 1)
+			       ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
+			       : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
    }

-  GDK_THREADS_ENTER ();
  gtk_widget_queue_draw (da);
-  GDK_THREADS_LEAVE ();

  frame_num++;
  return TRUE;
@@ -199,7 +197,7 @@ static guint timeout_id;

 static void
 cleanup_callback (GtkObject *object,
-                  gpointer   data)
+		  gpointer   data)
 {
  g_source_remove (timeout_id);
  timeout_id = 0;
@@ -214,50 +212,48 @@ do_pixbufs (GtkWidget *do_widget)

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);

-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (cleanup_callback), NULL);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (window, "destroy", G_CALLBACK (cleanup_callback), NULL);


      error = NULL;
      if (!load_pixbufs (&error))
-        {
-          GtkWidget *dialog;
+	{
+	  GtkWidget *dialog;

-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Failed to load an image: %s",
-                                           error->message);
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Failed to load an image: %s",
+					   error->message);

-          g_error_free (error);
+	  g_error_free (error);

-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);

-          gtk_widget_show (dialog);
-        }
+	  gtk_widget_show (dialog);
+	}
      else
-        {
-          gtk_widget_set_size_request (window, back_width, back_height);
+	{
+	  gtk_widget_set_size_request (window, back_width, back_height);

-          frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, back_width, back_height);
+	  frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, back_width, back_height);

-          da = gtk_drawing_area_new ();
+	  da = gtk_drawing_area_new ();

-          g_signal_connect (da, "expose-event",
-                            G_CALLBACK (expose_cb), NULL);
+	  g_signal_connect (da, "expose_event",
+			    G_CALLBACK (expose_cb), NULL);

-          gtk_container_add (GTK_CONTAINER (window), da);
+	  gtk_container_add (GTK_CONTAINER (window), da);

-          timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
-        }
+	  timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
+	}
    }

  if (!GTK_WIDGET_VISIBLE (window))
--- a/demos/gtk-demo/printing.c
+++ b/demos/gtk-demo/printing.c
@@ -49,7 +49,6 @@ begin_print (GtkPrintOperation *operation,
  
  data->num_lines = i;
  data->num_pages = (data->num_lines - 1) / data->lines_per_page + 1;
-
  gtk_print_operation_set_n_pages (operation, data->num_pages);
 }

@@ -62,9 +61,8 @@ draw_page (GtkPrintOperation *operation,
  PrintData *data = (PrintData *)user_data;
  cairo_t *cr;
  PangoLayout *layout;
-  gint text_width, text_height;
-  gdouble width;
-  gint line, i;
+  gdouble width, text_height;
+  gint line, i, layout_height;
  PangoFontDescription *desc;
  gchar *page_str;

@@ -87,32 +85,28 @@ draw_page (GtkPrintOperation *operation,
  pango_font_description_free (desc);

  pango_layout_set_text (layout, data->filename, -1);
-  pango_layout_get_pixel_size (layout, &text_width, &text_height);
+  pango_layout_set_width (layout, width);
+  pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+			      
+  pango_layout_get_size (layout, NULL, &layout_height);
+  text_height = (gdouble)layout_height / PANGO_SCALE;

-  if (text_width > width)
-    {
-      pango_layout_set_width (layout, width);
-      pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_START);
-      pango_layout_get_pixel_size (layout, &text_width, &text_height);
-    }
-
-  cairo_move_to (cr, (width - text_width) / 2,  (HEADER_HEIGHT - text_height) / 2);
+  cairo_move_to (cr, width / 2,  (HEADER_HEIGHT - text_height) / 2);
  pango_cairo_show_layout (cr, layout);

  page_str = g_strdup_printf ("%d/%d", page_nr + 1, data->num_pages);
  pango_layout_set_text (layout, page_str, -1);
  g_free (page_str);
-
-  pango_layout_set_width (layout, -1);
-  pango_layout_get_pixel_size (layout, &text_width, &text_height);
-  cairo_move_to (cr, width - text_width - 4, (HEADER_HEIGHT - text_height) / 2);
+  pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
+			      
+  cairo_move_to (cr, width - 2, (HEADER_HEIGHT - text_height) / 2);
  pango_cairo_show_layout (cr, layout);
  
  g_object_unref (layout);
  
  layout = gtk_print_context_create_pango_layout (context);
  
-  desc = pango_font_description_from_string ("monospace");
+  desc = pango_font_description_from_string ("mono");
  pango_font_description_set_size (desc, data->font_size * PANGO_SCALE);
  pango_layout_set_font_description (layout, desc);
  pango_font_description_free (desc);
@@ -162,9 +156,6 @@ do_printing (GtkWidget *do_widget)
  g_signal_connect (G_OBJECT (operation), "end-print", 
 		    G_CALLBACK (end_print), data);

-  gtk_print_operation_set_use_full_page (operation, FALSE);
-  gtk_print_operation_set_unit (operation, GTK_UNIT_POINTS);
-
  gtk_print_operation_run (operation, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (do_widget), &error);

  g_object_unref (operation);
--- a/demos/gtk-demo/resolution_independence.c
+++ b/demos/gtk-demo/resolution_independence.c
@@ -1,239 +0,0 @@
-/* Resolution Independence
- *
- * This demonstates resolution independence features available since
- * version 2.14 of GTK+. Use the slider to change the effective DPI
- * per monitor. Note that the changes will only affect windows from
- * this process.
- */
-#include <gtk/gtk.h>
-#include "config.h"
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-static GtkWindowGroup *window_group = NULL;
-static GtkWidget *hscale;
-static GtkWidget *label;
-static GtkWidget *button;
-static gdouble button_dpi;
-
-#define INCHES_TO_MM 25.4
-
-#define MIN_DPI 24.0
-#define MAX_DPI 480.0
-#define STEP_DPI 1.0
-
-static void
-update (void)
-{
-  GdkScreen *screen;
-  gint monitor_num;
-  char *plug_name;
-  char *s;
-  gdouble dpi;
-  char *font_name;
-  GtkSettings *settings;
-  int width_mm;
-  int height_mm;
-  GdkRectangle geometry;
-
-  plug_name = NULL;
-  font_name = NULL;
-  width_mm = -1;
-  height_mm = -1;
-  geometry.x = -1;
-  geometry.y = -1;
-  geometry.width = -1;
-  geometry.height = -1;
-
-  screen = gtk_window_get_screen (GTK_WINDOW (window));
-  monitor_num = gtk_widget_get_monitor_num (window);
-  if (screen != NULL && monitor_num >= 0)
-    {
-      plug_name = gdk_screen_get_monitor_plug_name (screen, monitor_num);
-      width_mm = gdk_screen_get_monitor_width_mm (screen, monitor_num);
-      height_mm = gdk_screen_get_monitor_height_mm (screen, monitor_num);
-      gdk_screen_get_monitor_geometry (screen, monitor_num, &geometry);
-    }
-  if (screen != NULL)
-    settings = gtk_settings_get_for_screen (screen);
-  else
-    settings = gtk_settings_get_default ();
-  g_object_get (settings, "gtk-font-name", &font_name, NULL);
-
-  s = g_strdup_printf ("Monitor %d (%s) @ %dx%d+%d+%d\n"
-                       "%d mm x %d mm\n"
-		       "DPI: %.1f x %.1f\n"
-                       "Font \"%s\"\n"
-                       "1 em -> %g pixels\n"
-                       "1 mm -> %g pixels",
-                       monitor_num,
-                       plug_name != NULL ? plug_name : "unknown name",
-                       geometry.width, geometry.height, geometry.x, geometry.y,
-                       width_mm, height_mm,
-		       INCHES_TO_MM * geometry.width / width_mm,
-		       INCHES_TO_MM * geometry.height / height_mm,
-                       font_name,
-                       gtk_size_to_pixel_double (screen, monitor_num, gtk_size_em (1.0)),
-                       gtk_size_to_pixel_double (screen, monitor_num, gtk_size_mm (1.0)));
-  gtk_label_set_text (GTK_LABEL (label), s);
-  g_free (s);
-
-  button_dpi = MIN (INCHES_TO_MM * geometry.width / width_mm,
-                    INCHES_TO_MM * geometry.height / height_mm);
-  s = g_strdup_printf ("Set DPI to %.1f", button_dpi);
-  gtk_button_set_label (GTK_BUTTON (button), s);
-  g_free (s);
-
-  dpi = -1;
-  if (screen != NULL)
-    {
-      dpi = gdk_screen_get_resolution_for_monitor (screen, monitor_num);
-      gtk_range_set_value (GTK_RANGE (hscale), dpi);
-    }
-
-  g_free (plug_name);
-  g_free (font_name);
-}
-
-static void
-window_mapped (GtkWidget *widget, gpointer user_data)
-{
-  update ();
-}
-
-static void
-unit_changed (GtkWidget *widget, gpointer user_data)
-{
-  update ();
-}
-
-static void
-monitor_num_notify (GtkWindow *window, GParamSpec *psec, gpointer user_data)
-{
-  g_debug ("notify::monitor-num");
-  update ();
-}
-
-static void
-update_value (void)
-{
-  gdouble slider_value;
-
-  slider_value = gtk_range_get_value (GTK_RANGE (hscale));
-  if (slider_value >= MIN_DPI && slider_value <= MAX_DPI)
-    {
-      GdkScreen *screen;
-      gint monitor_num;
-
-      screen = gtk_window_get_screen (GTK_WINDOW (window));
-      monitor_num = gtk_widget_get_monitor_num (window);
-      if (screen != NULL && monitor_num >= 0)
-        {
-          gdk_screen_set_resolution_for_monitor (screen, monitor_num, slider_value);
-          g_signal_emit_by_name (screen, "monitors-changed");
-        }
-    }
-}
-
-static gboolean is_pressed = FALSE;
-
-static gboolean
-hscale_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
-{
-  is_pressed = TRUE;
-  return FALSE;
-}
-
-static gboolean
-hscale_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
-{
-  is_pressed = FALSE;
-  update_value ();
-  return FALSE;
-}
-
-static void
-hscale_value_changed (GtkRange *range, gpointer user_data)
-{
-  if (!is_pressed)
-    update_value ();
-}
-
-static char *
-hscale_format_value (GtkScale *scale, gdouble value, gpointer user_data)
-{
-  return g_strdup_printf ("%g DPI", value);
-}
-
-static void
-dpi_button_clicked (GtkButton *button, gpointer user_data)
-{
-  gtk_range_set_value (GTK_RANGE (hscale), button_dpi);
-}
-
-GtkWidget *
-do_resolution_independence (GtkWidget *do_widget)
-{
-  GtkWidget *vbox;
-
-  if (window != NULL)
-    goto have_window;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "Resolution Independence");
-  gtk_window_set_icon_name (GTK_WINDOW (window), "gtk-fullscreen");
-
-  g_signal_connect (G_OBJECT (window), "map", G_CALLBACK (window_mapped), NULL);
-  g_signal_connect (G_OBJECT (window), "notify::monitor-num", G_CALLBACK (monitor_num_notify), NULL);
-  g_signal_connect (G_OBJECT (window), "unit-changed", G_CALLBACK (unit_changed), NULL);
-
-  g_signal_connect (window, "destroy",
-                    G_CALLBACK (gtk_widget_destroyed),
-                    &window);
-
-  vbox = gtk_vbox_new (FALSE, gtk_size_em (1));
-
-  label = gtk_label_new (NULL);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-  hscale = gtk_hscale_new_with_range (MIN_DPI, MAX_DPI, STEP_DPI);
-  gtk_box_pack_start (GTK_BOX (vbox), hscale, FALSE, FALSE, 0);
-
-  g_signal_connect (G_OBJECT (hscale), "value-changed", G_CALLBACK (hscale_value_changed), NULL);
-  g_signal_connect (G_OBJECT (hscale), "button-press-event", G_CALLBACK (hscale_button_press_event), NULL);
-  g_signal_connect (G_OBJECT (hscale), "button-release-event", G_CALLBACK (hscale_button_release_event), NULL);
-  g_signal_connect (G_OBJECT (hscale), "format-value", G_CALLBACK (hscale_format_value), NULL);
-
-  gtk_container_add (GTK_CONTAINER (window), vbox);
-  gtk_container_set_border_width (GTK_CONTAINER (window), gtk_size_em (1));
-  gtk_widget_set_size_request (window, GTK_SIZE_ONE_TWELFTH_EM (500), -1);
-  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-  button = gtk_button_new ();
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (dpi_button_clicked), NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-  /* avoid dialogs (e.g. printing) grabbing focus from us */
-  if (window_group == NULL)
-    window_group = gtk_window_group_new ();
-  gtk_window_group_add_window (window_group, GTK_WINDOW (window));
-
-  /* make sure we're on top */
-  gtk_window_set_keep_above (GTK_WINDOW (window), TRUE);
-
- have_window:
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -1,173 +1,101 @@
 /* Rotated Text
 *
- * This demo shows how to use PangoCairo to draw rotated and transformed
- * text.  The right pane shows a rotated GtkLabel widget.
+ * This demo shows how to use GDK and Pango to draw rotated and transformed
+ * text. The use of GdkPangoRenderer in this example is a somewhat advanced
+ * technique; most applications can simply use gdk_draw_layout(). We use
+ * it here mostly because that allows us to work in user coordinates - that is,
+ * coordinates prior to the application of the transformation matrix, rather
+ * than device coordinates.
 *
- * In both cases, a custom PangoCairo shape renderer is installed to draw
- * a red heard using cairo drawing operations instead of the Unicode heart
- * character.
+ * As of GTK+-2.6, the ability to draw transformed and anti-aliased graphics
+ * as shown in this example is only present for text. With GTK+-2.8, a new
+ * graphics system called "Cairo" will be introduced that provides these
+ * capabilities and many more for all types of graphics.
 */
-
+#include <math.h>
 #include <gtk/gtk.h>
-#include <string.h>

 static GtkWidget *window = NULL;

-#define HEART "♥"
-const char text[] = "I ♥ GTK+";
-
-static void
-fancy_shape_renderer (cairo_t        *cr,
-		      PangoAttrShape *attr,
-		      gboolean        do_path,
-		      gpointer        data)
-{
-  double x, y;
-  cairo_get_current_point (cr, &x, &y);
-  cairo_translate (cr, x, y);
-
-  cairo_scale (cr,
-	       (double) attr->ink_rect.width  / PANGO_SCALE,
-	       (double) attr->ink_rect.height / PANGO_SCALE);
-
-  switch (GPOINTER_TO_UINT (attr->data))
-    {
-    case 0x2665: /* U+2665 BLACK HEART SUIT */
-      {
-        cairo_move_to (cr, .5, .0);
-        cairo_line_to (cr, .9, -.4);
-	cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
-	cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
-	cairo_close_path (cr);
-      }
-      break;
-    }
-
-  if (!do_path) {
-    cairo_set_source_rgb (cr, 1., 0., 0.);
-    cairo_fill (cr);
-  }
-}
-
-PangoAttrList *
-create_fancy_attr_list_for_layout (PangoLayout *layout)
-{
-  PangoAttrList *attrs;
-  PangoFontMetrics *metrics;
-  int ascent;
-  PangoRectangle ink_rect, logical_rect;
-  const char *p;
-
-  /* Get font metrics and prepare fancy shape size */
-  metrics = pango_context_get_metrics (pango_layout_get_context (layout),
-				       pango_layout_get_font_description (layout),
-				       NULL);
-  ascent = pango_font_metrics_get_ascent (metrics);
-  logical_rect.x = 0;
-  logical_rect.width = ascent;
-  logical_rect.y = -ascent;
-  logical_rect.height = ascent;
-  ink_rect = logical_rect;
-  pango_font_metrics_unref (metrics);
-
-  /* Set fancy shape attributes for all hearts */
-  attrs = pango_attr_list_new ();
-  for (p = text; (p = strstr (p, HEART)); p += strlen (HEART))
-    {
-      PangoAttribute *attr;
-      
-      attr = pango_attr_shape_new_with_data (&ink_rect,
-					     &logical_rect,
-					     GUINT_TO_POINTER (g_utf8_get_char (p)),
-					     NULL, NULL);
-
-      attr->start_index = p - text;
-      attr->end_index = attr->start_index + strlen (HEART);
-
-      pango_attr_list_insert (attrs, attr);
-    }
-
-  return attrs;
-}
-
 static gboolean
 rotated_text_expose_event (GtkWidget      *widget,
 			   GdkEventExpose *event,
 			   gpointer	   data)
 {
 #define RADIUS 150
-#define N_WORDS 5
-#define FONT "Serif 18"
-
+#define N_WORDS 10
+#define FONT "Sans Bold 27"
+  
+  PangoRenderer *renderer;
+  PangoMatrix matrix = PANGO_MATRIX_INIT;
  PangoContext *context;
  PangoLayout *layout;
  PangoFontDescription *desc;

-  cairo_t *cr;
-  cairo_pattern_t *pattern;
-
-  PangoAttrList *attrs;
-
  int width = widget->allocation.width;
  int height = widget->allocation.height;
  double device_radius;
  int i;

-  /* Create a cairo context and set up a transformation matrix so that the user
-   * space coordinates for the centered square where we draw are [-RADIUS, RADIUS],
-   * [-RADIUS, RADIUS].
-   * We first center, then change the scale. */
-  cr = gdk_cairo_create (widget->window);
+  /* Get the default renderer for the screen, and set it up for drawing  */
+  renderer = gdk_pango_renderer_get_default (gtk_widget_get_screen (widget));
+  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), widget->window);
+  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), widget->style->black_gc);
+
+  /* Set up a transformation matrix so that the user space coordinates for
+   * the centered square where we draw are [-RADIUS, RADIUS], [-RADIUS, RADIUS]
+   * We first center, then change the scale */
  device_radius = MIN (width, height) / 2.;
-  cairo_translate (cr,
-		   device_radius + (width - 2 * device_radius) / 2,
-		   device_radius + (height - 2 * device_radius) / 2);
-  cairo_scale (cr, device_radius / RADIUS, device_radius / RADIUS);
+  pango_matrix_translate (&matrix,
+			  device_radius + (width - 2 * device_radius) / 2,
+			  device_radius + (height - 2 * device_radius) / 2);
+  pango_matrix_scale (&matrix, device_radius / RADIUS, device_radius / RADIUS);

-  /* Create and a subtle gradient source and use it. */
-  pattern = cairo_pattern_create_linear (-RADIUS, -RADIUS, RADIUS, RADIUS);
-  cairo_pattern_add_color_stop_rgb (pattern, 0., .5, .0, .0);
-  cairo_pattern_add_color_stop_rgb (pattern, 1., .0, .0, .5);
-  cairo_set_source (cr, pattern);
-
-  /* Create a PangoContext and set up our shape renderer */
+  /* Create a PangoLayout, set the font and text */
  context = gtk_widget_create_pango_context (widget);
-  pango_cairo_context_set_shape_renderer (context,
-					  fancy_shape_renderer,
-					  NULL, NULL);
-
-  /* Create a PangoLayout, set the text, font, and attributes */
  layout = pango_layout_new (context);
-  pango_layout_set_text (layout, text, -1);
+  pango_layout_set_text (layout, "Text", -1);
  desc = pango_font_description_from_string (FONT);
  pango_layout_set_font_description (layout, desc);
-
-  attrs = create_fancy_attr_list_for_layout (layout);
-  pango_layout_set_attributes (layout, attrs);
-  pango_attr_list_unref (attrs);
+  pango_font_description_free (desc);

  /* Draw the layout N_WORDS times in a circle */
  for (i = 0; i < N_WORDS; i++)
    {
+      GdkColor color;
+      PangoMatrix rotated_matrix = matrix;
      int width, height;
+      double angle = (360. * i) / N_WORDS;

-      /* Inform Pango to re-layout the text with the new transformation matrix */
-      pango_cairo_update_layout (cr, layout);
+      /* Gradient from red at angle == 60 to blue at angle == 300 */
+      color.red   = 65535 * (1 + cos ((angle - 60) * G_PI / 180.)) / 2;
+      color.green = 0;
+      color.blue  = 65535  - color.red;
    
-      pango_layout_get_pixel_size (layout, &width, &height);
-      cairo_move_to (cr, - width / 2, - RADIUS * .9);
-      pango_cairo_show_layout (cr, layout);
+      gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
+					     PANGO_RENDER_PART_FOREGROUND, &color);
+                                             
+      pango_matrix_rotate (&rotated_matrix, angle);

-      /* Rotate for the next turn */
-      cairo_rotate (cr, G_PI*2 / N_WORDS);
+      pango_context_set_matrix (context, &rotated_matrix);
+    
+      /* Inform Pango to re-layout the text with the new transformation matrix */
+      pango_layout_context_changed (layout);
+    
+      pango_layout_get_size (layout, &width, &height);
+      pango_renderer_draw_layout (renderer, layout,
+				  - width / 2, - RADIUS * PANGO_SCALE);
    }

+  /* Clean up default renderer, since it is shared */
+  gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
+					 PANGO_RENDER_PART_FOREGROUND, NULL);
+  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), NULL);
+  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), NULL);
+
  /* free the objects we created */
-  pango_font_description_free (desc);
  g_object_unref (layout);
  g_object_unref (context);
-  cairo_pattern_destroy (pattern);
-  cairo_destroy (cr);
  
  return FALSE;
 }
@@ -175,31 +103,21 @@ rotated_text_expose_event (GtkWidget      *widget,
 GtkWidget *
 do_rotated_text (GtkWidget *do_widget)
 {
+  GtkWidget *drawing_area;
+  
  if (!window)
    {
-      GtkWidget *box;
-      GtkWidget *drawing_area;
-      GtkWidget *label;
-      PangoLayout *layout;
-      PangoAttrList *attrs;
-
      const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
      
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   gtk_size_em ((4 * RADIUS)), gtk_size_em ((4 * RADIUS)));
+
      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

-      box = gtk_hbox_new (TRUE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box);
-
-      /* Add a drawing area */
-
      drawing_area = gtk_drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (box), drawing_area);
+      gtk_container_add (GTK_CONTAINER (window), drawing_area);

      /* This overrides the background color from the theme */
      gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
@@ -207,20 +125,7 @@ do_rotated_text (GtkWidget *do_widget)
      g_signal_connect (drawing_area, "expose-event",
 			G_CALLBACK (rotated_text_expose_event), NULL);

-      /* And a label */
-      label = gtk_label_new (text);
-      gtk_container_add (GTK_CONTAINER (box), label);
-
-      gtk_label_set_angle (label, 45);
-
-      /* Set up fancy stuff on the label */
-      layout = gtk_label_get_layout (label);
-      pango_cairo_context_set_shape_renderer (pango_layout_get_context (layout),
-					      fancy_shape_renderer,
-					      NULL, NULL);
-      attrs = create_fancy_attr_list_for_layout (layout);
-      gtk_label_set_attributes (label, attrs);
-      pango_attr_list_unref (attrs);
+      gtk_window_set_default_size (GTK_WINDOW (window), 2 * RADIUS, 2 * RADIUS);
    }

  if (!GTK_WIDGET_VISIBLE (window))
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -1,283 +0,0 @@
-/* Entry/Search Entry 
- *
- * GtkEntry allows to display icons and progress information. 
- * This demo shows how to use these features in a search entry.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *menu = NULL;
-static GtkWidget *notebook = NULL;
-
-static guint search_progress_id = 0;
-static guint finish_search_id = 0;
-
-static void
-show_find_button (void)
-{
-  gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
-}
-
-static void
-show_cancel_button (void)
-{
-  gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 1);
-}
-
-static gboolean
-search_progress (gpointer data)
-{
-  gtk_entry_progress_pulse (GTK_ENTRY (data));
-
-  return TRUE;
-}
-
-static void
-search_progress_done (GtkEntry *entry)
-{
-  gtk_entry_set_progress_fraction (entry, 0.0);
-}
-
-static gboolean
-finish_search (GtkButton *button)
-{
-  show_find_button ();
-  g_source_remove (search_progress_id);
-  search_progress_id = 0;
-  
-  return FALSE;
-}
-
-static gboolean
-start_search_feedback (gpointer data)
-{
-  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100, 
-                                           (GSourceFunc)search_progress, data,
-                                           (GDestroyNotify)search_progress_done);
-  return FALSE;
-}
-
-static void
-start_search (GtkButton *button, 
-              GtkEntry  *entry)
-{
-  show_cancel_button ();
-  search_progress_id = g_timeout_add_seconds (1, (GSourceFunc)start_search_feedback, entry);
-  finish_search_id = g_timeout_add_seconds (15, (GSourceFunc)finish_search, button);
-}
-
-
-static void
-stop_search (GtkButton *button,
-             gpointer   data)
-{
-  g_source_remove (finish_search_id);
-  finish_search (button);
-}
-
-static void
-icon_press_cb (GtkEntry       *entry, 
-               gint            position,
-               GdkEventButton *event,
-               gpointer        data)
-{
-  if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
-                    event->button, event->time);
-  else 
-    gtk_entry_set_text (entry, "");
-}
-
-static void
-text_changed_cb (GtkEntry   *entry,
-                 GParamSpec *pspec,
-                 GtkWidget  *button)
-{
-  gboolean has_text;
-
-  has_text = gtk_entry_get_text_length (entry) > 0;
-  gtk_entry_set_icon_sensitive (entry, 
-                                GTK_ENTRY_ICON_SECONDARY,
-                                has_text);
-  gtk_widget_set_sensitive (button, has_text);
-}
-
-static void
-activate_cb (GtkEntry  *entry,
-             GtkButton *button)
-{
-  if (search_progress_id != 0)
-    return;
-
-  start_search (button, entry);
-
-}
-
-static void
-search_by_name (GtkWidget *item, 
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_FIND);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by name\n"
-                                   "Click here to change the search type");
-} 
-                
-static void
-search_by_description (GtkWidget *item, 
-                       GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_EDIT);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by description\n"
-                                   "Click here to change the search type");
-} 
-                
-static void
-search_by_file (GtkWidget *item, 
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_OPEN);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by file name\n"
-                                   "Click here to change the search type");
-} 
-
-static void
-search_entry_destroyed (GtkWidget  *widget)
-{
-  if (finish_search_id != 0)
-    g_source_remove (finish_search_id);
-
-  if (search_progress_id != 0)
-    g_source_remove (search_progress_id);
-
-  window = NULL;
-}
-
-                
-GtkWidget *
-do_search_entry (GtkWidget *do_widget)
-{
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *label;
-  GtkWidget *entry;
-  GtkWidget *item;
-  GtkWidget *image;
-  GtkWidget *find_button;
-  GtkWidget *cancel_button;
-  
-  if (!window)
-    {
-      window = gtk_dialog_new_with_buttons ("Search Entry",
-                                            GTK_WINDOW (do_widget),
- 					    0,
-					    GTK_STOCK_CLOSE,
-					    GTK_RESPONSE_NONE,
-					    NULL);
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-      g_signal_connect (window, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (search_entry_destroyed), &window);
-
-      vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      hbox = gtk_hbox_new (FALSE, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
-
-      /* Create our entry */
-      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
-
-      /* Create the find and cancel buttons */
-      notebook = gtk_notebook_new ();
-      gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
-      gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
-      gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE, 0);
-
-      find_button = gtk_button_new_with_label ("Find");
-      g_signal_connect (find_button, "clicked", 
-                        G_CALLBACK (start_search), entry);
-      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), find_button, NULL);
-      gtk_widget_show (find_button);
-
-      cancel_button = gtk_button_new_with_label ("Cancel");
-      g_signal_connect (cancel_button, "clicked", 
-                        G_CALLBACK (stop_search), NULL);
-      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), cancel_button, NULL);
-      gtk_widget_show (cancel_button);
-
-      /* Set up the search icon */
-      search_by_name (NULL, GTK_ENTRY (entry));
-      
-      /* Set up the clear icon */
-      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), 
-                                     GTK_ENTRY_ICON_SECONDARY, 
-                                     GTK_STOCK_CLEAR);
-      text_changed_cb (GTK_ENTRY (entry), NULL, find_button);
-
-      g_signal_connect (entry, "icon-press", 
-                        G_CALLBACK (icon_press_cb), NULL);
-      g_signal_connect (entry, "notify::text", 
-                        G_CALLBACK (text_changed_cb), find_button);
-      g_signal_connect (entry, "activate", 
-                        G_CALLBACK (activate_cb), NULL);
-
-      /* Create the menu */
-      menu = gtk_menu_new ();
-      gtk_menu_attach_to_widget (GTK_MENU (menu), entry, NULL);
-
-      item = gtk_image_menu_item_new_with_label ("Search by name");
-      image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_name), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      item = gtk_image_menu_item_new_with_label ("Search by description");
-      image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_description), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      item = gtk_image_menu_item_new_with_label ("Search by file name");
-      image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_file), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      gtk_widget_show_all (menu);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (menu);
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
-
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -115,9 +115,9 @@ do_sizegroup (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
+      vbox = gtk_vbox_new (FALSE, 5);
      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (5));
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

      size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
      
@@ -127,9 +127,9 @@ do_sizegroup (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);

      table = gtk_table_new (2, 2, FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (table), GTK_SIZE_ONE_TWELFTH_EM (5));
-      gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (5));
-      gtk_table_set_col_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (10));
+      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
      gtk_container_add (GTK_CONTAINER (frame), table);

      add_row (GTK_TABLE (table), 0, size_group, "_Foreground", color_options);
@@ -141,9 +141,9 @@ do_sizegroup (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);

      table = gtk_table_new (2, 2, FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (table), GTK_SIZE_ONE_TWELFTH_EM (5));
-      gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (5));
-      gtk_table_set_col_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (10));
+      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
      gtk_container_add (GTK_CONTAINER (frame), table);

      add_row (GTK_TABLE (table), 0, size_group, "_Dashing", dash_options);
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -420,12 +420,12 @@ do_stock_browser (GtkWidget *do_widget)
      gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Stock Icons and Items");
-      gtk_window_set_default_size (GTK_WINDOW (window), -1, GTK_SIZE_ONE_TWELFTH_EM (500));
+      gtk_window_set_default_size (GTK_WINDOW (window), -1, 500);

      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      hbox = gtk_hbox_new (FALSE, 8);
      gtk_container_add (GTK_CONTAINER (window), hbox);

      sw = gtk_scrolled_window_new (NULL, NULL);
@@ -494,8 +494,8 @@ do_stock_browser (GtkWidget *do_widget)
      frame = gtk_frame_new ("Selected Item");
      gtk_container_add (GTK_CONTAINER (align), frame);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (4));
+      vbox = gtk_vbox_new (FALSE, 8);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
      gtk_container_add (GTK_CONTAINER (frame), vbox);

      display = g_new (StockItemDisplay, 1);
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -1,200 +0,0 @@
-/* Text Widget/Automatic scrolling
- *
- * This example demonstrates how to use the gravity of 
- * GtkTextMarks to keep a text view scrolled to the bottom
- * while appending text.
- */
-
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-/* Scroll to the end of the buffer.
- */
-static gboolean
-scroll_to_end (GtkTextView *textview)
-{
-  GtkTextBuffer *buffer;
-  GtkTextIter iter;
-  GtkTextMark *mark;
-  char *spaces;
-  static int count;
-
-  buffer = gtk_text_view_get_buffer (textview);
-  
-  /* Get "end" mark. It's located at the end of buffer because 
-   * of right gravity
-   */
-  mark = gtk_text_buffer_get_mark (buffer, "end");
-  gtk_text_buffer_get_iter_at_mark (buffer, &iter, mark);
-
-  /* and insert some text at its position, the iter will be 
-   * revalidated after insertion to point to the end of inserted text
-   */
-  spaces = g_strnfill (count++, ' ');
-  gtk_text_buffer_insert (buffer, &iter, "\n", -1);
-  gtk_text_buffer_insert (buffer, &iter, spaces, -1);
-  gtk_text_buffer_insert (buffer, &iter,
-                          "Scroll to end scroll to end scroll "
-                          "to end scroll to end ",
-                          -1);
-  g_free (spaces);
-
-  /* Now scroll the end mark onscreen.
-   */
-  gtk_text_view_scroll_mark_onscreen (textview, mark);
-
-  /* Emulate typewriter behavior, shift to the left if we 
-   * are far enough to the right.
-   */
-  if (count > 150)
-    count = 0;
-
-  return TRUE;
-}
-
-/* Scroll to the bottom of the buffer.
- */
-static gboolean
-scroll_to_bottom (GtkTextView *textview)
-{
-  GtkTextBuffer *buffer;
-  GtkTextIter iter;
-  GtkTextMark *mark;
-  char *spaces;
-  static int count;
-
-  buffer = gtk_text_view_get_buffer (textview);
-  
-  /* Get end iterator */
-  gtk_text_buffer_get_end_iter (buffer, &iter);
-
-  /* and insert some text at it, the iter will be revalidated
-   * after insertion to point to the end of inserted text
-   */
-  spaces = g_strnfill (count++, ' ');
-  gtk_text_buffer_insert (buffer, &iter, "\n", -1);
-  gtk_text_buffer_insert (buffer, &iter, spaces, -1);
-  gtk_text_buffer_insert (buffer, &iter,
-                          "Scroll to bottom scroll to bottom scroll "
-                          "to bottom scroll to bottom",
-                          -1);
-  g_free (spaces);
-
-  /* Move the iterator to the beginning of line, so we don't scroll 
-   * in horizontal direction 
-   */
-  gtk_text_iter_set_line_offset (&iter, 0);
-  
-  /* and place the mark at iter. the mark will stay there after we
-   * insert some text at the end because it has right gravity.
-   */
-  mark = gtk_text_buffer_get_mark (buffer, "scroll");
-  gtk_text_buffer_move_mark (buffer, mark, &iter);
-  
-  /* Scroll the mark onscreen.
-   */
-  gtk_text_view_scroll_mark_onscreen (textview, mark);
-
-  /* Shift text back if we got enough to the right.
-   */
-  if (count > 40)
-    count = 0;
-
-  return TRUE;
-}
-
-static guint
-setup_scroll (GtkTextView *textview,
-              gboolean     to_end)
-{
-  GtkTextBuffer *buffer;
-  GtkTextIter iter;
-
-  buffer = gtk_text_view_get_buffer (textview);
-  gtk_text_buffer_get_end_iter (buffer, &iter);
-
-  if (to_end)
-  {
-    /* If we want to scroll to the end, including horizontal scrolling,
-     * then we just create a mark with right gravity at the end of the 
-     * buffer. It will stay at the end unless explicitely moved with 
-     * gtk_text_buffer_move_mark.
-     */
-    gtk_text_buffer_create_mark (buffer, "end", &iter, FALSE);
-    
-    /* Add scrolling timeout. */
-    return g_timeout_add (50, (GSourceFunc) scroll_to_end, textview);
-  }
-  else
-  {
-    /* If we want to scroll to the bottom, but not scroll horizontally, 
-     * then an end mark won't do the job. Just create a mark so we can 
-     * use it with gtk_text_view_scroll_mark_onscreen, we'll position it
-     * explicitely when needed. Use left gravity so the mark stays where 
-     * we put it after inserting new text.
-     */
-    gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE);
-    
-    /* Add scrolling timeout. */
-    return g_timeout_add (100, (GSourceFunc) scroll_to_bottom, textview);
-  }
-}
-
-static void
-remove_timeout (GtkWidget *window,
-                gpointer   timeout)
-{
-  g_source_remove (GPOINTER_TO_UINT (timeout));
-}
-
-static void
-create_text_view (GtkWidget *hbox,
-                  gboolean   to_end)
-{
-  GtkWidget *swindow;
-  GtkWidget *textview;
-  guint timeout;
-
-  swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE, 0);
-  textview = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (swindow), textview);
-
-  timeout = setup_scroll (GTK_TEXT_VIEW (textview), to_end);
-
-  /* Remove the timeout in destroy handler, so we don't try to
-   * scroll destroyed widget. 
-   */
-  g_signal_connect (textview, "destroy",
-                    G_CALLBACK (remove_timeout),
-                    GUINT_TO_POINTER (timeout));
-}
-
-GtkWidget *
-do_textscroll (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *hbox;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (600), GTK_SIZE_ONE_TWELFTH_EM (400));
-      
-      hbox = gtk_hbox_new (TRUE, GTK_SIZE_ONE_TWELFTH_EM (6));
-      gtk_container_add (GTK_CONTAINER (window), hbox);
-
-      create_text_view (hbox, TRUE);
-      create_text_view (hbox, FALSE);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-      gtk_widget_show_all (window);
-  else
-      gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -114,7 +114,7 @@ create_tags (GtkTextBuffer *buffer)
 			      "justification", GTK_JUSTIFY_RIGHT, NULL);

  gtk_text_buffer_create_tag (buffer, "wide_margins",
-			      "left_margin", GTK_SIZE_ONE_TWELFTH_EM (50), "right_margin", GTK_SIZE_ONE_TWELFTH_EM (50),
+			      "left_margin", 50, "right_margin", 50,
 			      NULL);
  
  gtk_text_buffer_create_tag (buffer, "strikethrough",
@@ -139,9 +139,9 @@ create_tags (GtkTextBuffer *buffer)
  gtk_text_buffer_create_tag (buffer, "rtl_quote",
 			      "wrap_mode", GTK_WRAP_WORD,
 			      "direction", GTK_TEXT_DIR_RTL,
-			      "indent", GTK_SIZE_ONE_TWELFTH_EM (30),
-			      "left_margin", GTK_SIZE_ONE_TWELFTH_EM (20),
-			      "right_margin", GTK_SIZE_ONE_TWELFTH_EM (20),
+			      "indent", 30,
+			      "left_margin", 20,
+			      "right_margin", 20,
 			      NULL);
 }

@@ -155,7 +155,7 @@ insert_text (GtkTextBuffer *buffer)
  GtkTextChildAnchor *anchor;
  char *filename;

-  /* demo_find_file() looks in the current directory first,
+  /* demo_find_file() looks in the the current directory first,
   * so you can run gtk-demo without installing GTK, then looks
   * in the location where the file is installed.
   */
@@ -173,10 +173,7 @@ insert_text (GtkTextBuffer *buffer)
      exit (1);
    }

-  scaled = gdk_pixbuf_scale_simple (pixbuf,
-                                    gtk_size_to_pixel (NULL, 0, GTK_SIZE_ONE_TWELFTH_EM (32)),
-                                    gtk_size_to_pixel (NULL, 0, GTK_SIZE_ONE_TWELFTH_EM (32)),
-                                    GDK_INTERP_BILINEAR);
+  scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR);
  g_object_unref (pixbuf);
  pixbuf = scaled;
  
@@ -353,7 +350,7 @@ insert_text (GtkTextBuffer *buffer)
  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
  gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
  
-  gtk_text_buffer_insert (buffer, &iter, "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text, tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);
+  gtk_text_buffer_insert (buffer, &iter, "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text (doesn't work in GTK 2, but planned), tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);

  /* Apply word_wrap tag to whole buffer */
  gtk_text_buffer_get_bounds (buffer, &start, &end);
@@ -412,7 +409,7 @@ attach_widgets (GtkTextView *text_view)
        {
          widget = gtk_hscale_new (NULL);
          gtk_range_set_range (GTK_RANGE (widget), 0, 100);
-          gtk_widget_set_size_request (widget, GTK_SIZE_ONE_TWELFTH_EM (70), -1);
+          gtk_widget_set_size_request (widget, 70, -1);
        }
      else if (i == 3)
        {
@@ -457,7 +454,7 @@ do_textview (GtkWidget *do_widget)
      gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window),
-				   GTK_SIZE_ONE_TWELFTH_EM (450), GTK_SIZE_ONE_TWELFTH_EM (450));
+				   450, 450);
      
      g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
@@ -466,7 +463,7 @@ do_textview (GtkWidget *do_widget)
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);

      vpaned = gtk_vpaned_new ();
-      gtk_container_set_border_width (GTK_CONTAINER(vpaned), GTK_SIZE_ONE_TWELFTH_EM (5));
+      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
      gtk_container_add (GTK_CONTAINER (window), vpaned);

      /* For convenience, we just use the autocreated buffer from
@@ -537,7 +534,7 @@ recursive_attach_view (int                 depth,
  gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &color);

  align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-  gtk_container_set_border_width (GTK_CONTAINER (align), GTK_SIZE_ONE_TWELFTH_EM (1));
+  gtk_container_set_border_width (GTK_CONTAINER (align), 1);
  
  gtk_container_add (GTK_CONTAINER (event_box), align);
  gtk_container_add (GTK_CONTAINER (align), child_view);
@@ -552,7 +549,6 @@ easter_egg_callback (GtkWidget *button,
                     gpointer   data)
 {
  static GtkWidget *window = NULL;
-  gpointer window_ptr;
  GtkTextBuffer *buffer;
  GtkWidget     *view;
  GtkTextIter    iter;
@@ -590,10 +586,10 @@ easter_egg_callback (GtkWidget *button,
  gtk_container_add (GTK_CONTAINER (window), sw);
  gtk_container_add (GTK_CONTAINER (sw), view);

-  window_ptr = &window;
-  g_object_add_weak_pointer (G_OBJECT (window), window_ptr);
+  g_object_add_weak_pointer (G_OBJECT (window),
+                             (gpointer *) &window);

-  gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (300), GTK_SIZE_ONE_TWELFTH_EM (400));
+  gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);
  
  gtk_widget_show_all (window);
 }
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -291,7 +291,7 @@ add_columns (GtkTreeView *treeview)
  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);

  /* havoc column */
@@ -313,7 +313,7 @@ add_columns (GtkTreeView *treeview)
  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);

  /* tim column */
@@ -336,7 +336,7 @@ add_columns (GtkTreeView *treeview)
  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);

  /* owen column */
@@ -358,7 +358,7 @@ add_columns (GtkTreeView *treeview)
  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);

  /* dave column */
@@ -380,7 +380,7 @@ add_columns (GtkTreeView *treeview)
  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 }

@@ -402,8 +402,8 @@ do_tree_store (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);

-      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
+      vbox = gtk_vbox_new (FALSE, 8);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      gtk_box_pack_start (GTK_BOX (vbox),
@@ -435,7 +435,7 @@ do_tree_store (GtkWidget *do_widget)
      /* expand all rows after the treeview widget has been realized */
      g_signal_connect (treeview, "realize",
 			G_CALLBACK (gtk_tree_view_expand_all), NULL);
-      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (50), GTK_SIZE_ONE_TWELFTH_EM (400));
+      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
    }

  if (!GTK_WIDGET_VISIBLE (window))
--- a/demos/gtk-demo/ui_manager.c
+++ b/demos/gtk-demo/ui_manager.c
@@ -183,12 +183,10 @@ do_ui_manager (GtkWidget *do_widget)

      ui = gtk_ui_manager_new ();
      gtk_ui_manager_insert_action_group (ui, actions, 0);
-      g_object_unref (actions);
      gtk_window_add_accel_group (GTK_WINDOW (window), 
 				  gtk_ui_manager_get_accel_group (ui));
      gtk_window_set_title (GTK_WINDOW (window), "UI Manager");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
      
      if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error))
 	{
@@ -204,7 +202,7 @@ do_ui_manager (GtkWidget *do_widget)
 			  FALSE, FALSE, 0);

      label = gtk_label_new ("Type\n<alt>\nto start");
-      gtk_widget_set_size_request (label, GTK_SIZE_ONE_TWELFTH_EM (200), GTK_SIZE_ONE_TWELFTH_EM (200));
+      gtk_widget_set_size_request (label, 200, 200);
      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
      gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);

@@ -213,8 +211,8 @@ do_ui_manager (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);


-      box2 = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (10));
-      gtk_container_set_border_width (GTK_CONTAINER (box2), GTK_SIZE_ONE_TWELFTH_EM (10));
+      box2 = gtk_vbox_new (FALSE, 10);
+      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);

      button = gtk_button_new_with_label ("close");
@@ -225,7 +223,6 @@ do_ui_manager (GtkWidget *do_widget)
      gtk_widget_grab_default (button);

      gtk_widget_show_all (window);
-      g_object_unref (ui);
    }
  else
    {
--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -20,7 +20,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#include "config.h"
+#include <config.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <math.h>
@@ -225,7 +225,7 @@ main (int argc, char **argv)

 	gtk_container_add (GTK_CONTAINER (window), da);

-	timeout_id = gdk_threads_add_timeout (FRAME_DELAY, timeout, NULL);
+	timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);

 	gtk_widget_show_all (window);
 	gtk_main ();
--- a/demos/pixbuf-init.c
+++ b/demos/pixbuf-init.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
 #include <glib.h>

 #include <sys/stat.h>
--- a/demos/testanimation.c
+++ b/demos/testanimation.c
@@ -18,7 +18,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#include "config.h"
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -301,7 +301,7 @@ start_progressive_loading (GtkWidget *image)
   * The timeout simply simulates a slow data source by inserting
   * pauses in the reading process.
   */
-  lc->load_timeout = gdk_threads_add_timeout (100,
+  lc->load_timeout = g_timeout_add (100,
                                    progressive_timeout,
                                    image);
 }
--- a/demos/testgtk/main.c
+++ b/demos/testgtk/main.c
@@ -189,7 +189,6 @@ load_file (const gchar *filename)

  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
  gtk_text_buffer_apply_tag_by_name (info_buffer, "source", &start, &end);
-  fclose (file);
 }

 gboolean
@@ -228,7 +227,8 @@ button_press_event_cb (GtkTreeView    *tree_view,
 	  gtk_tree_path_free (path);
 	}

-      g_signal_stop_emission_by_name (tree_view, "button-press-event");
+      gtk_signal_emit_stop_by_name (GTK_OBJECT (tree_view),
+				    "button_press_event");
      return TRUE;
    }
  
@@ -329,8 +329,8 @@ create_tree (void)
  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
 			       GTK_TREE_VIEW_COLUMN (column));

-  g_signal_connect (selection, "selection-changed", selection_cb, model);
-  g_signal_connect (tree_view, "button-press-event", G_CALLBACK (button_press_event_cb), model);
+  gtk_signal_connect (GTK_OBJECT (selection), "selection_changed", selection_cb, model);
+  gtk_signal_connect (GTK_OBJECT (tree_view), "button_press_event", GTK_SIGNAL_FUNC (button_press_event_cb), model);

  return tree_view;
 }
@@ -347,8 +347,8 @@ main (int argc, char **argv)
  gtk_init (&argc, &argv);
  
  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  g_signal_connect (window, "destroy",
-                    G_CALLBACK (gtk_main_quit), NULL);
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);

  hbox = gtk_hbox_new (FALSE, 0);
  gtk_container_add (GTK_CONTAINER (window), hbox);
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
 #include <gtk/gtk.h>

 int
@@ -66,7 +66,7 @@ configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
   return FALSE;
 }

-extern void pixbuf_init (void);
+extern void pixbuf_init ();

 int
 main (int argc, char **argv)
--- a/demos/testpixbuf-scale.c
+++ b/demos/testpixbuf-scale.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
 #include <gtk/gtk.h>

 #include <stdio.h>
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -17,13 +17,13 @@
 * Boston, MA 02111-1307, USA.
 */

-#include "config.h"
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf/gdk-pixbuf-loader.h>

 #include "test-inline-pixbufs.h"

@@ -358,11 +358,11 @@ expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
 static void
 config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
 {
-#if 0
 	GdkPixbuf *pixbuf;
    
 	pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");

+#if 0
 	if (((event->width) != gdk_pixbuf_get_width (pixbuf)) ||
 	    ((event->height) != gdk_pixbuf_get_height (pixbuf)))
 		gdk_pixbuf_scale (pixbuf, event->width, event->height);
@@ -383,7 +383,7 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
 	w = gdk_pixbuf_get_width (pixbuf);
 	h = gdk_pixbuf_get_height (pixbuf);

-	window = g_object_new (gtk_window_get_type (),
+	window = gtk_widget_new (gtk_window_get_type (),
 				 "GtkObject::user_data", NULL,
 				 "GtkWindow::type", GTK_WINDOW_TOPLEVEL,
 				 "GtkWindow::title", title ? title : "testrgb",
@@ -504,7 +504,7 @@ progressive_updated_callback (GdkPixbufLoader* loader, guint x, guint y, guint w

 static int readlen = 4096;

-extern void pixbuf_init (void);
+extern void pixbuf_init ();

 void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
 {
@@ -628,7 +628,7 @@ main (int argc, char **argv)

 			status.readlen = readlen;

-                        status.timeout = gdk_threads_add_timeout (100, update_timeout, &status);
+                        status.timeout = g_timeout_add (100, update_timeout, &status);
                }
 #endif
 	}
--- a/docs/.cvsignore
+++ b/docs/.cvsignore
@@ -0,0 +1,21 @@
+Makefile
+Makefile.in
+*.html
+*.dvi
+*.ps
+*.pg
+*.ky
+*.cp
+*.fn
+*.tp
+*.vr
+*.log
+*.aux
+*.toc
+*.cps
+*.fns
+*.vrs
+html
+text
+texinfo.tex
+gtk-config.1
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,9 +1,8 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl

 SUBDIRS = tutorial faq reference tools

-EXTRA_DIST += \
+EXTRA_DIST = \
 	defsformat.txt			\
 	developers.txt			\
 	dnd_internals.txt		\
@@ -19,5 +18,3 @@ EXTRA_DIST += \
 	generation.txt			\
 	gtkdocs_fix			\
 	RELEASE-HOWTO
-
-include $(top_srcdir)/git.mk
--- a/docs/README.linux-fb
+++ b/docs/README.linux-fb
@@ -0,0 +1,157 @@
+
+
+
+
+THIS FILE IS OBSOLETE - use docs/reference/gtk/framebuffer.sgml
+
+
+
+
+
+
+
+About GtkFB:
+------------
+The linux-fb port of Gtk+, also known as GtkFB is an implementation of
+gdk (and therefor gtk) that runs on the linux framebuffer. It runs in
+a single process that doesn't need X. It should run most Gtk+ programs
+without any changes to the source.
+
+Build requirements:
+-------------------
+To run GtkFB programs you will need glib, pango and gtk from cvs
+HEAD. Make sure you update these at the same time, since changes to
+glib and pango often forces changes in gtk+. Pango optionally depends
+on libfribidi, but for normal GtkFB usage that can be ignored.
+
+You also need freetype 2, I recommend that you use freetype 2.0.1 or
+later, as there was some problems with freetype-config in 2.0.
+Make sure that you install freetype before pango, since pango also
+needs it.
+Freetype can be found at ftp://ftp.freetype.org
+
+Hardware requirements:
+----------------------
+You need a graphics card with an availible framebuffer driver that can
+run in 8, 16, 24 or 32 bpp. I use the matroxfb driver, but i.e. vesafb
+should work too. You also need a supported mouse. Currently supported
+is ps2 mouse, ms serial mouse and fidmour touchscreen.
+
+Building and installing:
+------------------------
+First build and install glib and pango as usual, in that order.
+
+Then configure Gtk by running configure (or autogen.sh if running from
+cvs) with --with-gdktarget=linux-fb.
+
+Then compile as ususal: make; make install
+
+Fonts:
+------
+Since GtkFB uses freetype 2 to render fonts it can render truetype and
+postscript type 1 antialiased fonts.
+
+At startup it scans some directories looking for fonts. By default
+it looks in $prefix/lib/ft2fonts, and if you want to change this you
+must add something like:
+
+[PangoFT2]
+FontPath = /usr/share/fonts/default/Type1:/usr/share/fonts/default/TrueType
+
+To your $prefix/etc/pango/pangorc or ~/.pangorc.
+
+You must also set up font aliases for the fonts Sans, Serif and Monotype.
+This is done by creating a $prefix/etc/pango/pangoft2.aliases or
+~/.pangoft2_aliases file. You can also set the name of this file using the
+key AliasFiles in the PangoFT2 section in pangorc.
+
+An example of a font alias file for the urw fontset is:
+sans normal normal normal normal "urw gothic l"
+serif normal normal normal normal "urw palladio l"
+monospace normal normal normal normal "nimbus mono l"
+
+And one using the Windows truetype fonts is:
+sans normal normal normal normal "arial"
+serif normal normal normal normal "times new roman"
+monospace normal normal normal normal "courier new"
+
+A more detailed example can be found in examples/pangoft2.aliases in the
+pango distribution.
+
+Running:
+--------
+To run a program you should only need to start it, but there are some
+things that can cause problems, and some things that can be controlled
+by environment variables. Try testgtk distributed with gtk+ to test
+if things work.
+
+If you use a ps2 mouse, make sure that /dev/psaux is readable and
+writable.
+
+Make sure gpm is not running.
+
+If you don't specify anything GtkFB will start up in the current
+virtual console in the current resolution and bit-depth. This can be
+changed by specifying environment variables:
+
+GDK_VT:
+ unset means open on the current VT.
+ 0-9: open on the specified VT. Make sure you have read/write rights
+      there.
+ new: Allocate a new VT after the last currently used one.
+
+GDK_DISPLAY_MODE:
+ Specifies the name of a mode in /etc/fb.modes that you want to use.
+
+GDK_DISPLAY_DEPTH:
+ Specify the desired bit depth of the framebuffer.
+ 
+GDK_DISPLAY_WIDTH:
+ Specify the desired width of the framebuffer.
+ 
+GDK_DISPLAY_HEIGHT:
+ Specify the desired height of the framebuffer.
+
+GDK_DISPLAY:
+ Specify the framebuffer device to use. Default is /dev/fb0
+
+GDK_MOUSE_TYPE:
+ Specify mouse type. Currently supported is:
+  ps2 - PS/2 mouse
+  imps2 - PS/2 intellimouse (wheelmouse)
+  ms - Microsoft serial mouse
+  fidmour - touch screen
+ Default is ps2.
+
+GDK_KEYBOARD_TYPE:
+ Specify keyboard type. Currently suppored is
+  xlate - normal tty mode keyboard.
+    Quite limited, cannot detect key up/key down events. Doesn't
+    handle ctrl/alt/shift for all keys. This is the default driver,
+    but should not be used in "production" use.
+  raw - read from the tty in RAW mode.
+    Sets the keyboard in RAW mode and handles all the keycodes. This
+    gives correct handling of modifiers and key up/down events. You
+    must be root to use this. If you use this for development or
+    debugging it is recommended to enable magic sysrq handling in the
+    kernel. Then you can use ALT-SysRQ-r to turn the keyboard back to
+    normal mode.
+ Default is xlate.
+
+HACKING:
+--------
+
+Pressing Ctrl-Alt-Return repaints the whole screen.
+Unfortunately this cannot be pressed when using the xlate keyboard
+driver, so instead you can use shift-F1 instead when using this
+driver.
+
+Pressing Ctrl-Alt-BackSpace kills the GtkFB program. (Can't be pressed
+in the xlate driver.
+
+More to be written.
+
+   - Alexander Larsson <alexl@redhat.com>
+     2000/12/06
+
+   
--- a/docs/RELEASE-HOWTO
+++ b/docs/RELEASE-HOWTO
@@ -1,107 +1,45 @@
 How to do a GTK+ release?
 =========================

-Make sure you have suitable versions of autoconf and libtool.
+Make sure you have Owen's special autoconf and libtool RPMs, available at:
+http://people.redhat.com/otaylor/gtk/autotools/.
+
 Also make sure you have the following packages installed with all their
-dependencies:
+dependencies (I used the RPM package names from RedHat 9):
 * gtk-doc
+* linuxdoc-tools
 * docbook-utils
+
 Without those packages make distcheck will *not* pass.


- 0) Go back to a pristine working directory. With git, this works:
-
-    git clean -f -x
-
- 1) autogen and build it, make sure to enable docs by specifying
-    --enable-gtk-doc --enable-man
-
- 2) Update NEWS based on the content of git log; follow the format
-    of prior entries. This includes finding noteworthy new features,
-    collecting summaries for all the fixed bugs that are referenced
-    and collecting all updated translations.
-    Also collect the names of all contributors that are mentioned.
-    We don't discriminate between bug reporters, patch writers,
-    committers, etc. Anybody who is mentioned in ChangeLog gets
-    credits, but only real names, not email addresses or nicknames.
-
- 3) In particular, if this is a major, stable, release, verify that
-    README.in contains the relevant release notes and that the
-    required versions of dependencies in INSTALL.in are in sync
-    with configure.in.
-
- 4) Verify that the version in configure.in has been bumped after the last
-    release. (Note that this is critical, a slip-up here will cause the
-    soname to change).
-
- 5) Make sure that make check is happy (If you don't do it here, make distcheck
-    will also catch it, but it is kind of disheartening to see make distcheck
-    fail due to an extraneous symbol after watching it build the docs for an
-    hour...).
-    Typical problems to expect here (depending on whether this is a devel
-    snapshot or a stable release):
-    * forgotten source files
-    * new symbols missing from .symbols files
-    * symbols that are exported by should be private (static or _-prefixed)
-    * symbols that cause PLT entries. This is either caused by using
-      a in the same library function without including the header or by
-      using a function from a different library, which is not yet allowed
-      by the filter in pltcheck.sh
-
- 6) If this is a devel release, make sure that the docs for new symbols
-    are in good shape. Look at the -unused.txt files and add stuff found
-    there to the corresponding -sections.txt file. Look at the
-    -undocumented.txt files and see if there is anything in there that
-    should be documented. If it is, this may be due to typos in the doc
-    comments in the source. Make sure that all new symbols have proper
-    Since: tags, and that there is an index in the main -docs.sgml for
-    the next stable version.
-
- 7) make distcheck
-
- 8) Fix broken stuff found by 7), repeat
-
- 9) Commit all changes: git commit -a. You will have a bunch of po file
-    changes, NEWS and maybe some doc changes too
-
-10) Now you've got the tarball. Check that the tarball size looks
-    reasonable compared to previous releases. If the size goes down
-    a lot, likely the docs went missing for some reason. Or the translations.
-    If the size goes up by a lot, something else may be wrong.
-
-11) Tag the release. The git command for doing that looks like
-
-    git tag -m "GTK+ 2.12.10" 2.12.10
-
-12) Push the tagged commit upstream. The git command for doing that is
-
-    git push origin refs/tags/2.12.10
-
-13) Bump the version number in configure.in and commit and push this change
-
-14) Upload the tarball to master.gnome.org and run install-module to transfer
-    it to download.gnome.org. If you don't have an account on master.gnome.org,
-    find someone who can do it for you. The command for this looks like
-
-      scp gtk+-2.12.10.tar.gz matthiasc@master.gnome.org:
-      ssh matthiasc@master.gnome.org
-      install-module gtk+-2.12.10.tar.gz
-
-15) Get the .bz2 tarball and the .md5sum files back from master.gnome.org
-    You can probably also create it locally, but I've experienced md5
-    mismatches when doing so.
-
-16) Upload the .gz and .bz2 tarballs and checksums to ftp.gtk.org and put
-    them in the right directory below /ftp/pub. Pay attention to correct
-    ownership, and don't forget to update the LATEST file in the directory.
-
-17) Go to the gnome-announce list archives, find the last announce message,
-    create a new message in the same form, replacing version numbers,
-    commentary at the top about "what this release is about" and the
-    summary of changes.
-
-18) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
-    gtk-devel-list. Set reply-to to gnome-hackers.
-
-19) Add a link to the release announcement to www.gtk.org which lives
-    in the gtk-web cvs module.
+0) Blow away your gtk+ directory, check a new version out
+1) autogen and build it, make sure to enable docs.
+2) Update NEWS based on the various ChangeLog files
+3) Verify that the version in configure.in has been bumped after the last
+release. (Note that this is critical, a slip-up here will cause the soname 
+to change).
+4) Make sure that make check is happy (If you don't do it here, make distcheck
+will also catch it, but it is kind of disheartening to see make distcheck fail
+due to an extraneous symbol after watching it build the docs for an hour...)
+5) Add === Released 2.x.y === at the top of all ChangeLog files
+6) make distcheck
+7) Fix broken stuff found by 5) repeat
+8) cvs commit; you'll have a bunch of po file changes, and maybe some
+doc changes too (NOTE: be sure to use cvs with compression, else you'll
+end up waiting for a long time :).
+9) If 7) fails because someone else committed inbetween, curse, cvs up,
+fix conflicts and go to 5)
+10) type 'cvs tag GTK_2_x_y' in the toplevel directory
+11) You now have the tarball, and the CVS tag, now upload the tarball to
+gnome.org and gtk.org
+12) Go to the gnome-announce list archives, find the last announce message,
+create a new message in the same form, replacing version numbers, commentary
+at the top about "what this release is about" and the Summary of changes.
+13) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
+gtk-devel-list. Set reply-to to gnome-hackers.
+14) Bump the version number in configure.in. 
+15) Create a new milestone in bugzilla and move the remaining bugs from the
+2.x.y milestone over to the new one.
+16) Add a link to the release announcement to www.gtk.org which lives in
+the gtk-web cvs module.
--- a/docs/developers.txt
+++ b/docs/developers.txt
@@ -6,7 +6,7 @@ programming for/with Gtk, having the spirit of a developers FAQ.
 It is also the correct place to list up things that programmers should
 care about in general.

-In the hope that this text might be useful to someone,
+In the hope that this text might be usefull to someone,

        - Tim Janik <timj@gimp.org>
          1998/02/11
@@ -43,7 +43,7 @@ GDK_SELECTION_CLEAR     GtkWidget::selection_clear_event
 GDK_FOCUS_CHANGE        GtkWidget::focus_in_event
                        GtkWidget::focus_out_event

-Events that are assured to have a valid GdkEvent.any.window field are
+Events that are asured to have a valid GdkEvent.any.window field are

 GDK_EXPOSE		GtkWidget::expose_event

@@ -61,7 +61,7 @@ Writing Gdk functions
 ---------------------

 When writing Gdk functions that operate on GdkWindow structures in any
-meaningful sense, that is casting to a GdkWindowPrivate structure for
+maeningfull sense, that is casting to a GdkWindowPrivate structure for
 access to fields other then GdkWindow.user_data, the programmer is
 recommended to check for the GdkWindowPrivate.destroyed field to be ==
 FALSE, especially if the GdkWindowPrivate.xwindow field is used.
--- a/docs/dnd_internals.txt
+++ b/docs/dnd_internals.txt
@@ -112,7 +112,7 @@ Retrieves the selection that will be used to communicate
 the data for the drag context (valid on both source
 and dest sides)

-Cursors and window hierarchies
+Cursors and window heirarchies
 ==============================

 The DND code, when possible (and it isn't possible over
@@ -123,7 +123,7 @@ the cursor is in _ourselves_ so we can ignore the
 drag icon properly. (Oh for OutputOnly windows!)

 To avoid obscene amounts of server traffic (which are only
-slightly observable locally, but would really kill a
+slighly observerable locally, but would really kill a
 session over a slow link), the code in GDK does
 XGetWindowAttributes for every child of the root window at
 the beginning of the drag, then selects with
--- a/docs/faq/.cvsignore
+++ b/docs/faq/.cvsignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.html
+*.dvi
+*.ps
+*.pg
+*.ky
+*.cp
+*.fn
+*.tp
+*.vr
+*.log
+*.aux
+*.toc
+*.cps
+*.fns
+*.vrs
+html
+text
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -1,6 +1,4 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST += 			\
+EXTRA_DIST = 			\
 	gtk-faq.sgml

 if HAVE_DOCBOOK
@@ -38,5 +36,3 @@ dist-hook:
 endif

 .PHONY: html
-
-include $(top_srcdir)/git.mk
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
@@ -429,7 +429,7 @@ in which they need to be installed:</para>

 <itemizedlist spacing=compact>
 <listitem><simpara> pkg-config
-(<ulink url="http://pkg-config.freedesktop.org/wiki">
+(<ulink url="http://www.freedesktop.org/software/pkgconfig">
 pkg-config Site</ulink>)</simpara>
 </listitem>

@@ -789,7 +789,8 @@ disgrace to the widget set will gladly be included.</para>
 <para>The new widgets that get added to GTK+ are generally either
 replacements for existing widgets that are no longer
 deemed to be adequate, or have been developed externally to GTK+ but
-have been widely tested. 
+have been widely tested. One possible avenue for this is via
+<ulink url="http://cvs.gnome.org/lxr/source/libegg/">libegg</ulink>.</para>

 <para>Before you spend months of your valuable time implementing your
 revolutionary widget, it is highly recommended that you get some
@@ -824,8 +825,8 @@ However, bindings for many other languages are available.</para>
 <para>So, after you have installed GTK+ there are a couple of
 things that can ease you into developing applications with
 it. There is the GTK+ Tutorial <ulink
-url="http://library.gnome.org/devel/gtk-tutorial/stable/">
-http://library.gnome.org/devel/gtk-tutorial/stable/</ulink>, which is undergoing
+url="http://www.gtk.org/tutorial/">
+http://www.gtk.org/tutorial/</ulink>, which is undergoing
 development. This will introduce you to writing applications
 using C.</para>

@@ -1635,7 +1636,7 @@ int main(int argc, char *argv[])
  gtk_container_set_border_width(GTK_CONTAINER (window), 10);
 #endif

-  /* add a button to do something useful */
+  /* add a button to do something usefull */
  button = gtk_button_new_with_label("Fork me!");
          
  g_signal_connect(G_OBJECT (button), "clicked",
@@ -2814,7 +2815,7 @@ the Label widget, which can be done using:</para>
 GtkTooltips in itself is not a GtkWidget (though a GtkObject)
 and as such is not attempted to match any widget styles.</para>

-<para>So, your resource file should look something like:</para>
+<para>So, you resource file should look something like:</para>

 <programlisting role="C">
 style "postie"
--- a/docs/faq/gtkfaq.sgml
+++ b/docs/faq/gtkfaq.sgml
--- a/docs/focus_tracking.txt
+++ b/docs/focus_tracking.txt
@@ -97,7 +97,7 @@ F2, F3: together these are exactly the cases where we get

 F4: we get an LeaveNotify with the focus flag set. An
  LeaveNotify with a focus flag set will also be sent if 
-  F==W, so we have to to explicitly test for that case
+  F==W, so we have to to explicity test for that case
  using has_focus_window(W).


--- a/docs/generation.txt
+++ b/docs/generation.txt
@@ -107,7 +107,7 @@ makeenums.pl can be run into two modes:

 2) Generate the enumeration portion of gtk.defs.

-The enumeration portion is added to the boxed type 
+The enumearation portion is added to the boxed type 
 declarations in gtk-boxed.defs to create gtk.defs.

 The makeetypes.awk program takes the gtk.defs file, and
@@ -162,7 +162,7 @@ The possible types are:
 	     GtkDestroyNotify Notify)

 Some of these types map to multiple return values - these
-are marked above with the return types in parentheses.
+are marked above with the return types in parantheses.

 NOTES
 =====
@@ -170,7 +170,7 @@ NOTES
 When autogenerating GTK+ files, the autogenerated
 files are often rebuild resulting in the same result.

-To prevent unnecessary rebuilds of the entire directory, some files
+To prevent unecessary rebuilds of the entire directory, some files
 that multiple other source files depend on are not actually written
 to directly.  Instead, an intermediate file is written, which
 is then compared to the old file, and only if it is different
--- a/docs/gtk-config.txt
+++ b/docs/gtk-config.txt
@@ -1,7 +1,7 @@
 CONFIGURING PACKAGES TO WORK WITH GTK
 -------------------------------------

-Compiling a program successfully against the GTK, GDK, and GLIB
+Compiling a program succesfully against the GTK, GDK, and GLIB
 libraries can require a large number of command line options
 to your compiler and linker that are hard to guess correctly.
 The additional libraries required may, for example, depend on the
--- a/docs/refcounting.txt
+++ b/docs/refcounting.txt
@@ -22,10 +22,10 @@ GtkObjects also provide the following functions:
 GdkWindow
 ---------

-A GdkWindow has to be explicitly destroyed with gdk_window_destroy.
+A GdkWindow has to be explicitely destroyed with gdk_window_destroy.
 This will send out a request to destroy this window and all its
 children, and will decrement the ref_count of the GdkWindow by one.
-Thus, it releases the initial reference created by gdk_window_new.
+Thus, it releases the inital reference created by gdk_window_new.

 All GdkWindows are kept in a hash table to translate from their XId to
 the actual structure and the pointer in the hash table is reflected in
@@ -62,7 +62,7 @@ GdkVisual
 ---------

 There are no *_new or *_destroy functions and the *_ref and *_unref
-functions are no-ops.  GdkVisuals are static structures and thus do not
+functions are noops.  GdkVisuals are static structures and thus do not
 need reference counting.  The ref counting functions are only there
 for extra defensive programming.

@@ -220,13 +220,13 @@ Then, when the user wants to get rid of the window:
  /* The GdkWindow of `window' and all its child GdkWindows are
   * destroyed.
   *
-   * window is unregistered from the toplevel list and its ref_count
-   * drops to zero.  The destroy code of `window' destroys `option_menu'.
+   * window is unregistered from the loplevel list and its ref_count
+   * drops to zero.  The destroy code of `window' destroyes `option_menu'.
   *
   * The destroy code of `option_menu' causes the `menu' to be detached
   * from it and its reference count drops to zero.
   *
-   * The destroy code of `menu' destroys `menu_item'.
+   * The destroy code of `menu' destroyes `menu_item'.
   *
   * The destruction of `menu_item' removes it from its parent, the
   * menu_item->ref_count drops to zero and `menu_item' is finalized (freed).
@@ -241,7 +241,7 @@ Taking care of proper referencing

 There are some cases where referencing of widgets from outside the toolkit
 (on the application side) is needed.
-Once the application performs an operation on a widget that will cause
+Once the application performes an operation on a widget that will cause
 its reference count to drop, if it wants to take further actions on the
 widget, it needs to hold a reference to it.

--- a/docs/reference/.cvsignore
+++ b/docs/reference/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,8 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl

-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
+SUBDIRS = gdk-pixbuf gdk gtk

-GITIGNOREFILES = */*.1
-
-include $(top_srcdir)/git.mk
--- a/docs/reference/gdk-pixbuf/.cvsignore
+++ b/docs/reference/gdk-pixbuf/.cvsignore
@@ -0,0 +1,18 @@
+Makefile
+Makefile.in
+gdk-pixbuf-decl-list.txt
+gdk-pixbuf-decl.txt
+gdk-pixbuf-undocumented.txt
+gdk-pixbuf-unused.txt
+gdk-pixbuf.args
+gdk-pixbuf.hierarchy
+gdk-pixbuf.interfaces
+gdk-pixbuf.prerequisites
+gdk-pixbuf.signals
+deprecated
+html
+xml
+*.stamp
+*.lo
+.libs
+version.xml
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl

 AUTOMAKE_OPTIONS = 1.6

@@ -47,7 +46,7 @@ GTKDOC_LIBS = \


 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml --name-space=gdk_pixbuf
+MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml

 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files =				\
@@ -63,9 +62,7 @@ content_files =				\
 HTML_IMAGES = composite.png

 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS= --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
-
+FIXXREF_OPTIONS=

 include $(top_srcdir)/gtk-doc.make

@@ -79,21 +76,19 @@ EXTRA_DIST += version.xml.in \

 ########################################################################

-if ENABLE_MAN
-
 man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 

+if ENABLE_MAN
+
 %.1 : %.xml 
 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<

-BUILT_EXTRA_DIST = $(man_MANS)
-
 endif

+BUILT_EXTRA_DIST = $(man_MANS)
+
 dist-hook-local: $(BUILT_EXTRA_DIST)
 	files='$(BUILT_EXTRA_DIST)';				\
 	for f in $$files; do					\
 	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
 	  cp $$d/$$f $(distdir) || exit 1; done
-
-include $(top_srcdir)/git.mk
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1
@@ -0,0 +1,118 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "GDK-PIXBUF-CSOURCE" 1 "" "" ""
+.SH NAME
+gdk-pixbuf-csource \- C code generation utility for GdkPixbuf images
+.SH "SYNOPSIS"
+.ad l
+.hy 0
+.HP 19
+\fBgdk\-pixbuf\-csource\fR [options] [image]
+.ad
+.hy
+.ad l
+.hy 0
+.HP 19
+\fBgdk\-pixbuf\-csource\fR [options] \-\-build\-list [[name]\ [image]...]
+.ad
+.hy
+
+.SH "DESCRIPTION"
+
+.PP
+ \fBgdk\-pixbuf\-csource\fR is a small utility that generates C code containing images, useful for compiling images directly into programs\&.
+
+.SH "INVOCATION"
+
+.PP
+ \fBgdk\-pixbuf\-csource\fR either takes as input one image file name to generate code for, or, using the \fB\-\-build\-list\fR option, a list of (\fIname\fR, \fIimage\fR) pairs to generate code for a list of images into named variables\&.
+
+.SS "Options"
+
+.TP
+\fB\-\-stream\fR
+Generate pixbuf data stream (a single string containing a serialized GdkPixdata structure in network byte order)\&.
+
+.TP
+\fB\-\-struct\fR
+Generate GdkPixdata structure (needs the GdkPixdata structure definition from \fIgdk\-pixdata\&.h\fR)\&.
+
+.TP
+\fB\-\-macros\fR
+Generate *_ROWSTRIDE, *_WIDTH, *_HEIGHT, *_BYTES_PER_PIXEL and *_RLE_PIXEL_DATA or *_PIXEL_DATA macro definitions for the image\&.
+
+.TP
+\fB\-\-rle\fR
+Enables run\-length encoding for the generated pixel data (default)\&.
+
+.TP
+\fB\-\-raw\fR
+Disables run\-length encoding for the generated pixel data\&.
+
+.TP
+\fB\-\-extern\fR
+Generate extern symbols\&.
+
+.TP
+\fB\-\-static\fR
+Generate static symbols (default)\&.
+
+.TP
+\fB\-\-decoder\fR
+Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition to decode run\-length encoded image data\&.
+
+.TP
+\fB\-\-name=identifier\fR
+Specifies the identifier name (prefix) for the generated variables or macros (useful only if \fB\-\-build\-list\fR was not specified)\&.
+
+.TP
+\fB\-\-build\-list\fR
+Enables (\fIname\fR, \fIimage\fR) pair parsing mode\&.
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print brief help and exit\&.
+
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version and exit\&.
+
+.TP
+\fB\-\-g\-fatal\-warnings\fR
+Make warnings fatal (causes the program to abort)\&.
+
+.SH "SEE ALSO"
+
+.PP
+The GdkPixbuf documentation, shipped with the Gtk+ distribution, available from www\&.gtk\&.org: \fIhttp://www.gtk.org\fR\&.
+
+.SH "BUGS"
+
+.PP
+The runlength encoder gets out of sync with the pixel boundaries, since it includes the rowstride padding in the encoded stream\&. Furthermore, it generates pixbufs with suboptimal rowstride in some cases\&.
+
+.SH "AUTHOR"
+
+.PP
+ \fBgdk\-pixbuf\-csource\fR was written by Tim Janik <timj@gtk\&.org>\&.
+
+.PP
+This manual page was provided by Tim Janik <timj@gtk\&.org>\&.
+
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
@@ -1,7 +1,3 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
 <refentry id="gdk-pixbuf-csource">

 <refmeta>
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
@@ -1,7 +1,3 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
 <refentry id="gdk-pixbuf-gdk-pixbuf-from-drawables">
 <refmeta>
 <refentrytitle>Drawables to Pixbufs</refentrytitle>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Federico Mena Quintero	7ce5d53807	Let the cleanup function be optional. (TestSpec): Replaced the 2006-08-31 Federico Mena Quintero <federico@novell.com> * tests/autotestfilesystem.c (run_test): Let the cleanup function be optional. (TestSpec): Replaced the "callback_must_be_called" field with a "callback_type" one. This is an enum that indicates whether the callback must be run, must not be run, or is irrelevant. This lets us run self-contained tests with no auxiliary machinery for callbacks. (tests): Added a test for loading a folder. (test_folder_load): New test function. Tests loading a folder, tests that the returned info matches the files on disk, and that the returned list of files is complete with respect to what is on disk. * BRANCHED TO cancelation-changes *	2006-09-01 00:43:04 +00:00
Leonid Kanter	809358f3fa	Updated Russian translation	2006-08-24 16:50:53 +00:00
Josep Puigdemont i Casamajó	152cb78d4d	Updated Catalan translation.	2006-08-24 00:34:15 +00:00
Tor Lillqvist	67b2f9bdac	Slight edit of my last entry.	2006-08-23 23:24:38 +00:00
Federico Mena Quintero	f9f34aef79	Renamed to gtk_file_system_create() so that it will get exported and we 2006-08-23 Federico Mena Quintero <federico@novell.com> * gtk/gtkfilesystem.[ch] (_gtk_file_system_create): Renamed to gtk_file_system_create() so that it will get exported and we can use it in the test program. * gtk/gtk.symbols: Added gtk_file_system_create. * gtk/gtkfilechooserdefault.c (set_file_system_backend): Use gtk_file_system_create(). * tests/autotestfilesystem.c: New file with automatic tests for the async callbacks and cancelation policy of GtkFileSystem. * tests/Makefile.am: Added autotestfilesystem.	2006-08-23 21:59:18 +00:00
Matthias Clasen	12382e191a	fix printer options	2006-08-23 19:34:21 +00:00
Tor Lillqvist	8dc75116e1	Revert accidental translatable string change, use same string for warning 2006-08-23 Tor Lillqvist <tml@novell.com> * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path): Revert accidental translatable string change, use same string for warning as in gtkfilesystemunix.c.	2006-08-23 08:50:27 +00:00
Tor Lillqvist	153bfe9617	Fix logic at the end of strings. 2006-08-23 Tor Lillqvist <tml@novell.com> * gtk/gtkfilesystemwin32.c (_gtk_file_system_win32_path_compare): Fix logic at the end of strings. * gtk/gtkfilesystemwin32.c: Maintain a hash table of live handles and check that we have no outstanding handles at finalization time. (Copying what Matthias did for gtkfilesystemunix.c)	2006-08-23 08:31:02 +00:00
Matthias Clasen	e3a70e1790	Maintain a hash table of live handles and check that we have no 2006-08-23 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfilesystemunix.c: Maintain a hash table of live handles and check that we have no outstanding handles at finalization time. (Copying what Federico did for gtkfilesystemgnomevfs.c)	2006-08-23 06:13:42 +00:00
Subhransu Behera	87fb4e55ba	Updated Oriya Translation	2006-08-23 05:19:02 +00:00
Subhransu Behera	53c0a2e9e1	Added Strings for Updated Oriya Translation	2006-08-23 05:18:38 +00:00