=== Released 2.2.1 ===

Sun Feb 2 10:03:24 2003 Owen Taylor <otaylor@redhat.com> * === Released 2.2.1 === * configure.in: Version 2.2.1, Binary age 201, interface age 1. * NEWS: More updates.
Updated Portuguese translation.
2003-02-02 15:51:04 +00:00 · 2003-02-02 14:18:27 +00:00 · 2003-02-01 20:56:06 +00:00 · 2003-02-01 17:37:25 +00:00 · 2003-02-01 01:49:25 +00:00 · 2003-02-01 01:27:00 +00:00
5687 changed files with 970991 additions and 2829187 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,37 @@
+*.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+-linux-fb-2.0.pc
+gtk+-nanox-2.0.pc
+gtk+-x11-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-pixbuf-2.0.pc
+gdk-pixbuf-2.0-uninstalled.pc
+gtk-zip.sh
+missing
+install-sh
+mkinstalldirs
+sgml
+autom4te.cache
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,82 +0,0 @@
-stages:
-  - build
-  - flatpak
-  - deploy
-
-.cache-paths: &cache-paths
-  paths:
-    - _ccache/
-    - subprojects/gdk-pixbuf/
-    - subprojects/glib/
-    - subprojects/graphene/
-    - subprojects/libepoxy/
-    - subprojects/pango/
-
-fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v1
-  stage: build
-  script:
-    - bash -x ./.gitlab-ci/test-docker.sh
-  artifacts:
-    when: on_failure
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-  cache:
-    key: "$CI_JOB_NAME"
-    <<: *cache-paths
-
-.mingw-defaults: &mingw-defaults
-  stage: build
-  tags:
-    - win32
-  script:
-    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
-  cache:
-    key: "%CI_JOB_NAME%"
-    <<: *cache-paths
-
-msys2-mingw32:
-  variables:
-    MSYSTEM: "MINGW32"
-    CHERE_INVOKING: "yes"
-  <<: *mingw-defaults
-
-.flatpak-defaults: &flatpak-defaults
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-  stage: flatpak
-  artifacts:
-    paths:
-      - "${APPID}-dev.flatpak"
-    expire_in: 1 day
-  script:
-    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
-
-flatpak:demo:
-  variables:
-    APPID: org.gtk.Demo
-  <<: *flatpak-defaults
-
-flatpak:widget-factory:
-  variables:
-    APPID: org.gtk.WidgetFactory
-  <<: *flatpak-defaults
-
-pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v1
-  stage: deploy 
-  script:
-    - meson -Ddocumentation=true _build .
-    - ninja -C _build
-    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-
-    - mkdir -p public/
-    - mv _build/docs/reference/gtk/html/ public/gtk/
-    - mv _build/docs/reference/gdk/html/ public/gdk/
-    - mv _build/docs/reference/gsk/html/ public/gsk/
-  artifacts:
-    paths:
-      - public
-  only:
-    - master
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,81 +0,0 @@
-FROM fedora:28
-
-RUN dnf -y install \
-    hicolor-icon-theme \
-    adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
-    avahi-gobject-devel \
-    cairo-devel \
-    cairo-gobject-devel \
-    ccache \
-    colord-devel \
-    cups-devel \
-    desktop-file-utils \
-    elfutils-libelf-devel \
-    fribidi-devel \
-    gcc \
-    gcc-c++ \
-    gdk-pixbuf2-devel \
-    gdk-pixbuf2-modules \
-    gettext \
-    git \
-    glib2-devel \
-    glibc-devel \
-    glibc-headers \
-    gobject-introspection-devel \
-    graphene-devel \
-    gstreamer1-devel \
-    gstreamer1-plugins-good \
-    gstreamer1-plugins-bad-free-devel \
-    gstreamer1-plugins-base-devel \
-    gtk-doc \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    libattr-devel \
-    libepoxy-devel \
-    libffi-devel \
-    libmount-devel \
-    librsvg2 \
-    libselinux-devel \
-    libXcomposite-devel \
-    libXcursor-devel \
-    libXcursor-devel \
-    libXdamage-devel \
-    libXfixes-devel \
-    libXi-devel \
-    libXinerama-devel \
-    libxkbcommon-devel \
-    libXrandr-devel \
-    libXrender-devel \
-    libxslt \
-    mesa-dri-drivers \
-    mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
-    ninja-build \
-    pango-devel \
-    pcre-devel \
-    python3 \
-    python3-pip \
-    python3-wheel \
-    redhat-rpm-config \
-    sassc \
-    systemtap-sdt-devel \
-    vulkan-devel \
-    wayland-devel \
-    wayland-protocols-devel \
-    which \
-    xorg-x11-server-Xvfb \
- && dnf clean all
-
-RUN pip3 install meson
-
-ARG HOST_USER_ID=5555
-ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-
-USER user
-WORKDIR /home/user
-
-ENV LANG C.UTF-8
--- a/.gitlab-ci/flatpak-build.sh
+++ b/.gitlab-ci/flatpak-build.sh
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-set -e
-
-appid=$1
-
-builddir=app
-repodir=repo
-
-flatpak-builder \
-        --stop-at=gtk \
-        ${builddir} \
-        build-aux/flatpak/${appid}.json
-
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        meson \
-                --prefix /app \
-                --libdir /app/lib \
-                --buildtype debug \
-                -Dx11-backend=true \
-                -Dwayland-backend=true \
-                -Dprint-backends=file \
-                -Dbuild-tests=false \
-                -Dbuild-examples=false \
-                -Dintrospection=false \
-                -Ddemos=true \
-                _build .
-
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        ninja -C _build install
-
-flatpak-builder \
-        --finish-only \
-        --repo=${repodir} \
-        ${builddir} \
-        build-aux/flatpak/${appid}.json
-
-flatpak build-bundle \
-        ${repodir} \
-        ${appid}-dev.flatpak \
-        --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo \
-        ${appid}
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v1"
-
-sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
-    --file "Dockerfile" .
-sudo docker run --rm --security-opt label=disable \
-    --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-    --tty --interactive "${TAG}" bash
--- a/.gitlab-ci/test-docker.sh
+++ b/.gitlab-ci/test-docker.sh
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e
-
-srcdir=$(pwd)
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-ccache --zero-stats
-ccache --show-stats
-export CCACHE_DISABLE=true
-meson \
-        -Dx11-backend=true \
-        -Dwayland-backend=true \
-        -Dbroadway-backend=true \
-        -Dvulkan=yes \
-        _build $srcdir
-unset CCACHE_DISABLE
-
-cd _build
-
-ninja
-ccache --show-stats
-
-xvfb-run -a -s "-screen 0 1024x768x24" \
-    meson test \
-        --print-errorlogs \
-        --suite=gtk+ \
-        --no-suite=gtk+:gsk \
-        --no-suite=gtk+:a11y
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ "$MSYSTEM" == "MINGW32" ]]; then
-    export MSYS2_ARCH="i686"
-else
-    export MSYS2_ARCH="x86_64"
-fi
-
-# Update everything
-pacman --noconfirm -Suy
-
-# Install the required packages
-pacman --noconfirm -S --needed \
-    base-devel \
-    git \
-    mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-pkg-config \
-    mingw-w64-$MSYS2_ARCH-gobject-introspection \
-    mingw-w64-$MSYS2_ARCH-meson \
-    mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
-    mingw-w64-$MSYS2_ARCH-atk \
-    mingw-w64-$MSYS2_ARCH-cairo \
-    mingw-w64-$MSYS2_ARCH-gdk-pixbuf2 \
-    mingw-w64-$MSYS2_ARCH-glib2 \
-    mingw-w64-$MSYS2_ARCH-graphene \
-    mingw-w64-$MSYS2_ARCH-json-glib \
-    mingw-w64-$MSYS2_ARCH-libepoxy \
-    mingw-w64-$MSYS2_ARCH-pango \
-    mingw-w64-$MSYS2_ARCH-fribidi \
-    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-# Build
-ccache --zero-stats
-ccache --show-stats
-export CCACHE_DISABLE=true
-meson \
-    -Denable-x11-backend=false \
-    -Denable-wayland-backend=false \
-    -Denable-win32-backend=true \
-    -Dvulkan=no \
-    _build
-unset CCACHE_DISABLE
-
-ninja -C _build
-ccache --show-stats
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,36 +0,0 @@
-## Steps to reproduce
-
- 1. ...
- 2. ...
- 3. ...
-
-<!--
-  You should try and reproduce with the demos applications available
-  under the `demos` directory, or the test programs in the `tests` directory.
-  Alternatively, please attach a *small and self-contained* example that
-  exhibits the issue.
-->
-
-## Current behavior
-<!--
-  Please describe the current behaviour
-->
-
-## Expected outcome
-<!--
-  Please describe the expected outcome
-->
-
-## Version information
-<!--
- - Which version of GTK+ you are using
- - What operating system and version
-  - For Linux, which distribution
- - If you built GTK+ yourself, the list of options used to configure the build
-->
-
-## Additional information
-<!--
- - Screenshots or screen recordings are useful for visual errors
- - Please report any warning or message printed on the terminal
-->
--- a/.gitlab/issue_templates/Crash.md
+++ b/.gitlab/issue_templates/Crash.md
@@ -1,34 +0,0 @@
-## Steps to reproduce
-
- 1. ...
- 2. ...
- 3. ...
-
-<!--
-  You should try and reproduce with the demos applications available
-  under the `demos` directory, or the test programs in the `tests` directory.
-  Alternatively, please attach a *small and self-contained* example that
-  exhibits the issue.
-->
-
-## Version information
-<!--
- - Which version of GTK+ you are using
- - What operating system and version
-  - for Linux, which distribution
- - If you built GTK+ yourself, the list of options used to configure the build
-->
-
-## Warnings
-<!--
- - If the application generates warning messages before crashing please
-   report them here
-->
-
-## Backtrace
-<!--
- - Attaching a stack trace obtained using GDB is appreciated; follow the
-   instructions on the wiki:
-
-   https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces
-->
--- a/39
+++ b/39
@@ -1,12 +1,12 @@
-Please do not mail any of the authors listed here 
-asking questions about this version of GTK+. 
-
 Original Authors
 ----------------
 Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>

+Please do not mail the original authors asking questions about this 
+version of GTK+.
+
 The GTK+ Team (in alphabetical order)
 -------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
@@ -30,36 +30,3 @@ Owen Taylor       <otaylor@gtk.org>

 There are many others who have contributed patches; we thank them,
 GTK+ is much better because of them.
-
-
-Over time, GTK+ has incorporated some pieces of software which 
-started as independent projects. We list the original authors here:
-
-
-MS-Windows theme engine
-----------------------
-Raymond Penners
-Dom Lachowicz
-
-
-Pixbuf theme engine
-------------------
-Owen Taylor
-
-
-IME input method
----------------
-Takuro Ashie
-Kazuki IWAMOTO
-
-
-Mac OS X backend
----------------
-Anders Carlsson
-
-
-DirectFB backend
----------------
-Denis Oliver Kropp
-Sven Neumann
-Mike Emmel
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,65 +0,0 @@
-If you want to hack on the GTK+ project, you'll need to have the development
-tools appropriate for your operating system, including:
-
- - Python 3.x
- - Meson
- - Ninja
- - Gettext (19.7 or newer)
- - a C99 compatible compiler
-
-Up-to-date instructions about developing GNOME applications and libraries
-can be found here:
-
- * https://developer.gnome.org
-
-Information about using GitLab with GNOME can be found here:
-
- * https://wiki.gnome.org/GitLab
-
-In order to get Git GTK+ installed on your system, you need to have the
-required versions of all the GTK+ dependencies; typically, this means a
-recent version of GLib, Cairo, Pango, and ATK, as well as the platform
-specific dependencies for the windowing system you are using (Wayland, X11,
-Windows, or macOS).
-
-You should start by forking the GTK repository from the GitLab web UI, and
-cloning from your fork:
-
-```ssh
-$ git clone https://gitlab.gnome.org/yourusername/gtk.git
-$ cd gtk
-```
-
-**Note**: if you plan to push changes to back to the main repository and
-have a GNOME account, you can skip the fork, and use the following instead:
-
-```sh
-$ git clone git@gitlab.gnome.org:GNOME/gtk.git
-$ cd gtk
-```
-
-To compile the Git version of GTK+ on your system, you will need to
-configure your build using Meson:
-
-```sh
-$ meson _builddir .
-$ cd _builddir
-$ ninja
-```
-
-**Note**: For information about submitting patches and pushing changes
-to Git, see the `README.md` and `README.commits` files. In particular,
-don't, under any circumstances, push anything to Git before reading and
-understanding `README.commmits`.
-
-Typically, you should work on your own branch:
-
-```sh
-$ git checkout -b your-branch
-```
-
-Once you've finished working on the bug fix or feature, push the branch
-to the Git repository and open a new merge request, to let the GTK
-maintainers review your contribution. The [CODE-OWNERS](./docs-CODE-OWNERS)
-document contains the list of core contributors to GTK and the areas for
-which they are responsible.
--- a/19
+++ b/19
@@ -1,15 +1,15 @@
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991

 Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

 [This is the first released version of the library GPL.  It is
 numbered 2 because it goes with version 2 of the ordinary GPL.]

-                            Preamble
+			    Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -99,7 +99,7 @@ works together with the library.
  Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.

-                  GNU LIBRARY GENERAL PUBLIC LICENSE
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library which
@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.

-                            NO WARRANTY
+			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,7 +434,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.

-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

@@ -463,8 +463,9 @@ convey the exclusion of warranty; and each file should have at least the
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    License along with this library; if not, write to the 
+    Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+    Boston, MA  02111-1307  USA.

 Also add information on how to contact you by electronic and paper mail.

--- a/622
+++ b/622
@@ -0,0 +1,622 @@
+Sun Feb  2 10:03:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 2.2.1 ===
+
+	* configure.in: Version 2.2.1, Binary age 201, interface age 1.
+	
+	* NEWS: More updates.
+
+2003-02-01  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def: Add gdk_screen_get_system_visual. Noticed by Ed
+	Woods.
+
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
+Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
+	on the tab_label before unparenting it, in case the unparent
+	drops the refcount to 0.
+
+Thu Jan 30 23:44:52 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Updates.
+
+Fri Jan 31 00:28:18 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* NEWS: beginning of NEWS for 2.2.1.
+
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96242, patch from Soeren Sandmann).
+
+Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c: Patch from Soeren Sandmann
+	to update the states of the tab label child
+	widgets to match the state of the tabs. 
+	(#93389, Reported by Tommi Komulainen)
+
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper
+	function that sets the icon's and label's packing options and
+	visibility based on toolbar->style.
+
+	(gtk_toolbar_internal_insert_element):
+	(gtk_real_toolbar_style_changed): Make use of
+	set_child_packing_and_visibility() to clean up the code and get
+	the packing right for icon-only/text-only toolbars. (#104679)
+
+	(get_first_child): Remove, and use gtk_bin_get_child() instead.
+
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+	EXTRA_DIST, and from dist rules. (#102231)
+
+Thu Jan 30 16:01:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the 
+	attempt-to-allocate then free code. To handle multiple
+	people allocating colors at the same time, we need
+	to just go ahead and try. (#102213, Shivram U)
+	
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque
+	rectangle using the background color rather than relying on
+	gdk_window_clear_area(), so that the palette works properly with
+	pixmap themes. (#101732)
+
+	* demos/gtk-demo/colorsel.c: Install an "expose_event" handler
+	to fill the drawing area in the background color.
+
+Wed Jan 29 14:11:21 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
+	initialization error for selecting input style (#103549).
+
+Wed Jan 29 17:02:41 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkkeyuni.c (get_decimal_char): Make the 
+	translation of GDK_KP_Decimal dependent on LC_NUMERIC.
+	(#101225)
+
+Wed Jan 29 15:43:56 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+	Make up from the menu bar go to the end of the submenu.
+	(#96114, Ian Peters.)
+
+	* gtk/gtkmenuitem.c (gtk_menu_item_mnemonic_activate): 
+	Only do the select-but-not-activate stuff if the
+	menu is already active. Otherwise, just activate.
+	(#101690, Arvind Samptur)
+
+Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* autogen.sh (have_automake): Fix version in complaint
+	message about automake. (#104366, Rich Burridge)
+
+Mon Jan 27 16:38:13 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove SOEXT stuff; it doesn't work portably.
+
+Mon Jan 27 22:45:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_move): don't handle b if
+	we appended/prepended, send the rows_reordered signal to the 
+	correct level ... (Reported by Matthew Tuck).
+
+Mon Jan 27 22:43:11 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_helper): don't just bail
+	out if the level only has one item, recurse over the child if there
+	is one. (Fixes #100458, reported by Gaël Le Mignot).
+
+Mon Jan 27 22:41:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model),
+	(gtk_tree_view_search_equal_func): make TreeView search handle
+	all types which are transformable by GValue. (Fixes #99803, reported
+	by Muktha Narayan).
+
+Mon Jan 27 22:39:25 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_sort_column_id):
+	*really* handle unsetting the ID. Slightly modified patch from
+	Soeren Sandmann. Fixes #87556, reported by Jarek Dukat.
+
+Mon Jan 27 22:33:43 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Fixes the total GtkTreeSortable mess, and #83195, reported by
+	Jarek Dukat
+
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id),
+	(gtk_tree_store_set_sort_column_id), (gtk_tree_store_set_sort_func),
+	(gtk_tree_store_set_default_sort_func): use the constant
+	GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID instead of -1, make functions
+	work as advertised by the documentation.
+
+	* gtk/gtklistore.c (gtk_list_store_get_sort_column_id),
+	(gtk_list_store_set_sort_column_id), (gtk_list_store_set_sort_func),
+	(gtk_list_store_set_default_sort_func): likewise.
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_set_sort_column_id),
+	(gtk_tree_model_set_sort_func),
+	(gtk_tree_model_sort_set_default_sort_func): make functions work
+	as advertised by the documentation.
+
+Mon Jan 27 22:31:56 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): update focus_column
+	before we decide if we edit. (fixes #100973, reported by Dave Cook).
+
+Mon Jan 27 22:29:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Bug report and test case from Paolo Maggi via IRC.
+
+	* gtk/gtkliststore.c (gtk_list_store_swap): update tail if needed,
+	(gtk_list_store_move): update tail if needed.
+
+Mon Jan 27 16:19:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksocket.c (gtk_socket_filter_func): event->any.window
+	might be NULL. Use gtk_widget_get_display (widget) 
+	(#102860, Thomas Leonard)
+
+Mon Jan 27 15:58:31 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* configure.in: Fix --without-modules/--disable-modules
+ 	confusion that was causing --disable-modules not to work.
+ 	(#102865, Akira Tagoh)
+ 
+ 	* configure.in: Fix problem with plain --with-xinput
+ 	(#104266, Akira Tagoh)
+	
+2003-01-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	move bindings viewport-based when the cursor is invisible.  (#78669)
+
+2003-01-23  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (gtk_toolbar_hide_all): Override hide_all
+	in addition to show_all in order to keep them symmetric. (#102201)
+
+2003-01-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display,
+	gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement.
+	(#104108, Naofumi Yasufuku)
+
+	* gdk/gdk.def: Export the above.
+
+Wed Jan 22 14:23:23 2003  Manish Singh  <yosh@gimp.org>
+
+        * gdk/x11/gdkevents-x11.c (translate_key_event): add a "return" at
+        the end of the function, so there is a statement following the "out"
+        label in all cases (fixes #101961)
+
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "mn" to ALL_LINGUAS.
+
+Wed Jan 15 17:02:18 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_validate_yrange):
+	Fix off-by-one error on the backward iteration loop,
+	that was causing the wrong range to be redrawn.
+	(at least part of #72734)
+
+2003-01-21  Matthias Clasen  <maclas@gmx.de>
+
+	Merge from HEAD.
+
+	* gtk/gtktextview.c (gtk_text_view_size_allocate): Adjust the
+	vadjustment value after changing its bounds.  (fixes #101963 and 
+	#73562)
+
+	* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid 
+	unnecessary roundtrip failures.  (#93500)
+
+2003-01-20  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Amharic (am), Macedonian (mk)
+	and Tamil (ta) to ALL_LINGUAS
+
+2003-01-19  Tor Lillqvist  <tml@iki.fi>
+
+	Fix for #103614 and some other problems with GtkFileSelection on
+	Windows:
+		
+	* gtk/fnmatch.c (get_char): Need to use g_unichar_tolower(), not
+	g_ascii_tolower(). Windows file names are case-insensitive for all
+	Unicode letters.
+
+	* gtk/gtkfilesel.c: Instead of checking for G_OS_WIN32 or
+	G_WITH_CYGWIN, check G_PLATFORM_WIN32. Move inclusion of gtkintl.h
+	earlier, as it includes config.h unconditionally, and gtkprivate.h
+	redefines GTK_LOCALEDIR.
+	(struct _CompletionDirSent): Ifdef out the fields not used on
+	Windows.
+	(compare_utf8_filenames, compare_sys_filenames): Need different
+	comparison implementation for UTF-8 file names and system locale
+	file names on Win32. Cannot simply use g_ascii_strcasecmp(), but
+	need to casefold all Unicode letters.
+	(cmpl_completion_matches, open_dir, correct_parent): Ifdef out
+	variables not used on Win32 to avoid warnings about unused
+	variables.
+	(open_ref_dir): Use g_path_skip_root() to skip past potential
+	drive letter in front of the leading (back)slash.
+	(open_new_dir): Ifdef out use of CompletionDirSent fields not
+	there on Win32.
+	(correct_parent): Bypass inode check also on Cygwin.
+
+2003-01-15  Tor Lillqvist  <tml@iki.fi>
+
+	Fix bug noticed by Alex Shaduri: Tooltips and other
+	GDK_WINDOW_TEMP windows were activated. This looked very odd, and
+	was a regression from earlier versions.
+	
+	* gdk/win32/gdkwindow-win32.c (show_window_internal): Fine-tune
+	behaviour. Don't ever activate GDK_WINDOW_TEMP windows.
+	(gdk_window_move, gdk_window_resize): Add debug logging.
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): When we get a
+	WM_SIZE message for a non-visible (withdrawn) window, don't clear
+	the GDK_WINDOW_STATE_WITHDRAWN bit. The window is still withdrawn
+	even if its size changes.
+
+Wed Jan 15 15:55:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksettings.c: Set the double click speed from
+	XSETTINGS when creating a new GtkSettings object
+	as well as when getting a notify. (#103601, reported
+	by Louis Garcia)
+
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
+2002-12-29  Murray Cumming  <murrayc@usa.net>
+
+	Fixes #102168. Merge from HEAD.
+
+	* gtk/gtkliststore.c, gtktreednd.c, gtktreestore.c:
+	Actually implement the GtkTreeDragSource::row_draggable virtual 
+	function in GtkListStore and GtkTreeStore instead of just checking 
+	whether it's implemented at all. This means that DnD isn't broken by
+	gtkmm's virtual function wrappers. The alternative would be to
+	hard-code the TRUE return value into gtkmm's wrappers, but that's 
+	part of GTK+'s implementation, not it's API.
+
+Tue Jan 14 23:54:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c: fix compiler warning.
+
+Tue Jan 14 23:29:00 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
+	make sure exposed pixbufs are clipped to the exposed area before
+	drawing, which is a slight speedup. (#102379, patch from Soeren
+	Sandmann).
+
+Tue Jan 14 23:26:41 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): silly typo fix,
+	only free scroll_to_path when the complete tree has been validated.
+	This makes sure that we scrolled to the correct path.
+
+Tue Jan 14 23:25:32 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_style_set): update the
+	background of widget->window and bin->window. (Fixes #96650, reported
+	by Dave Camp).
+
+Tue Jan 14 23:24:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_clamp_node_visible): process
+	updates before scrolling, avoiding a "selection streak". (Fixes
+	#101235, patch from Soeren Sandmann).
+
+Tue Jan 14 23:22:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): actually put values
+	in the requisition using gtk_widget_size_request. (Fixes #100172,
+	reported by Kjartan Maraas).
+
+Tue Jan 14 23:19:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): cancel the
+	arrow animation timeout before we actually reorder the rbtree. If
+	we don't do this we can get stuck arrows,
+	(cancel_arrow_animation): new function. (Fixes #93629, part 2,
+	reported and testcase provided by Hans Petter Jansson).
+
+Tue Jan 14 23:18:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeselection.c (gtk_tree_selection_real_modify_range):
+	anchor_path should be start_path, not end_path. (Fixes #102618,
+	patch from Carlos Garnacho Parro).
+
+Tue Jan 14 23:16:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkliststore.c (gtk_list_store_move): also update the tail,
+	only correct new_pos if we don't move to the head/tail.
+
+Tue Jan 14 23:11:55 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_swap): take the path from
+	the parent_iter if depth >= 1, so we send the reordered signal to
+	the correct level, remove debugging printfs which I forgot the remove
+	earlier (2.2.0 shipped with this, oops). (Fixes #103198, Reported and
+	testcase provided by Matthew Tuck).
+
+Tue Jan 14 20:58:44 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (invalite_last_column): split out actual column
+	invalidation into invalite_column(),
+	(gtk_tree_view_size_allocate_columns): invalidate column if the
+	new width is larger than the old width.
+	(fixes #102890, reported by Alex Duggan).
+
+2003-01-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkmain.c: Move inclusion of config.h and gtkintl.h earlier,
+	as gtkprivate.h redefines GTK_LOCALEDIR on Win32, for run-time
+	lookup.
+
+	* gdk/Makefile.am (libgdk_win32_2_0_la_DEPENDENCIES): Depend on
+	gdk.def.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add some missing entries. Thanks to Kenichi SUTO.
+
+2003-01-09  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Implement by setting or clearing the WS_EX_TOOLWINDOW extended
+	window style.
+	(gdk_window_set_type_hint): Add all cases to the switch (not all
+	do anything, though). Handle GDK_WINDOW_TYPE_HINT_TOOLBAR by
+	calling gdk_window_set_skip_taskbar_hint(). This means that GTK
+	won't know that the skip_taskbar hint is on for the window, is
+	this bad?
+
+Wed Jan  8 18:44:21 2003  Manish Singh  <yosh@gimp.org>
+	
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Use correct DLL and import library names, with
+	GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+	(DEVZIP): Add bin/{gdk-pixbuf-query-loaders,gtk-query-immodules-2.0,
+	gtk-demo}.exe and share/gtk-2.0.
+
+	* configure.in: Improve check for dimm.h.
+
+	* configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+	gdk-pixbuf/Makefile.am.
+
+	* gdk-pixbuf/makefile.mingw.in
+	* gdk-pixbuf/pixops/makefile.mingw.in
+	* gdk/makefile.mingw.in
+	* gdk/win32/makefile.mingw.in
+	* gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+	* gdk-pixbuf/Makefile.am
+	* gdk-pixbuf/pixops/Makefile.am
+	* gdk/Makefile.am
+	* gdk/win32/Makefile.am
+	* gtk/Makefile.am
+	* configure.in: Remove makefile.mingw{,.in} from here, too.
+	
+	* README.win32: Updates. Don't mention the now removed
+	makefile.mingw files.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add a couple of missing entries.
+
+	* gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+	* gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+	earlier.
+
+	* gdk/win32/rc/Makefile.am: Add hack to help
+	build/win32/lt-compile-resource decide which kind of libtool
+	object file to produce.
+
+2003-01-05  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	C-Down step through the sequence of paragraph ends (old behaviour
+	included paragraph starts).  (#80340, patch by Narayana Pattipati)
+
+	* gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_first_toggle):
+ 	Check for a tag toggle at the start iterator before calling
+ 	gtk_text_iter_forward_to_tag_toggle().  (#102090, patch by Daniel 
+	Elstner)
+
+2003-01-04  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilesel.h (struct _GtkFileSelection): Add /*< public >*/
+	and /*< private >*/ as appropriate.  (#97211)
+
+2003-01-04  Tor Lillqvist  <tml@iki.fi>
+
+	* Makefile.am (EXTRA_DIST): Don't distribute gtk-zip.sh, but do
+	distribute gtk-zip.sh.in.
+
+	* gtk-zip.sh.in (DEVZIP): Add gdk-pixbuf-csource.exe and .1.
+
+2003-01-02  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkwindow.c (gtk_window_get_focus): Document that it may
+	return NULL.  (#102069)
+
+2003-01-01  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/fnmatch.c (FNMATCH_TEST_CASES): #undef, since having
+	a main() in the library is obviously bad. 
+
+2002-12-27  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_drag_data_received): Place the
+	cursor at drop point.  (#72384)
+	(gtk_text_view_size_allocate): Update the horizontal adjustment
+	value.  (#75694)
+
+2002-12-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix highlighting of
+	selection wrt. to empty lines.  (#90435, #90582, #91619)
+
+	* gtk/gtktextview.c (gtk_text_view_preedit_changed_handler):
+	Keep the cursor on screen.  (#96929)
+
+2002-12-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbuffer.c (paste_from_buffer): 
+	(clipboard_text_received): Let the user action span the insertion
+	and the deletion of the old selection.  (#82844)
+
+2002-12-23  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextiter.c (gtk_text_iter_backward_sentence_starts):
+	Don't call gtk_text_iter_backward_sentence_start() if
+	count is zero.  (#99115)
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Call
+	move_cursor() even if the cursor hasn't moved, since it has the
+	side effect of canceling the selection.  (#81395, #98537, #98333)
+
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+	with empty ranges.  (fixes #101564 and #80637)
+
+2002-12-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that
+	sets the window style and extended window style, and adjusts the
+	width and height to take the window decorations into account
+	earlier. The adjusted width and height used to be ignored. Remove
+	the local x, y, width and height variables, no need to further
+	confuse the code by having local copies. (Partial fix, I hope, for
+	#101588)
+
+	(gdk_window_move): When moving top-level windows, take title bar
+	and border width into account, offsetting the coordinates before
+	calling SetWindowPos().
+
+	(gdk_window_set_decorations, gdk_window_set_functions):
+	Reimplement, taking into account the peculiar semantics of
+	GDK_DECOR_ALL and GDK_FUNC_ALL. (#79036)
+
+	(gdk_window_get_decorations): Implement. (#98981)
+	
+	(gdk_window_set_type_hint): When setting
+	GDK_WINDOW_TYPE_HINT_MENU, call	gdk_window_set_decorations().
+	(#79036)
+
+	* gdk/gdk.def: Add gdk_window_get_decorations. (#98981)
+
+2002-12-21  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_set_background): New static
+	function to set the background of all windows.
+	(gtk_text_view_style_set): Use gtk_text_view_set_background().
+	(gtk_text_view_state_changed): New function; change background
+	according to state.  (#88126)
+
+2002-12-21  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktextview.c (gtk_text_view_move_visually): fix the documentation
+
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -0,0 +1,622 @@
+Sun Feb  2 10:03:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 2.2.1 ===
+
+	* configure.in: Version 2.2.1, Binary age 201, interface age 1.
+	
+	* NEWS: More updates.
+
+2003-02-01  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def: Add gdk_screen_get_system_visual. Noticed by Ed
+	Woods.
+
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
+Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
+	on the tab_label before unparenting it, in case the unparent
+	drops the refcount to 0.
+
+Thu Jan 30 23:44:52 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Updates.
+
+Fri Jan 31 00:28:18 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* NEWS: beginning of NEWS for 2.2.1.
+
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96242, patch from Soeren Sandmann).
+
+Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c: Patch from Soeren Sandmann
+	to update the states of the tab label child
+	widgets to match the state of the tabs. 
+	(#93389, Reported by Tommi Komulainen)
+
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper
+	function that sets the icon's and label's packing options and
+	visibility based on toolbar->style.
+
+	(gtk_toolbar_internal_insert_element):
+	(gtk_real_toolbar_style_changed): Make use of
+	set_child_packing_and_visibility() to clean up the code and get
+	the packing right for icon-only/text-only toolbars. (#104679)
+
+	(get_first_child): Remove, and use gtk_bin_get_child() instead.
+
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+	EXTRA_DIST, and from dist rules. (#102231)
+
+Thu Jan 30 16:01:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the 
+	attempt-to-allocate then free code. To handle multiple
+	people allocating colors at the same time, we need
+	to just go ahead and try. (#102213, Shivram U)
+	
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque
+	rectangle using the background color rather than relying on
+	gdk_window_clear_area(), so that the palette works properly with
+	pixmap themes. (#101732)
+
+	* demos/gtk-demo/colorsel.c: Install an "expose_event" handler
+	to fill the drawing area in the background color.
+
+Wed Jan 29 14:11:21 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
+	initialization error for selecting input style (#103549).
+
+Wed Jan 29 17:02:41 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkkeyuni.c (get_decimal_char): Make the 
+	translation of GDK_KP_Decimal dependent on LC_NUMERIC.
+	(#101225)
+
+Wed Jan 29 15:43:56 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+	Make up from the menu bar go to the end of the submenu.
+	(#96114, Ian Peters.)
+
+	* gtk/gtkmenuitem.c (gtk_menu_item_mnemonic_activate): 
+	Only do the select-but-not-activate stuff if the
+	menu is already active. Otherwise, just activate.
+	(#101690, Arvind Samptur)
+
+Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* autogen.sh (have_automake): Fix version in complaint
+	message about automake. (#104366, Rich Burridge)
+
+Mon Jan 27 16:38:13 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove SOEXT stuff; it doesn't work portably.
+
+Mon Jan 27 22:45:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_move): don't handle b if
+	we appended/prepended, send the rows_reordered signal to the 
+	correct level ... (Reported by Matthew Tuck).
+
+Mon Jan 27 22:43:11 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_helper): don't just bail
+	out if the level only has one item, recurse over the child if there
+	is one. (Fixes #100458, reported by Gaël Le Mignot).
+
+Mon Jan 27 22:41:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model),
+	(gtk_tree_view_search_equal_func): make TreeView search handle
+	all types which are transformable by GValue. (Fixes #99803, reported
+	by Muktha Narayan).
+
+Mon Jan 27 22:39:25 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_sort_column_id):
+	*really* handle unsetting the ID. Slightly modified patch from
+	Soeren Sandmann. Fixes #87556, reported by Jarek Dukat.
+
+Mon Jan 27 22:33:43 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Fixes the total GtkTreeSortable mess, and #83195, reported by
+	Jarek Dukat
+
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id),
+	(gtk_tree_store_set_sort_column_id), (gtk_tree_store_set_sort_func),
+	(gtk_tree_store_set_default_sort_func): use the constant
+	GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID instead of -1, make functions
+	work as advertised by the documentation.
+
+	* gtk/gtklistore.c (gtk_list_store_get_sort_column_id),
+	(gtk_list_store_set_sort_column_id), (gtk_list_store_set_sort_func),
+	(gtk_list_store_set_default_sort_func): likewise.
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_set_sort_column_id),
+	(gtk_tree_model_set_sort_func),
+	(gtk_tree_model_sort_set_default_sort_func): make functions work
+	as advertised by the documentation.
+
+Mon Jan 27 22:31:56 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): update focus_column
+	before we decide if we edit. (fixes #100973, reported by Dave Cook).
+
+Mon Jan 27 22:29:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Bug report and test case from Paolo Maggi via IRC.
+
+	* gtk/gtkliststore.c (gtk_list_store_swap): update tail if needed,
+	(gtk_list_store_move): update tail if needed.
+
+Mon Jan 27 16:19:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksocket.c (gtk_socket_filter_func): event->any.window
+	might be NULL. Use gtk_widget_get_display (widget) 
+	(#102860, Thomas Leonard)
+
+Mon Jan 27 15:58:31 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* configure.in: Fix --without-modules/--disable-modules
+ 	confusion that was causing --disable-modules not to work.
+ 	(#102865, Akira Tagoh)
+ 
+ 	* configure.in: Fix problem with plain --with-xinput
+ 	(#104266, Akira Tagoh)
+	
+2003-01-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	move bindings viewport-based when the cursor is invisible.  (#78669)
+
+2003-01-23  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (gtk_toolbar_hide_all): Override hide_all
+	in addition to show_all in order to keep them symmetric. (#102201)
+
+2003-01-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display,
+	gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement.
+	(#104108, Naofumi Yasufuku)
+
+	* gdk/gdk.def: Export the above.
+
+Wed Jan 22 14:23:23 2003  Manish Singh  <yosh@gimp.org>
+
+        * gdk/x11/gdkevents-x11.c (translate_key_event): add a "return" at
+        the end of the function, so there is a statement following the "out"
+        label in all cases (fixes #101961)
+
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "mn" to ALL_LINGUAS.
+
+Wed Jan 15 17:02:18 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_validate_yrange):
+	Fix off-by-one error on the backward iteration loop,
+	that was causing the wrong range to be redrawn.
+	(at least part of #72734)
+
+2003-01-21  Matthias Clasen  <maclas@gmx.de>
+
+	Merge from HEAD.
+
+	* gtk/gtktextview.c (gtk_text_view_size_allocate): Adjust the
+	vadjustment value after changing its bounds.  (fixes #101963 and 
+	#73562)
+
+	* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid 
+	unnecessary roundtrip failures.  (#93500)
+
+2003-01-20  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Amharic (am), Macedonian (mk)
+	and Tamil (ta) to ALL_LINGUAS
+
+2003-01-19  Tor Lillqvist  <tml@iki.fi>
+
+	Fix for #103614 and some other problems with GtkFileSelection on
+	Windows:
+		
+	* gtk/fnmatch.c (get_char): Need to use g_unichar_tolower(), not
+	g_ascii_tolower(). Windows file names are case-insensitive for all
+	Unicode letters.
+
+	* gtk/gtkfilesel.c: Instead of checking for G_OS_WIN32 or
+	G_WITH_CYGWIN, check G_PLATFORM_WIN32. Move inclusion of gtkintl.h
+	earlier, as it includes config.h unconditionally, and gtkprivate.h
+	redefines GTK_LOCALEDIR.
+	(struct _CompletionDirSent): Ifdef out the fields not used on
+	Windows.
+	(compare_utf8_filenames, compare_sys_filenames): Need different
+	comparison implementation for UTF-8 file names and system locale
+	file names on Win32. Cannot simply use g_ascii_strcasecmp(), but
+	need to casefold all Unicode letters.
+	(cmpl_completion_matches, open_dir, correct_parent): Ifdef out
+	variables not used on Win32 to avoid warnings about unused
+	variables.
+	(open_ref_dir): Use g_path_skip_root() to skip past potential
+	drive letter in front of the leading (back)slash.
+	(open_new_dir): Ifdef out use of CompletionDirSent fields not
+	there on Win32.
+	(correct_parent): Bypass inode check also on Cygwin.
+
+2003-01-15  Tor Lillqvist  <tml@iki.fi>
+
+	Fix bug noticed by Alex Shaduri: Tooltips and other
+	GDK_WINDOW_TEMP windows were activated. This looked very odd, and
+	was a regression from earlier versions.
+	
+	* gdk/win32/gdkwindow-win32.c (show_window_internal): Fine-tune
+	behaviour. Don't ever activate GDK_WINDOW_TEMP windows.
+	(gdk_window_move, gdk_window_resize): Add debug logging.
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): When we get a
+	WM_SIZE message for a non-visible (withdrawn) window, don't clear
+	the GDK_WINDOW_STATE_WITHDRAWN bit. The window is still withdrawn
+	even if its size changes.
+
+Wed Jan 15 15:55:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksettings.c: Set the double click speed from
+	XSETTINGS when creating a new GtkSettings object
+	as well as when getting a notify. (#103601, reported
+	by Louis Garcia)
+
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
+2002-12-29  Murray Cumming  <murrayc@usa.net>
+
+	Fixes #102168. Merge from HEAD.
+
+	* gtk/gtkliststore.c, gtktreednd.c, gtktreestore.c:
+	Actually implement the GtkTreeDragSource::row_draggable virtual 
+	function in GtkListStore and GtkTreeStore instead of just checking 
+	whether it's implemented at all. This means that DnD isn't broken by
+	gtkmm's virtual function wrappers. The alternative would be to
+	hard-code the TRUE return value into gtkmm's wrappers, but that's 
+	part of GTK+'s implementation, not it's API.
+
+Tue Jan 14 23:54:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c: fix compiler warning.
+
+Tue Jan 14 23:29:00 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
+	make sure exposed pixbufs are clipped to the exposed area before
+	drawing, which is a slight speedup. (#102379, patch from Soeren
+	Sandmann).
+
+Tue Jan 14 23:26:41 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): silly typo fix,
+	only free scroll_to_path when the complete tree has been validated.
+	This makes sure that we scrolled to the correct path.
+
+Tue Jan 14 23:25:32 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_style_set): update the
+	background of widget->window and bin->window. (Fixes #96650, reported
+	by Dave Camp).
+
+Tue Jan 14 23:24:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_clamp_node_visible): process
+	updates before scrolling, avoiding a "selection streak". (Fixes
+	#101235, patch from Soeren Sandmann).
+
+Tue Jan 14 23:22:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): actually put values
+	in the requisition using gtk_widget_size_request. (Fixes #100172,
+	reported by Kjartan Maraas).
+
+Tue Jan 14 23:19:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): cancel the
+	arrow animation timeout before we actually reorder the rbtree. If
+	we don't do this we can get stuck arrows,
+	(cancel_arrow_animation): new function. (Fixes #93629, part 2,
+	reported and testcase provided by Hans Petter Jansson).
+
+Tue Jan 14 23:18:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeselection.c (gtk_tree_selection_real_modify_range):
+	anchor_path should be start_path, not end_path. (Fixes #102618,
+	patch from Carlos Garnacho Parro).
+
+Tue Jan 14 23:16:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkliststore.c (gtk_list_store_move): also update the tail,
+	only correct new_pos if we don't move to the head/tail.
+
+Tue Jan 14 23:11:55 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_swap): take the path from
+	the parent_iter if depth >= 1, so we send the reordered signal to
+	the correct level, remove debugging printfs which I forgot the remove
+	earlier (2.2.0 shipped with this, oops). (Fixes #103198, Reported and
+	testcase provided by Matthew Tuck).
+
+Tue Jan 14 20:58:44 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (invalite_last_column): split out actual column
+	invalidation into invalite_column(),
+	(gtk_tree_view_size_allocate_columns): invalidate column if the
+	new width is larger than the old width.
+	(fixes #102890, reported by Alex Duggan).
+
+2003-01-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkmain.c: Move inclusion of config.h and gtkintl.h earlier,
+	as gtkprivate.h redefines GTK_LOCALEDIR on Win32, for run-time
+	lookup.
+
+	* gdk/Makefile.am (libgdk_win32_2_0_la_DEPENDENCIES): Depend on
+	gdk.def.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add some missing entries. Thanks to Kenichi SUTO.
+
+2003-01-09  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Implement by setting or clearing the WS_EX_TOOLWINDOW extended
+	window style.
+	(gdk_window_set_type_hint): Add all cases to the switch (not all
+	do anything, though). Handle GDK_WINDOW_TYPE_HINT_TOOLBAR by
+	calling gdk_window_set_skip_taskbar_hint(). This means that GTK
+	won't know that the skip_taskbar hint is on for the window, is
+	this bad?
+
+Wed Jan  8 18:44:21 2003  Manish Singh  <yosh@gimp.org>
+	
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Use correct DLL and import library names, with
+	GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+	(DEVZIP): Add bin/{gdk-pixbuf-query-loaders,gtk-query-immodules-2.0,
+	gtk-demo}.exe and share/gtk-2.0.
+
+	* configure.in: Improve check for dimm.h.
+
+	* configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+	gdk-pixbuf/Makefile.am.
+
+	* gdk-pixbuf/makefile.mingw.in
+	* gdk-pixbuf/pixops/makefile.mingw.in
+	* gdk/makefile.mingw.in
+	* gdk/win32/makefile.mingw.in
+	* gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+	* gdk-pixbuf/Makefile.am
+	* gdk-pixbuf/pixops/Makefile.am
+	* gdk/Makefile.am
+	* gdk/win32/Makefile.am
+	* gtk/Makefile.am
+	* configure.in: Remove makefile.mingw{,.in} from here, too.
+	
+	* README.win32: Updates. Don't mention the now removed
+	makefile.mingw files.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add a couple of missing entries.
+
+	* gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+	* gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+	earlier.
+
+	* gdk/win32/rc/Makefile.am: Add hack to help
+	build/win32/lt-compile-resource decide which kind of libtool
+	object file to produce.
+
+2003-01-05  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	C-Down step through the sequence of paragraph ends (old behaviour
+	included paragraph starts).  (#80340, patch by Narayana Pattipati)
+
+	* gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_first_toggle):
+ 	Check for a tag toggle at the start iterator before calling
+ 	gtk_text_iter_forward_to_tag_toggle().  (#102090, patch by Daniel 
+	Elstner)
+
+2003-01-04  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilesel.h (struct _GtkFileSelection): Add /*< public >*/
+	and /*< private >*/ as appropriate.  (#97211)
+
+2003-01-04  Tor Lillqvist  <tml@iki.fi>
+
+	* Makefile.am (EXTRA_DIST): Don't distribute gtk-zip.sh, but do
+	distribute gtk-zip.sh.in.
+
+	* gtk-zip.sh.in (DEVZIP): Add gdk-pixbuf-csource.exe and .1.
+
+2003-01-02  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkwindow.c (gtk_window_get_focus): Document that it may
+	return NULL.  (#102069)
+
+2003-01-01  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/fnmatch.c (FNMATCH_TEST_CASES): #undef, since having
+	a main() in the library is obviously bad. 
+
+2002-12-27  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_drag_data_received): Place the
+	cursor at drop point.  (#72384)
+	(gtk_text_view_size_allocate): Update the horizontal adjustment
+	value.  (#75694)
+
+2002-12-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix highlighting of
+	selection wrt. to empty lines.  (#90435, #90582, #91619)
+
+	* gtk/gtktextview.c (gtk_text_view_preedit_changed_handler):
+	Keep the cursor on screen.  (#96929)
+
+2002-12-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbuffer.c (paste_from_buffer): 
+	(clipboard_text_received): Let the user action span the insertion
+	and the deletion of the old selection.  (#82844)
+
+2002-12-23  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextiter.c (gtk_text_iter_backward_sentence_starts):
+	Don't call gtk_text_iter_backward_sentence_start() if
+	count is zero.  (#99115)
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Call
+	move_cursor() even if the cursor hasn't moved, since it has the
+	side effect of canceling the selection.  (#81395, #98537, #98333)
+
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+	with empty ranges.  (fixes #101564 and #80637)
+
+2002-12-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that
+	sets the window style and extended window style, and adjusts the
+	width and height to take the window decorations into account
+	earlier. The adjusted width and height used to be ignored. Remove
+	the local x, y, width and height variables, no need to further
+	confuse the code by having local copies. (Partial fix, I hope, for
+	#101588)
+
+	(gdk_window_move): When moving top-level windows, take title bar
+	and border width into account, offsetting the coordinates before
+	calling SetWindowPos().
+
+	(gdk_window_set_decorations, gdk_window_set_functions):
+	Reimplement, taking into account the peculiar semantics of
+	GDK_DECOR_ALL and GDK_FUNC_ALL. (#79036)
+
+	(gdk_window_get_decorations): Implement. (#98981)
+	
+	(gdk_window_set_type_hint): When setting
+	GDK_WINDOW_TYPE_HINT_MENU, call	gdk_window_set_decorations().
+	(#79036)
+
+	* gdk/gdk.def: Add gdk_window_get_decorations. (#98981)
+
+2002-12-21  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_set_background): New static
+	function to set the background of all windows.
+	(gtk_text_view_style_set): Use gtk_text_view_set_background().
+	(gtk_text_view_state_changed): New function; change background
+	according to state.  (#88126)
+
+2002-12-21  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktextview.c (gtk_text_view_move_visually): fix the documentation
+
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -0,0 +1,622 @@
+Sun Feb  2 10:03:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 2.2.1 ===
+
+	* configure.in: Version 2.2.1, Binary age 201, interface age 1.
+	
+	* NEWS: More updates.
+
+2003-02-01  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def: Add gdk_screen_get_system_visual. Noticed by Ed
+	Woods.
+
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
+Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
+	on the tab_label before unparenting it, in case the unparent
+	drops the refcount to 0.
+
+Thu Jan 30 23:44:52 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Updates.
+
+Fri Jan 31 00:28:18 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* NEWS: beginning of NEWS for 2.2.1.
+
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96242, patch from Soeren Sandmann).
+
+Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c: Patch from Soeren Sandmann
+	to update the states of the tab label child
+	widgets to match the state of the tabs. 
+	(#93389, Reported by Tommi Komulainen)
+
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper
+	function that sets the icon's and label's packing options and
+	visibility based on toolbar->style.
+
+	(gtk_toolbar_internal_insert_element):
+	(gtk_real_toolbar_style_changed): Make use of
+	set_child_packing_and_visibility() to clean up the code and get
+	the packing right for icon-only/text-only toolbars. (#104679)
+
+	(get_first_child): Remove, and use gtk_bin_get_child() instead.
+
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+	EXTRA_DIST, and from dist rules. (#102231)
+
+Thu Jan 30 16:01:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the 
+	attempt-to-allocate then free code. To handle multiple
+	people allocating colors at the same time, we need
+	to just go ahead and try. (#102213, Shivram U)
+	
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque
+	rectangle using the background color rather than relying on
+	gdk_window_clear_area(), so that the palette works properly with
+	pixmap themes. (#101732)
+
+	* demos/gtk-demo/colorsel.c: Install an "expose_event" handler
+	to fill the drawing area in the background color.
+
+Wed Jan 29 14:11:21 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
+	initialization error for selecting input style (#103549).
+
+Wed Jan 29 17:02:41 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkkeyuni.c (get_decimal_char): Make the 
+	translation of GDK_KP_Decimal dependent on LC_NUMERIC.
+	(#101225)
+
+Wed Jan 29 15:43:56 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+	Make up from the menu bar go to the end of the submenu.
+	(#96114, Ian Peters.)
+
+	* gtk/gtkmenuitem.c (gtk_menu_item_mnemonic_activate): 
+	Only do the select-but-not-activate stuff if the
+	menu is already active. Otherwise, just activate.
+	(#101690, Arvind Samptur)
+
+Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* autogen.sh (have_automake): Fix version in complaint
+	message about automake. (#104366, Rich Burridge)
+
+Mon Jan 27 16:38:13 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove SOEXT stuff; it doesn't work portably.
+
+Mon Jan 27 22:45:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_move): don't handle b if
+	we appended/prepended, send the rows_reordered signal to the 
+	correct level ... (Reported by Matthew Tuck).
+
+Mon Jan 27 22:43:11 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_helper): don't just bail
+	out if the level only has one item, recurse over the child if there
+	is one. (Fixes #100458, reported by Gaël Le Mignot).
+
+Mon Jan 27 22:41:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model),
+	(gtk_tree_view_search_equal_func): make TreeView search handle
+	all types which are transformable by GValue. (Fixes #99803, reported
+	by Muktha Narayan).
+
+Mon Jan 27 22:39:25 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_sort_column_id):
+	*really* handle unsetting the ID. Slightly modified patch from
+	Soeren Sandmann. Fixes #87556, reported by Jarek Dukat.
+
+Mon Jan 27 22:33:43 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Fixes the total GtkTreeSortable mess, and #83195, reported by
+	Jarek Dukat
+
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id),
+	(gtk_tree_store_set_sort_column_id), (gtk_tree_store_set_sort_func),
+	(gtk_tree_store_set_default_sort_func): use the constant
+	GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID instead of -1, make functions
+	work as advertised by the documentation.
+
+	* gtk/gtklistore.c (gtk_list_store_get_sort_column_id),
+	(gtk_list_store_set_sort_column_id), (gtk_list_store_set_sort_func),
+	(gtk_list_store_set_default_sort_func): likewise.
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_set_sort_column_id),
+	(gtk_tree_model_set_sort_func),
+	(gtk_tree_model_sort_set_default_sort_func): make functions work
+	as advertised by the documentation.
+
+Mon Jan 27 22:31:56 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): update focus_column
+	before we decide if we edit. (fixes #100973, reported by Dave Cook).
+
+Mon Jan 27 22:29:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Bug report and test case from Paolo Maggi via IRC.
+
+	* gtk/gtkliststore.c (gtk_list_store_swap): update tail if needed,
+	(gtk_list_store_move): update tail if needed.
+
+Mon Jan 27 16:19:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksocket.c (gtk_socket_filter_func): event->any.window
+	might be NULL. Use gtk_widget_get_display (widget) 
+	(#102860, Thomas Leonard)
+
+Mon Jan 27 15:58:31 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* configure.in: Fix --without-modules/--disable-modules
+ 	confusion that was causing --disable-modules not to work.
+ 	(#102865, Akira Tagoh)
+ 
+ 	* configure.in: Fix problem with plain --with-xinput
+ 	(#104266, Akira Tagoh)
+	
+2003-01-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	move bindings viewport-based when the cursor is invisible.  (#78669)
+
+2003-01-23  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (gtk_toolbar_hide_all): Override hide_all
+	in addition to show_all in order to keep them symmetric. (#102201)
+
+2003-01-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display,
+	gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement.
+	(#104108, Naofumi Yasufuku)
+
+	* gdk/gdk.def: Export the above.
+
+Wed Jan 22 14:23:23 2003  Manish Singh  <yosh@gimp.org>
+
+        * gdk/x11/gdkevents-x11.c (translate_key_event): add a "return" at
+        the end of the function, so there is a statement following the "out"
+        label in all cases (fixes #101961)
+
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "mn" to ALL_LINGUAS.
+
+Wed Jan 15 17:02:18 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_validate_yrange):
+	Fix off-by-one error on the backward iteration loop,
+	that was causing the wrong range to be redrawn.
+	(at least part of #72734)
+
+2003-01-21  Matthias Clasen  <maclas@gmx.de>
+
+	Merge from HEAD.
+
+	* gtk/gtktextview.c (gtk_text_view_size_allocate): Adjust the
+	vadjustment value after changing its bounds.  (fixes #101963 and 
+	#73562)
+
+	* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid 
+	unnecessary roundtrip failures.  (#93500)
+
+2003-01-20  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Amharic (am), Macedonian (mk)
+	and Tamil (ta) to ALL_LINGUAS
+
+2003-01-19  Tor Lillqvist  <tml@iki.fi>
+
+	Fix for #103614 and some other problems with GtkFileSelection on
+	Windows:
+		
+	* gtk/fnmatch.c (get_char): Need to use g_unichar_tolower(), not
+	g_ascii_tolower(). Windows file names are case-insensitive for all
+	Unicode letters.
+
+	* gtk/gtkfilesel.c: Instead of checking for G_OS_WIN32 or
+	G_WITH_CYGWIN, check G_PLATFORM_WIN32. Move inclusion of gtkintl.h
+	earlier, as it includes config.h unconditionally, and gtkprivate.h
+	redefines GTK_LOCALEDIR.
+	(struct _CompletionDirSent): Ifdef out the fields not used on
+	Windows.
+	(compare_utf8_filenames, compare_sys_filenames): Need different
+	comparison implementation for UTF-8 file names and system locale
+	file names on Win32. Cannot simply use g_ascii_strcasecmp(), but
+	need to casefold all Unicode letters.
+	(cmpl_completion_matches, open_dir, correct_parent): Ifdef out
+	variables not used on Win32 to avoid warnings about unused
+	variables.
+	(open_ref_dir): Use g_path_skip_root() to skip past potential
+	drive letter in front of the leading (back)slash.
+	(open_new_dir): Ifdef out use of CompletionDirSent fields not
+	there on Win32.
+	(correct_parent): Bypass inode check also on Cygwin.
+
+2003-01-15  Tor Lillqvist  <tml@iki.fi>
+
+	Fix bug noticed by Alex Shaduri: Tooltips and other
+	GDK_WINDOW_TEMP windows were activated. This looked very odd, and
+	was a regression from earlier versions.
+	
+	* gdk/win32/gdkwindow-win32.c (show_window_internal): Fine-tune
+	behaviour. Don't ever activate GDK_WINDOW_TEMP windows.
+	(gdk_window_move, gdk_window_resize): Add debug logging.
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): When we get a
+	WM_SIZE message for a non-visible (withdrawn) window, don't clear
+	the GDK_WINDOW_STATE_WITHDRAWN bit. The window is still withdrawn
+	even if its size changes.
+
+Wed Jan 15 15:55:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksettings.c: Set the double click speed from
+	XSETTINGS when creating a new GtkSettings object
+	as well as when getting a notify. (#103601, reported
+	by Louis Garcia)
+
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
+2002-12-29  Murray Cumming  <murrayc@usa.net>
+
+	Fixes #102168. Merge from HEAD.
+
+	* gtk/gtkliststore.c, gtktreednd.c, gtktreestore.c:
+	Actually implement the GtkTreeDragSource::row_draggable virtual 
+	function in GtkListStore and GtkTreeStore instead of just checking 
+	whether it's implemented at all. This means that DnD isn't broken by
+	gtkmm's virtual function wrappers. The alternative would be to
+	hard-code the TRUE return value into gtkmm's wrappers, but that's 
+	part of GTK+'s implementation, not it's API.
+
+Tue Jan 14 23:54:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c: fix compiler warning.
+
+Tue Jan 14 23:29:00 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
+	make sure exposed pixbufs are clipped to the exposed area before
+	drawing, which is a slight speedup. (#102379, patch from Soeren
+	Sandmann).
+
+Tue Jan 14 23:26:41 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): silly typo fix,
+	only free scroll_to_path when the complete tree has been validated.
+	This makes sure that we scrolled to the correct path.
+
+Tue Jan 14 23:25:32 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_style_set): update the
+	background of widget->window and bin->window. (Fixes #96650, reported
+	by Dave Camp).
+
+Tue Jan 14 23:24:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_clamp_node_visible): process
+	updates before scrolling, avoiding a "selection streak". (Fixes
+	#101235, patch from Soeren Sandmann).
+
+Tue Jan 14 23:22:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): actually put values
+	in the requisition using gtk_widget_size_request. (Fixes #100172,
+	reported by Kjartan Maraas).
+
+Tue Jan 14 23:19:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): cancel the
+	arrow animation timeout before we actually reorder the rbtree. If
+	we don't do this we can get stuck arrows,
+	(cancel_arrow_animation): new function. (Fixes #93629, part 2,
+	reported and testcase provided by Hans Petter Jansson).
+
+Tue Jan 14 23:18:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeselection.c (gtk_tree_selection_real_modify_range):
+	anchor_path should be start_path, not end_path. (Fixes #102618,
+	patch from Carlos Garnacho Parro).
+
+Tue Jan 14 23:16:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkliststore.c (gtk_list_store_move): also update the tail,
+	only correct new_pos if we don't move to the head/tail.
+
+Tue Jan 14 23:11:55 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_swap): take the path from
+	the parent_iter if depth >= 1, so we send the reordered signal to
+	the correct level, remove debugging printfs which I forgot the remove
+	earlier (2.2.0 shipped with this, oops). (Fixes #103198, Reported and
+	testcase provided by Matthew Tuck).
+
+Tue Jan 14 20:58:44 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (invalite_last_column): split out actual column
+	invalidation into invalite_column(),
+	(gtk_tree_view_size_allocate_columns): invalidate column if the
+	new width is larger than the old width.
+	(fixes #102890, reported by Alex Duggan).
+
+2003-01-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkmain.c: Move inclusion of config.h and gtkintl.h earlier,
+	as gtkprivate.h redefines GTK_LOCALEDIR on Win32, for run-time
+	lookup.
+
+	* gdk/Makefile.am (libgdk_win32_2_0_la_DEPENDENCIES): Depend on
+	gdk.def.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add some missing entries. Thanks to Kenichi SUTO.
+
+2003-01-09  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Implement by setting or clearing the WS_EX_TOOLWINDOW extended
+	window style.
+	(gdk_window_set_type_hint): Add all cases to the switch (not all
+	do anything, though). Handle GDK_WINDOW_TYPE_HINT_TOOLBAR by
+	calling gdk_window_set_skip_taskbar_hint(). This means that GTK
+	won't know that the skip_taskbar hint is on for the window, is
+	this bad?
+
+Wed Jan  8 18:44:21 2003  Manish Singh  <yosh@gimp.org>
+	
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Use correct DLL and import library names, with
+	GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+	(DEVZIP): Add bin/{gdk-pixbuf-query-loaders,gtk-query-immodules-2.0,
+	gtk-demo}.exe and share/gtk-2.0.
+
+	* configure.in: Improve check for dimm.h.
+
+	* configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+	gdk-pixbuf/Makefile.am.
+
+	* gdk-pixbuf/makefile.mingw.in
+	* gdk-pixbuf/pixops/makefile.mingw.in
+	* gdk/makefile.mingw.in
+	* gdk/win32/makefile.mingw.in
+	* gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+	* gdk-pixbuf/Makefile.am
+	* gdk-pixbuf/pixops/Makefile.am
+	* gdk/Makefile.am
+	* gdk/win32/Makefile.am
+	* gtk/Makefile.am
+	* configure.in: Remove makefile.mingw{,.in} from here, too.
+	
+	* README.win32: Updates. Don't mention the now removed
+	makefile.mingw files.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add a couple of missing entries.
+
+	* gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+	* gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+	earlier.
+
+	* gdk/win32/rc/Makefile.am: Add hack to help
+	build/win32/lt-compile-resource decide which kind of libtool
+	object file to produce.
+
+2003-01-05  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	C-Down step through the sequence of paragraph ends (old behaviour
+	included paragraph starts).  (#80340, patch by Narayana Pattipati)
+
+	* gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_first_toggle):
+ 	Check for a tag toggle at the start iterator before calling
+ 	gtk_text_iter_forward_to_tag_toggle().  (#102090, patch by Daniel 
+	Elstner)
+
+2003-01-04  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilesel.h (struct _GtkFileSelection): Add /*< public >*/
+	and /*< private >*/ as appropriate.  (#97211)
+
+2003-01-04  Tor Lillqvist  <tml@iki.fi>
+
+	* Makefile.am (EXTRA_DIST): Don't distribute gtk-zip.sh, but do
+	distribute gtk-zip.sh.in.
+
+	* gtk-zip.sh.in (DEVZIP): Add gdk-pixbuf-csource.exe and .1.
+
+2003-01-02  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkwindow.c (gtk_window_get_focus): Document that it may
+	return NULL.  (#102069)
+
+2003-01-01  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/fnmatch.c (FNMATCH_TEST_CASES): #undef, since having
+	a main() in the library is obviously bad. 
+
+2002-12-27  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_drag_data_received): Place the
+	cursor at drop point.  (#72384)
+	(gtk_text_view_size_allocate): Update the horizontal adjustment
+	value.  (#75694)
+
+2002-12-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix highlighting of
+	selection wrt. to empty lines.  (#90435, #90582, #91619)
+
+	* gtk/gtktextview.c (gtk_text_view_preedit_changed_handler):
+	Keep the cursor on screen.  (#96929)
+
+2002-12-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbuffer.c (paste_from_buffer): 
+	(clipboard_text_received): Let the user action span the insertion
+	and the deletion of the old selection.  (#82844)
+
+2002-12-23  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextiter.c (gtk_text_iter_backward_sentence_starts):
+	Don't call gtk_text_iter_backward_sentence_start() if
+	count is zero.  (#99115)
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Call
+	move_cursor() even if the cursor hasn't moved, since it has the
+	side effect of canceling the selection.  (#81395, #98537, #98333)
+
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+	with empty ranges.  (fixes #101564 and #80637)
+
+2002-12-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that
+	sets the window style and extended window style, and adjusts the
+	width and height to take the window decorations into account
+	earlier. The adjusted width and height used to be ignored. Remove
+	the local x, y, width and height variables, no need to further
+	confuse the code by having local copies. (Partial fix, I hope, for
+	#101588)
+
+	(gdk_window_move): When moving top-level windows, take title bar
+	and border width into account, offsetting the coordinates before
+	calling SetWindowPos().
+
+	(gdk_window_set_decorations, gdk_window_set_functions):
+	Reimplement, taking into account the peculiar semantics of
+	GDK_DECOR_ALL and GDK_FUNC_ALL. (#79036)
+
+	(gdk_window_get_decorations): Implement. (#98981)
+	
+	(gdk_window_set_type_hint): When setting
+	GDK_WINDOW_TYPE_HINT_MENU, call	gdk_window_set_decorations().
+	(#79036)
+
+	* gdk/gdk.def: Add gdk_window_get_decorations. (#98981)
+
+2002-12-21  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_set_background): New static
+	function to set the background of all windows.
+	(gtk_text_view_style_set): Use gtk_text_view_set_background().
+	(gtk_text_view_state_changed): New function; change background
+	according to state.  (#88126)
+
+2002-12-21  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktextview.c (gtk_text_view_move_visually): fix the documentation
+
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -0,0 +1,622 @@
+Sun Feb  2 10:03:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 2.2.1 ===
+
+	* configure.in: Version 2.2.1, Binary age 201, interface age 1.
+	
+	* NEWS: More updates.
+
+2003-02-01  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def: Add gdk_screen_get_system_visual. Noticed by Ed
+	Woods.
+
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
+Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
+	on the tab_label before unparenting it, in case the unparent
+	drops the refcount to 0.
+
+Thu Jan 30 23:44:52 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Updates.
+
+Fri Jan 31 00:28:18 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* NEWS: beginning of NEWS for 2.2.1.
+
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96242, patch from Soeren Sandmann).
+
+Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c: Patch from Soeren Sandmann
+	to update the states of the tab label child
+	widgets to match the state of the tabs. 
+	(#93389, Reported by Tommi Komulainen)
+
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper
+	function that sets the icon's and label's packing options and
+	visibility based on toolbar->style.
+
+	(gtk_toolbar_internal_insert_element):
+	(gtk_real_toolbar_style_changed): Make use of
+	set_child_packing_and_visibility() to clean up the code and get
+	the packing right for icon-only/text-only toolbars. (#104679)
+
+	(get_first_child): Remove, and use gtk_bin_get_child() instead.
+
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+	EXTRA_DIST, and from dist rules. (#102231)
+
+Thu Jan 30 16:01:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the 
+	attempt-to-allocate then free code. To handle multiple
+	people allocating colors at the same time, we need
+	to just go ahead and try. (#102213, Shivram U)
+	
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque
+	rectangle using the background color rather than relying on
+	gdk_window_clear_area(), so that the palette works properly with
+	pixmap themes. (#101732)
+
+	* demos/gtk-demo/colorsel.c: Install an "expose_event" handler
+	to fill the drawing area in the background color.
+
+Wed Jan 29 14:11:21 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
+	initialization error for selecting input style (#103549).
+
+Wed Jan 29 17:02:41 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkkeyuni.c (get_decimal_char): Make the 
+	translation of GDK_KP_Decimal dependent on LC_NUMERIC.
+	(#101225)
+
+Wed Jan 29 15:43:56 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+	Make up from the menu bar go to the end of the submenu.
+	(#96114, Ian Peters.)
+
+	* gtk/gtkmenuitem.c (gtk_menu_item_mnemonic_activate): 
+	Only do the select-but-not-activate stuff if the
+	menu is already active. Otherwise, just activate.
+	(#101690, Arvind Samptur)
+
+Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* autogen.sh (have_automake): Fix version in complaint
+	message about automake. (#104366, Rich Burridge)
+
+Mon Jan 27 16:38:13 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove SOEXT stuff; it doesn't work portably.
+
+Mon Jan 27 22:45:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_move): don't handle b if
+	we appended/prepended, send the rows_reordered signal to the 
+	correct level ... (Reported by Matthew Tuck).
+
+Mon Jan 27 22:43:11 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_helper): don't just bail
+	out if the level only has one item, recurse over the child if there
+	is one. (Fixes #100458, reported by Gaël Le Mignot).
+
+Mon Jan 27 22:41:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model),
+	(gtk_tree_view_search_equal_func): make TreeView search handle
+	all types which are transformable by GValue. (Fixes #99803, reported
+	by Muktha Narayan).
+
+Mon Jan 27 22:39:25 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_sort_column_id):
+	*really* handle unsetting the ID. Slightly modified patch from
+	Soeren Sandmann. Fixes #87556, reported by Jarek Dukat.
+
+Mon Jan 27 22:33:43 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Fixes the total GtkTreeSortable mess, and #83195, reported by
+	Jarek Dukat
+
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id),
+	(gtk_tree_store_set_sort_column_id), (gtk_tree_store_set_sort_func),
+	(gtk_tree_store_set_default_sort_func): use the constant
+	GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID instead of -1, make functions
+	work as advertised by the documentation.
+
+	* gtk/gtklistore.c (gtk_list_store_get_sort_column_id),
+	(gtk_list_store_set_sort_column_id), (gtk_list_store_set_sort_func),
+	(gtk_list_store_set_default_sort_func): likewise.
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_set_sort_column_id),
+	(gtk_tree_model_set_sort_func),
+	(gtk_tree_model_sort_set_default_sort_func): make functions work
+	as advertised by the documentation.
+
+Mon Jan 27 22:31:56 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): update focus_column
+	before we decide if we edit. (fixes #100973, reported by Dave Cook).
+
+Mon Jan 27 22:29:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Bug report and test case from Paolo Maggi via IRC.
+
+	* gtk/gtkliststore.c (gtk_list_store_swap): update tail if needed,
+	(gtk_list_store_move): update tail if needed.
+
+Mon Jan 27 16:19:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksocket.c (gtk_socket_filter_func): event->any.window
+	might be NULL. Use gtk_widget_get_display (widget) 
+	(#102860, Thomas Leonard)
+
+Mon Jan 27 15:58:31 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* configure.in: Fix --without-modules/--disable-modules
+ 	confusion that was causing --disable-modules not to work.
+ 	(#102865, Akira Tagoh)
+ 
+ 	* configure.in: Fix problem with plain --with-xinput
+ 	(#104266, Akira Tagoh)
+	
+2003-01-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	move bindings viewport-based when the cursor is invisible.  (#78669)
+
+2003-01-23  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (gtk_toolbar_hide_all): Override hide_all
+	in addition to show_all in order to keep them symmetric. (#102201)
+
+2003-01-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display,
+	gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement.
+	(#104108, Naofumi Yasufuku)
+
+	* gdk/gdk.def: Export the above.
+
+Wed Jan 22 14:23:23 2003  Manish Singh  <yosh@gimp.org>
+
+        * gdk/x11/gdkevents-x11.c (translate_key_event): add a "return" at
+        the end of the function, so there is a statement following the "out"
+        label in all cases (fixes #101961)
+
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "mn" to ALL_LINGUAS.
+
+Wed Jan 15 17:02:18 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_validate_yrange):
+	Fix off-by-one error on the backward iteration loop,
+	that was causing the wrong range to be redrawn.
+	(at least part of #72734)
+
+2003-01-21  Matthias Clasen  <maclas@gmx.de>
+
+	Merge from HEAD.
+
+	* gtk/gtktextview.c (gtk_text_view_size_allocate): Adjust the
+	vadjustment value after changing its bounds.  (fixes #101963 and 
+	#73562)
+
+	* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid 
+	unnecessary roundtrip failures.  (#93500)
+
+2003-01-20  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Amharic (am), Macedonian (mk)
+	and Tamil (ta) to ALL_LINGUAS
+
+2003-01-19  Tor Lillqvist  <tml@iki.fi>
+
+	Fix for #103614 and some other problems with GtkFileSelection on
+	Windows:
+		
+	* gtk/fnmatch.c (get_char): Need to use g_unichar_tolower(), not
+	g_ascii_tolower(). Windows file names are case-insensitive for all
+	Unicode letters.
+
+	* gtk/gtkfilesel.c: Instead of checking for G_OS_WIN32 or
+	G_WITH_CYGWIN, check G_PLATFORM_WIN32. Move inclusion of gtkintl.h
+	earlier, as it includes config.h unconditionally, and gtkprivate.h
+	redefines GTK_LOCALEDIR.
+	(struct _CompletionDirSent): Ifdef out the fields not used on
+	Windows.
+	(compare_utf8_filenames, compare_sys_filenames): Need different
+	comparison implementation for UTF-8 file names and system locale
+	file names on Win32. Cannot simply use g_ascii_strcasecmp(), but
+	need to casefold all Unicode letters.
+	(cmpl_completion_matches, open_dir, correct_parent): Ifdef out
+	variables not used on Win32 to avoid warnings about unused
+	variables.
+	(open_ref_dir): Use g_path_skip_root() to skip past potential
+	drive letter in front of the leading (back)slash.
+	(open_new_dir): Ifdef out use of CompletionDirSent fields not
+	there on Win32.
+	(correct_parent): Bypass inode check also on Cygwin.
+
+2003-01-15  Tor Lillqvist  <tml@iki.fi>
+
+	Fix bug noticed by Alex Shaduri: Tooltips and other
+	GDK_WINDOW_TEMP windows were activated. This looked very odd, and
+	was a regression from earlier versions.
+	
+	* gdk/win32/gdkwindow-win32.c (show_window_internal): Fine-tune
+	behaviour. Don't ever activate GDK_WINDOW_TEMP windows.
+	(gdk_window_move, gdk_window_resize): Add debug logging.
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): When we get a
+	WM_SIZE message for a non-visible (withdrawn) window, don't clear
+	the GDK_WINDOW_STATE_WITHDRAWN bit. The window is still withdrawn
+	even if its size changes.
+
+Wed Jan 15 15:55:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksettings.c: Set the double click speed from
+	XSETTINGS when creating a new GtkSettings object
+	as well as when getting a notify. (#103601, reported
+	by Louis Garcia)
+
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
+2002-12-29  Murray Cumming  <murrayc@usa.net>
+
+	Fixes #102168. Merge from HEAD.
+
+	* gtk/gtkliststore.c, gtktreednd.c, gtktreestore.c:
+	Actually implement the GtkTreeDragSource::row_draggable virtual 
+	function in GtkListStore and GtkTreeStore instead of just checking 
+	whether it's implemented at all. This means that DnD isn't broken by
+	gtkmm's virtual function wrappers. The alternative would be to
+	hard-code the TRUE return value into gtkmm's wrappers, but that's 
+	part of GTK+'s implementation, not it's API.
+
+Tue Jan 14 23:54:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c: fix compiler warning.
+
+Tue Jan 14 23:29:00 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
+	make sure exposed pixbufs are clipped to the exposed area before
+	drawing, which is a slight speedup. (#102379, patch from Soeren
+	Sandmann).
+
+Tue Jan 14 23:26:41 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): silly typo fix,
+	only free scroll_to_path when the complete tree has been validated.
+	This makes sure that we scrolled to the correct path.
+
+Tue Jan 14 23:25:32 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_style_set): update the
+	background of widget->window and bin->window. (Fixes #96650, reported
+	by Dave Camp).
+
+Tue Jan 14 23:24:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_clamp_node_visible): process
+	updates before scrolling, avoiding a "selection streak". (Fixes
+	#101235, patch from Soeren Sandmann).
+
+Tue Jan 14 23:22:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): actually put values
+	in the requisition using gtk_widget_size_request. (Fixes #100172,
+	reported by Kjartan Maraas).
+
+Tue Jan 14 23:19:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): cancel the
+	arrow animation timeout before we actually reorder the rbtree. If
+	we don't do this we can get stuck arrows,
+	(cancel_arrow_animation): new function. (Fixes #93629, part 2,
+	reported and testcase provided by Hans Petter Jansson).
+
+Tue Jan 14 23:18:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeselection.c (gtk_tree_selection_real_modify_range):
+	anchor_path should be start_path, not end_path. (Fixes #102618,
+	patch from Carlos Garnacho Parro).
+
+Tue Jan 14 23:16:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkliststore.c (gtk_list_store_move): also update the tail,
+	only correct new_pos if we don't move to the head/tail.
+
+Tue Jan 14 23:11:55 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_swap): take the path from
+	the parent_iter if depth >= 1, so we send the reordered signal to
+	the correct level, remove debugging printfs which I forgot the remove
+	earlier (2.2.0 shipped with this, oops). (Fixes #103198, Reported and
+	testcase provided by Matthew Tuck).
+
+Tue Jan 14 20:58:44 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (invalite_last_column): split out actual column
+	invalidation into invalite_column(),
+	(gtk_tree_view_size_allocate_columns): invalidate column if the
+	new width is larger than the old width.
+	(fixes #102890, reported by Alex Duggan).
+
+2003-01-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkmain.c: Move inclusion of config.h and gtkintl.h earlier,
+	as gtkprivate.h redefines GTK_LOCALEDIR on Win32, for run-time
+	lookup.
+
+	* gdk/Makefile.am (libgdk_win32_2_0_la_DEPENDENCIES): Depend on
+	gdk.def.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add some missing entries. Thanks to Kenichi SUTO.
+
+2003-01-09  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Implement by setting or clearing the WS_EX_TOOLWINDOW extended
+	window style.
+	(gdk_window_set_type_hint): Add all cases to the switch (not all
+	do anything, though). Handle GDK_WINDOW_TYPE_HINT_TOOLBAR by
+	calling gdk_window_set_skip_taskbar_hint(). This means that GTK
+	won't know that the skip_taskbar hint is on for the window, is
+	this bad?
+
+Wed Jan  8 18:44:21 2003  Manish Singh  <yosh@gimp.org>
+	
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Use correct DLL and import library names, with
+	GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+	(DEVZIP): Add bin/{gdk-pixbuf-query-loaders,gtk-query-immodules-2.0,
+	gtk-demo}.exe and share/gtk-2.0.
+
+	* configure.in: Improve check for dimm.h.
+
+	* configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+	gdk-pixbuf/Makefile.am.
+
+	* gdk-pixbuf/makefile.mingw.in
+	* gdk-pixbuf/pixops/makefile.mingw.in
+	* gdk/makefile.mingw.in
+	* gdk/win32/makefile.mingw.in
+	* gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+	* gdk-pixbuf/Makefile.am
+	* gdk-pixbuf/pixops/Makefile.am
+	* gdk/Makefile.am
+	* gdk/win32/Makefile.am
+	* gtk/Makefile.am
+	* configure.in: Remove makefile.mingw{,.in} from here, too.
+	
+	* README.win32: Updates. Don't mention the now removed
+	makefile.mingw files.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add a couple of missing entries.
+
+	* gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+	* gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+	earlier.
+
+	* gdk/win32/rc/Makefile.am: Add hack to help
+	build/win32/lt-compile-resource decide which kind of libtool
+	object file to produce.
+
+2003-01-05  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	C-Down step through the sequence of paragraph ends (old behaviour
+	included paragraph starts).  (#80340, patch by Narayana Pattipati)
+
+	* gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_first_toggle):
+ 	Check for a tag toggle at the start iterator before calling
+ 	gtk_text_iter_forward_to_tag_toggle().  (#102090, patch by Daniel 
+	Elstner)
+
+2003-01-04  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilesel.h (struct _GtkFileSelection): Add /*< public >*/
+	and /*< private >*/ as appropriate.  (#97211)
+
+2003-01-04  Tor Lillqvist  <tml@iki.fi>
+
+	* Makefile.am (EXTRA_DIST): Don't distribute gtk-zip.sh, but do
+	distribute gtk-zip.sh.in.
+
+	* gtk-zip.sh.in (DEVZIP): Add gdk-pixbuf-csource.exe and .1.
+
+2003-01-02  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkwindow.c (gtk_window_get_focus): Document that it may
+	return NULL.  (#102069)
+
+2003-01-01  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/fnmatch.c (FNMATCH_TEST_CASES): #undef, since having
+	a main() in the library is obviously bad. 
+
+2002-12-27  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_drag_data_received): Place the
+	cursor at drop point.  (#72384)
+	(gtk_text_view_size_allocate): Update the horizontal adjustment
+	value.  (#75694)
+
+2002-12-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix highlighting of
+	selection wrt. to empty lines.  (#90435, #90582, #91619)
+
+	* gtk/gtktextview.c (gtk_text_view_preedit_changed_handler):
+	Keep the cursor on screen.  (#96929)
+
+2002-12-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbuffer.c (paste_from_buffer): 
+	(clipboard_text_received): Let the user action span the insertion
+	and the deletion of the old selection.  (#82844)
+
+2002-12-23  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextiter.c (gtk_text_iter_backward_sentence_starts):
+	Don't call gtk_text_iter_backward_sentence_start() if
+	count is zero.  (#99115)
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Call
+	move_cursor() even if the cursor hasn't moved, since it has the
+	side effect of canceling the selection.  (#81395, #98537, #98333)
+
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+	with empty ranges.  (fixes #101564 and #80637)
+
+2002-12-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that
+	sets the window style and extended window style, and adjusts the
+	width and height to take the window decorations into account
+	earlier. The adjusted width and height used to be ignored. Remove
+	the local x, y, width and height variables, no need to further
+	confuse the code by having local copies. (Partial fix, I hope, for
+	#101588)
+
+	(gdk_window_move): When moving top-level windows, take title bar
+	and border width into account, offsetting the coordinates before
+	calling SetWindowPos().
+
+	(gdk_window_set_decorations, gdk_window_set_functions):
+	Reimplement, taking into account the peculiar semantics of
+	GDK_DECOR_ALL and GDK_FUNC_ALL. (#79036)
+
+	(gdk_window_get_decorations): Implement. (#98981)
+	
+	(gdk_window_set_type_hint): When setting
+	GDK_WINDOW_TYPE_HINT_MENU, call	gdk_window_set_decorations().
+	(#79036)
+
+	* gdk/gdk.def: Add gdk_window_get_decorations. (#98981)
+
+2002-12-21  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_set_background): New static
+	function to set the background of all windows.
+	(gtk_text_view_style_set): Use gtk_text_view_set_background().
+	(gtk_text_view_state_changed): New function; change background
+	according to state.  (#88126)
+
+2002-12-21  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktextview.c (gtk_text_view_move_visually): fix the documentation
+
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -0,0 +1,622 @@
+Sun Feb  2 10:03:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 2.2.1 ===
+
+	* configure.in: Version 2.2.1, Binary age 201, interface age 1.
+	
+	* NEWS: More updates.
+
+2003-02-01  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def: Add gdk_screen_get_system_visual. Noticed by Ed
+	Woods.
+
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
+Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
+	on the tab_label before unparenting it, in case the unparent
+	drops the refcount to 0.
+
+Thu Jan 30 23:44:52 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Updates.
+
+Fri Jan 31 00:28:18 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* NEWS: beginning of NEWS for 2.2.1.
+
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96242, patch from Soeren Sandmann).
+
+Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c: Patch from Soeren Sandmann
+	to update the states of the tab label child
+	widgets to match the state of the tabs. 
+	(#93389, Reported by Tommi Komulainen)
+
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper
+	function that sets the icon's and label's packing options and
+	visibility based on toolbar->style.
+
+	(gtk_toolbar_internal_insert_element):
+	(gtk_real_toolbar_style_changed): Make use of
+	set_child_packing_and_visibility() to clean up the code and get
+	the packing right for icon-only/text-only toolbars. (#104679)
+
+	(get_first_child): Remove, and use gtk_bin_get_child() instead.
+
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+	EXTRA_DIST, and from dist rules. (#102231)
+
+Thu Jan 30 16:01:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the 
+	attempt-to-allocate then free code. To handle multiple
+	people allocating colors at the same time, we need
+	to just go ahead and try. (#102213, Shivram U)
+	
+2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque
+	rectangle using the background color rather than relying on
+	gdk_window_clear_area(), so that the palette works properly with
+	pixmap themes. (#101732)
+
+	* demos/gtk-demo/colorsel.c: Install an "expose_event" handler
+	to fill the drawing area in the background color.
+
+Wed Jan 29 14:11:21 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
+	initialization error for selecting input style (#103549).
+
+Wed Jan 29 17:02:41 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkkeyuni.c (get_decimal_char): Make the 
+	translation of GDK_KP_Decimal dependent on LC_NUMERIC.
+	(#101225)
+
+Wed Jan 29 15:43:56 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+	Make up from the menu bar go to the end of the submenu.
+	(#96114, Ian Peters.)
+
+	* gtk/gtkmenuitem.c (gtk_menu_item_mnemonic_activate): 
+	Only do the select-but-not-activate stuff if the
+	menu is already active. Otherwise, just activate.
+	(#101690, Arvind Samptur)
+
+Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* autogen.sh (have_automake): Fix version in complaint
+	message about automake. (#104366, Rich Burridge)
+
+Mon Jan 27 16:38:13 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove SOEXT stuff; it doesn't work portably.
+
+Mon Jan 27 22:45:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_move): don't handle b if
+	we appended/prepended, send the rows_reordered signal to the 
+	correct level ... (Reported by Matthew Tuck).
+
+Mon Jan 27 22:43:11 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_helper): don't just bail
+	out if the level only has one item, recurse over the child if there
+	is one. (Fixes #100458, reported by Gaël Le Mignot).
+
+Mon Jan 27 22:41:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model),
+	(gtk_tree_view_search_equal_func): make TreeView search handle
+	all types which are transformable by GValue. (Fixes #99803, reported
+	by Muktha Narayan).
+
+Mon Jan 27 22:39:25 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_sort_column_id):
+	*really* handle unsetting the ID. Slightly modified patch from
+	Soeren Sandmann. Fixes #87556, reported by Jarek Dukat.
+
+Mon Jan 27 22:33:43 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Fixes the total GtkTreeSortable mess, and #83195, reported by
+	Jarek Dukat
+
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id),
+	(gtk_tree_store_set_sort_column_id), (gtk_tree_store_set_sort_func),
+	(gtk_tree_store_set_default_sort_func): use the constant
+	GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID instead of -1, make functions
+	work as advertised by the documentation.
+
+	* gtk/gtklistore.c (gtk_list_store_get_sort_column_id),
+	(gtk_list_store_set_sort_column_id), (gtk_list_store_set_sort_func),
+	(gtk_list_store_set_default_sort_func): likewise.
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_set_sort_column_id),
+	(gtk_tree_model_set_sort_func),
+	(gtk_tree_model_sort_set_default_sort_func): make functions work
+	as advertised by the documentation.
+
+Mon Jan 27 22:31:56 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): update focus_column
+	before we decide if we edit. (fixes #100973, reported by Dave Cook).
+
+Mon Jan 27 22:29:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	Bug report and test case from Paolo Maggi via IRC.
+
+	* gtk/gtkliststore.c (gtk_list_store_swap): update tail if needed,
+	(gtk_list_store_move): update tail if needed.
+
+Mon Jan 27 16:19:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksocket.c (gtk_socket_filter_func): event->any.window
+	might be NULL. Use gtk_widget_get_display (widget) 
+	(#102860, Thomas Leonard)
+
+Mon Jan 27 15:58:31 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* configure.in: Fix --without-modules/--disable-modules
+ 	confusion that was causing --disable-modules not to work.
+ 	(#102865, Akira Tagoh)
+ 
+ 	* configure.in: Fix problem with plain --with-xinput
+ 	(#104266, Akira Tagoh)
+	
+2003-01-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	move bindings viewport-based when the cursor is invisible.  (#78669)
+
+2003-01-23  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	Merge from HEAD.
+
+	* gtk/gtktoolbar.c (gtk_toolbar_hide_all): Override hide_all
+	in addition to show_all in order to keep them symmetric. (#102201)
+
+2003-01-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display,
+	gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement.
+	(#104108, Naofumi Yasufuku)
+
+	* gdk/gdk.def: Export the above.
+
+Wed Jan 22 14:23:23 2003  Manish Singh  <yosh@gimp.org>
+
+        * gdk/x11/gdkevents-x11.c (translate_key_event): add a "return" at
+        the end of the function, so there is a statement following the "out"
+        label in all cases (fixes #101961)
+
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "mn" to ALL_LINGUAS.
+
+Wed Jan 15 17:02:18 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_validate_yrange):
+	Fix off-by-one error on the backward iteration loop,
+	that was causing the wrong range to be redrawn.
+	(at least part of #72734)
+
+2003-01-21  Matthias Clasen  <maclas@gmx.de>
+
+	Merge from HEAD.
+
+	* gtk/gtktextview.c (gtk_text_view_size_allocate): Adjust the
+	vadjustment value after changing its bounds.  (fixes #101963 and 
+	#73562)
+
+	* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid 
+	unnecessary roundtrip failures.  (#93500)
+
+2003-01-20  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Amharic (am), Macedonian (mk)
+	and Tamil (ta) to ALL_LINGUAS
+
+2003-01-19  Tor Lillqvist  <tml@iki.fi>
+
+	Fix for #103614 and some other problems with GtkFileSelection on
+	Windows:
+		
+	* gtk/fnmatch.c (get_char): Need to use g_unichar_tolower(), not
+	g_ascii_tolower(). Windows file names are case-insensitive for all
+	Unicode letters.
+
+	* gtk/gtkfilesel.c: Instead of checking for G_OS_WIN32 or
+	G_WITH_CYGWIN, check G_PLATFORM_WIN32. Move inclusion of gtkintl.h
+	earlier, as it includes config.h unconditionally, and gtkprivate.h
+	redefines GTK_LOCALEDIR.
+	(struct _CompletionDirSent): Ifdef out the fields not used on
+	Windows.
+	(compare_utf8_filenames, compare_sys_filenames): Need different
+	comparison implementation for UTF-8 file names and system locale
+	file names on Win32. Cannot simply use g_ascii_strcasecmp(), but
+	need to casefold all Unicode letters.
+	(cmpl_completion_matches, open_dir, correct_parent): Ifdef out
+	variables not used on Win32 to avoid warnings about unused
+	variables.
+	(open_ref_dir): Use g_path_skip_root() to skip past potential
+	drive letter in front of the leading (back)slash.
+	(open_new_dir): Ifdef out use of CompletionDirSent fields not
+	there on Win32.
+	(correct_parent): Bypass inode check also on Cygwin.
+
+2003-01-15  Tor Lillqvist  <tml@iki.fi>
+
+	Fix bug noticed by Alex Shaduri: Tooltips and other
+	GDK_WINDOW_TEMP windows were activated. This looked very odd, and
+	was a regression from earlier versions.
+	
+	* gdk/win32/gdkwindow-win32.c (show_window_internal): Fine-tune
+	behaviour. Don't ever activate GDK_WINDOW_TEMP windows.
+	(gdk_window_move, gdk_window_resize): Add debug logging.
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): When we get a
+	WM_SIZE message for a non-visible (withdrawn) window, don't clear
+	the GDK_WINDOW_STATE_WITHDRAWN bit. The window is still withdrawn
+	even if its size changes.
+
+Wed Jan 15 15:55:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtksettings.c: Set the double click speed from
+	XSETTINGS when creating a new GtkSettings object
+	as well as when getting a notify. (#103601, reported
+	by Louis Garcia)
+
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
+2002-12-29  Murray Cumming  <murrayc@usa.net>
+
+	Fixes #102168. Merge from HEAD.
+
+	* gtk/gtkliststore.c, gtktreednd.c, gtktreestore.c:
+	Actually implement the GtkTreeDragSource::row_draggable virtual 
+	function in GtkListStore and GtkTreeStore instead of just checking 
+	whether it's implemented at all. This means that DnD isn't broken by
+	gtkmm's virtual function wrappers. The alternative would be to
+	hard-code the TRUE return value into gtkmm's wrappers, but that's 
+	part of GTK+'s implementation, not it's API.
+
+Tue Jan 14 23:54:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c: fix compiler warning.
+
+Tue Jan 14 23:29:00 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
+	make sure exposed pixbufs are clipped to the exposed area before
+	drawing, which is a slight speedup. (#102379, patch from Soeren
+	Sandmann).
+
+Tue Jan 14 23:26:41 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): silly typo fix,
+	only free scroll_to_path when the complete tree has been validated.
+	This makes sure that we scrolled to the correct path.
+
+Tue Jan 14 23:25:32 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_style_set): update the
+	background of widget->window and bin->window. (Fixes #96650, reported
+	by Dave Camp).
+
+Tue Jan 14 23:24:02 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_clamp_node_visible): process
+	updates before scrolling, avoiding a "selection streak". (Fixes
+	#101235, patch from Soeren Sandmann).
+
+Tue Jan 14 23:22:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (validate_visible_area): actually put values
+	in the requisition using gtk_widget_size_request. (Fixes #100172,
+	reported by Kjartan Maraas).
+
+Tue Jan 14 23:19:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): cancel the
+	arrow animation timeout before we actually reorder the rbtree. If
+	we don't do this we can get stuck arrows,
+	(cancel_arrow_animation): new function. (Fixes #93629, part 2,
+	reported and testcase provided by Hans Petter Jansson).
+
+Tue Jan 14 23:18:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeselection.c (gtk_tree_selection_real_modify_range):
+	anchor_path should be start_path, not end_path. (Fixes #102618,
+	patch from Carlos Garnacho Parro).
+
+Tue Jan 14 23:16:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkliststore.c (gtk_list_store_move): also update the tail,
+	only correct new_pos if we don't move to the head/tail.
+
+Tue Jan 14 23:11:55 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreestore.c (gtk_tree_store_swap): take the path from
+	the parent_iter if depth >= 1, so we send the reordered signal to
+	the correct level, remove debugging printfs which I forgot the remove
+	earlier (2.2.0 shipped with this, oops). (Fixes #103198, Reported and
+	testcase provided by Matthew Tuck).
+
+Tue Jan 14 20:58:44 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeview.c (invalite_last_column): split out actual column
+	invalidation into invalite_column(),
+	(gtk_tree_view_size_allocate_columns): invalidate column if the
+	new width is larger than the old width.
+	(fixes #102890, reported by Alex Duggan).
+
+2003-01-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkmain.c: Move inclusion of config.h and gtkintl.h earlier,
+	as gtkprivate.h redefines GTK_LOCALEDIR on Win32, for run-time
+	lookup.
+
+	* gdk/Makefile.am (libgdk_win32_2_0_la_DEPENDENCIES): Depend on
+	gdk.def.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add some missing entries. Thanks to Kenichi SUTO.
+
+2003-01-09  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Implement by setting or clearing the WS_EX_TOOLWINDOW extended
+	window style.
+	(gdk_window_set_type_hint): Add all cases to the switch (not all
+	do anything, though). Handle GDK_WINDOW_TYPE_HINT_TOOLBAR by
+	calling gdk_window_set_skip_taskbar_hint(). This means that GTK
+	won't know that the skip_taskbar hint is on for the window, is
+	this bad?
+
+Wed Jan  8 18:44:21 2003  Manish Singh  <yosh@gimp.org>
+	
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Use correct DLL and import library names, with
+	GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+	(DEVZIP): Add bin/{gdk-pixbuf-query-loaders,gtk-query-immodules-2.0,
+	gtk-demo}.exe and share/gtk-2.0.
+
+	* configure.in: Improve check for dimm.h.
+
+	* configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+	gdk-pixbuf/Makefile.am.
+
+	* gdk-pixbuf/makefile.mingw.in
+	* gdk-pixbuf/pixops/makefile.mingw.in
+	* gdk/makefile.mingw.in
+	* gdk/win32/makefile.mingw.in
+	* gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+	* gdk-pixbuf/Makefile.am
+	* gdk-pixbuf/pixops/Makefile.am
+	* gdk/Makefile.am
+	* gdk/win32/Makefile.am
+	* gtk/Makefile.am
+	* configure.in: Remove makefile.mingw{,.in} from here, too.
+	
+	* README.win32: Updates. Don't mention the now removed
+	makefile.mingw files.
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add a couple of missing entries.
+
+	* gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+	* gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+	earlier.
+
+	* gdk/win32/rc/Makefile.am: Add hack to help
+	build/win32/lt-compile-resource decide which kind of libtool
+	object file to produce.
+
+2003-01-05  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
+	C-Down step through the sequence of paragraph ends (old behaviour
+	included paragraph starts).  (#80340, patch by Narayana Pattipati)
+
+	* gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_first_toggle):
+ 	Check for a tag toggle at the start iterator before calling
+ 	gtk_text_iter_forward_to_tag_toggle().  (#102090, patch by Daniel 
+	Elstner)
+
+2003-01-04  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilesel.h (struct _GtkFileSelection): Add /*< public >*/
+	and /*< private >*/ as appropriate.  (#97211)
+
+2003-01-04  Tor Lillqvist  <tml@iki.fi>
+
+	* Makefile.am (EXTRA_DIST): Don't distribute gtk-zip.sh, but do
+	distribute gtk-zip.sh.in.
+
+	* gtk-zip.sh.in (DEVZIP): Add gdk-pixbuf-csource.exe and .1.
+
+2003-01-02  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkwindow.c (gtk_window_get_focus): Document that it may
+	return NULL.  (#102069)
+
+2003-01-01  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/fnmatch.c (FNMATCH_TEST_CASES): #undef, since having
+	a main() in the library is obviously bad. 
+
+2002-12-27  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_drag_data_received): Place the
+	cursor at drop point.  (#72384)
+	(gtk_text_view_size_allocate): Update the horizontal adjustment
+	value.  (#75694)
+
+2002-12-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix highlighting of
+	selection wrt. to empty lines.  (#90435, #90582, #91619)
+
+	* gtk/gtktextview.c (gtk_text_view_preedit_changed_handler):
+	Keep the cursor on screen.  (#96929)
+
+2002-12-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbuffer.c (paste_from_buffer): 
+	(clipboard_text_received): Let the user action span the insertion
+	and the deletion of the old selection.  (#82844)
+
+2002-12-23  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextiter.c (gtk_text_iter_backward_sentence_starts):
+	Don't call gtk_text_iter_backward_sentence_start() if
+	count is zero.  (#99115)
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Call
+	move_cursor() even if the cursor hasn't moved, since it has the
+	side effect of canceling the selection.  (#81395, #98537, #98333)
+
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+	with empty ranges.  (fixes #101564 and #80637)
+
+2002-12-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that
+	sets the window style and extended window style, and adjusts the
+	width and height to take the window decorations into account
+	earlier. The adjusted width and height used to be ignored. Remove
+	the local x, y, width and height variables, no need to further
+	confuse the code by having local copies. (Partial fix, I hope, for
+	#101588)
+
+	(gdk_window_move): When moving top-level windows, take title bar
+	and border width into account, offsetting the coordinates before
+	calling SetWindowPos().
+
+	(gdk_window_set_decorations, gdk_window_set_functions):
+	Reimplement, taking into account the peculiar semantics of
+	GDK_DECOR_ALL and GDK_FUNC_ALL. (#79036)
+
+	(gdk_window_get_decorations): Implement. (#98981)
+	
+	(gdk_window_set_type_hint): When setting
+	GDK_WINDOW_TYPE_HINT_MENU, call	gdk_window_set_decorations().
+	(#79036)
+
+	* gdk/gdk.def: Add gdk_window_get_decorations. (#98981)
+
+2002-12-21  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextview.c (gtk_text_view_set_background): New static
+	function to set the background of all windows.
+	(gtk_text_view_style_set): Use gtk_text_view_set_background().
+	(gtk_text_view_state_changed): New function; change background
+	according to state.  (#88126)
+
+2002-12-21  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktextview.c (gtk_text_view_move_visually): fix the documentation
+
--- a/55
+++ b/55
@@ -0,0 +1,55 @@
+If you want to hack on the GTK+ project, you'll need to have
+the following packages installed:
+
+	- 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.
+
+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+.
+
+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:
+
+        cvsroot/gtk+# ./autogen.sh
+   
+Basically this does the following for you:
+
+  	cvsroot/gtk+# aclocal; automake; autoconf
+
+        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.  
+
+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.
+
+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.
+
+
--- a/43
+++ b/43
@@ -0,0 +1,43 @@
+Prerequisites
+=============
+
+GTK+ requires the following packages:
+
+ - The GLib, Pango, and Atk libraries, available at the same location as GTK+
+   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
+   Pango-1.2 is recommended.)
+
+ - 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/
+    ftp://swrinde.nde.swri.edu/pub/png/src/
+    ftp://ftp.uu.net/graphics/jpeg/
+
+   If these libraries are not available, the corresponding 
+   image loaders will simply not be built. However, this
+   may cause applications using GTK+ not to function properly.
+
+Simple install procedure
+========================
+
+  % gzip -cd gtk+-2.2.1.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.2.1			   # 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/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
@@ -0,0 +1,43 @@
+Prerequisites
+=============
+
+GTK+ requires the following packages:
+
+ - The GLib, Pango, and Atk libraries, available at the same location as GTK+
+   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
+   Pango-1.2 is recommended.)
+
+ - 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/
+    ftp://swrinde.nde.swri.edu/pub/png/src/
+    ftp://ftp.uu.net/graphics/jpeg/
+
+   If these libraries are not available, the corresponding 
+   image loaders will simply not be built. However, this
+   may cause applications using GTK+ not to function properly.
+
+Simple install procedure
+========================
+
+  % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-@GTK_VERSION@			   # 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/docs/reference/gtk/html/gtk-building.html
+
+Or online at:
+
+ http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
+
--- a/Makefile.am
+++ b/Makefile.am
@@ -0,0 +1,206 @@
+## Makefile.am for GTK+
+
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
+SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
+
+# require automake 1.4
+AUTOMAKE_OPTIONS = 1.4
+
+EXTRA_DIST =			\
+	HACKING			\
+	makecopyright		\
+	NEWS.pre-1-0		\
+	ChangeLog.pre-1-0	\
+	ChangeLog.pre-1-2	\
+	ChangeLog.pre-2-0	\
+	README.cvs-commits	\
+	README.win32		\
+	config.h.win32		\
+	gtk-zip.sh.in		\
+	sanitize-la.sh		\
+	po/README.translators	\
+	po/makefile.mingw	\
+	po/po2tbl.sed.in	\
+	examples/aspectframe/Makefile  \
+	examples/aspectframe/aspectframe.c  \
+	examples/Makefile  \
+	examples/README.1ST  \
+	examples/extract.awk  \
+	examples/extract.sh  \
+	examples/arrow/Makefile	\
+	examples/arrow/arrow.c	\
+	examples/base/Makefile  \
+	examples/base/base.c  \
+	examples/buttonbox/Makefile \
+	examples/buttonbox/buttonbox.c	\
+	examples/buttons/Makefile  \
+	examples/buttons/buttons.c  \
+	examples/buttons/info.xpm  \
+	examples/calendar/Makefile  \
+	examples/calendar/calendar.c  \
+	examples/clist/Makefile  \
+	examples/clist/clist.c  \
+	examples/entry/Makefile  \
+	examples/entry/entry.c  \
+	examples/eventbox/Makefile  \
+	examples/eventbox/eventbox.c  \
+	examples/filesel/Makefile  \
+	examples/filesel/filesel.c  \
+	examples/gtkdial/Makefile  \
+	examples/gtkdial/dial_test.c  \
+	examples/gtkdial/gtkdial.c  \
+	examples/gtkdial/gtkdial.h  \
+	examples/helloworld/Makefile  \
+	examples/helloworld/helloworld.c  \
+	examples/helloworld2/Makefile  \
+	examples/helloworld2/helloworld2.c  \
+	examples/label/Makefile	\
+	examples/label/label.c	\
+	examples/list/Makefile  \
+	examples/list/list.c  \
+	examples/menu/Makefile  \
+	examples/menu/menu.c  \
+	examples/menu/itemfactory.c  \
+	examples/notebook/Makefile  \
+	examples/notebook/notebook.c  \
+	examples/packbox/Makefile  \
+	examples/packbox/packbox.c  \
+	examples/paned/Makefile  \
+	examples/paned/paned.c  \
+	examples/pixmap/Makefile  \
+	examples/pixmap/pixmap.c  \
+	examples/progressbar/Makefile  \
+	examples/progressbar/progressbar.c  \
+	examples/radiobuttons/Makefile  \
+	examples/radiobuttons/radiobuttons.c  \
+	examples/rangewidgets/Makefile  \
+	examples/rangewidgets/rangewidgets.c  \
+	examples/rulers/Makefile  \
+	examples/rulers/rulers.c  \
+	examples/scribble-simple/Makefile  \
+	examples/scribble-simple/scribble-simple.c  \
+	examples/scribble-xinput/Makefile	\
+	examples/scribble-xinput/scribble-xinput.c	\
+	examples/scrolledwin/Makefile  \
+	examples/scrolledwin/scrolledwin.c  \
+	examples/selection/Makefile  \
+	examples/selection/gettargets.c  \
+	examples/selection/setselection.c  \
+	examples/statusbar/Makefile  \
+	examples/statusbar/statusbar.c  \
+	examples/table/Makefile  \
+	examples/table/table.c  \
+	examples/text/Makefile  \
+	examples/text/text.c  \
+	examples/tictactoe/Makefile  \
+	examples/tictactoe/tictactoe.c  \
+	examples/tictactoe/tictactoe.h  \
+	examples/tictactoe/ttt_test.c  \
+	examples/tree/Makefile  \
+	examples/tree/tree.c  \
+	examples/wheelbarrow/Makefile  \
+	examples/wheelbarrow/wheelbarrow.c  \
+	examples/fixed/fixed.c  \
+	examples/fixed/Makefile  \
+	examples/frame/frame.c  \
+	examples/frame/Makefile  \
+	examples/spinbutton/spinbutton.c  \
+	examples/spinbutton/Makefile  \
+	examples/find-examples.sh
+
+GDKTARGET=@gdktarget@
+
+## Copy .pc files to target-specific names
+gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
+	rm -f gtk+-$(GDKTARGET)-2.0.pc && \
+	cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+
+gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
+	rm -f gdk-$(GDKTARGET)-2.0.pc && \
+	cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc
+
+gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
+	rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
+	cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc
+
+gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
+	rm -f gdk-$(GDKTARGET)-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
+
+DISTCLEANFILES =				\
+	gtk+-$(GDKTARGET)-2.0.pc		\
+	gdk-$(GDKTARGET)-2.0.pc			\
+	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
+	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
+install-data-hook:
+	(cd $(DESTDIR)$(pkgconfigdir) && \
+	 test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
+	(cd $(DESTDIR)$(pkgconfigdir) && \
+	 rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
+
+dist-hook:
+	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
+	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
+	     CONFIG_HEADERS= \
+	     $(SHELL) config.status \
+	     && cp INSTALL README $(distdir) ; \
+	fi
+
+.PHONY: files release sanity snapshot
+
+files:
+	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
+	  echo $$p; \
+	done
+	@for subdir in $(SUBDIRS); do \
+	  files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \
+	  for file in $$files; do \
+	    echo $$subdir/$$file; \
+	  done; \
+	done
+
+release:
+	rm -rf .deps */.deps
+	$(MAKE) distcheck
+
+sanity:
+	./sanity_check $(VERSION)
+
+
+snapshot:
+	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+
+# This is a version of the automake-1.4 distcheck rule modified
+# to pass --enable-gtk-doc to ./configure
+#
+mydistcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	-rm -rf $(distdir)
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
--- a/9150
+++ b/9150
--- a/NEWS.pre-1-0
+++ b/NEWS.pre-1-0
--- a/NEWS.pre-2.0
+++ b/NEWS.pre-2.0
@@ -1,903 +0,0 @@
-Overview of Changes in GTK+ 2.0.0
-=================================
-
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, Darin Adler]
-* Build fixes [Anders Carlsson, Tor Lillqvist, Manish Singh]
-* Bug fixes. [Thomas Leonard, Owen Taylor]
-
-Overview of Changes in GTK+ 2.0.0 rc1
-=====================================
-
-* GtkTreeView fixes [Kristian Rietveld, Jonathan Blandford, Richard Hult]
-* Text widget fixes [Havoc Pennington]
-* Efficiency fixes when using Xft [Owen Taylor]
-* Key handling fixes and other fixes for Win32 [Hans Breuer, Tor Lillqvist]
-* Try to fix key handling without XKEYBOARD extension [Owen]
-* Documentation fixes and improvements 
-  [Matthias Clasen, Alexey Malyshev, Akira Tagoh, Vitaly Tishkov]
-* Widget drawing improvements [Soeren Sandmann]
-* Allow cycling between multiple menu bars with <Control>Tab [Owen]
-* Try to build libraries with only shared library dependencies on Xft to 
-  deal with transition to Xft2 [Owen]
-* Portability fixes [Owen, Miroslaw Dobrzanski-Neumann]
-* Don't use red as the default cursor color [Owen]
-* Bug fixes, bug fixes, bug fixes.
-
-Other contributors: Darin Adler, Jacob Berkman, Kevin Breit, Hans Breuer, 
-  Anders Carlsson, Damon Chaplin, Finlay Dobbie, Jody Goldberg,
-  Andreas J. Guelzow, Scott Guilbeaux, Vlad Harchev, James Henstridge,
-  Tim Janik, Satyajit Kanungo, Charles Kerr, Sergey Kuzminov, Miles Lane, 
-  Alexander Larsson, Paolo Maggi, Skip Montaro, Jan Mynarik, Sven Neumann, 
-  Padraig O'Briain, Narayani Pattipati, Mark Patton, Havoc Pennington, 
-  Ettore Perazzoli, Guillermo S. Romero, Manish Singh, Morten Welinder
-
-Overview of Changes in GTK+ 1.3.15
-==================================
-
-* New stock and improved icon images
-  [Tuomas Kuosmanen, Jakub Steiner, Anders Carlsson]
-* Widget drawing improvements for check and radio buttons,
-  spinbuttons [Soeren Sandmann]
-* Clean up module search path algorithm, use GTK_PATH [Owen Taylor]
-* Add GtkSetting for font name. [Richard Hestilow]
-* Much improved key matching code, accelerators work independent
-  of group [Owen]
-* Make mnemonics work for embedded GtkPlug widgets [Owen]
-* Keynav improvements for GtkTreeView [Kristian Rietveld]
-* Fix gtk_tree_view_scroll_to_cell() [Jonathan Blandford]
-* Rename gtk_tree_view_get_iter_root() and gtk_tree_path_new_root()
-  to gtk_tree_view_get_iter_first() and gtk_tree_path_new_first(),
-  add compatibility macros.
-* GtkTreeView bug fixes [Kristian, Anders, Damon Chaplin]
-* GtkTextView bug fixes [Havoc Pennington]
-* Pad class structures for future binary compatibility [Owen]
-* Tutorial improvements [Sven Neumann, Matthias Clasen]
-* Fixes for MULTIPLE selection target [Gregory Merchan, Owen]
-* Fix problems with initial widget size [Owen]
-* AIX compilation fixes [Miroslaw Dobrzanski-Neumann]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Miscellaneous bug fixes
-
-Other contributors: David L. Cooper, Eric Fischer, Jody Goldberg, 
-  Satajyit Kanungo, Thomas Leonard, Mark Patton, Manish Singh, 
-  Nicolas Setton
-
-Overview of Changes in GTK+ 1.3.14
-==================================
-
-* Keyboard focus improvements [Owen Taylor]
-* Code cleanup [Matthias Clasen, Manish Singh, Darin Adler]
-* Fix accidentally exported variables [Mark McLoughlin]
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, John Harper, Darin]
-* Default to yellow tooltips [Owen]
-* RC file fixes for reloading, priorities [Owen, Matthias]
-* GtkMenu behavior improvements and bug fixes [Owen, Arnaud Charlet]
-* GtkTextView fixes [Havoc Pennington, Daniel Elstner, Dennis Bjorklund]
-* Improve keynav for paned widgets, tooltips, spin buttons, notebooks, 
-  scrolled windows [Soeren Sandmann, Padraig, Owen]
-* Add Emacs/Default key themes [Owen]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Ethiopic input methods [Daniel Yacob]
-* Opaque paned window resizing [Soeren]
-* Tweak table expansion behavior [Tim Janik]
-* Fix GtkCalendar focus drawing [Bill Haneman]
-* Allow themeable cursor thickness [Bill]
-* Start of fixing of tutorial for GTK+-2.0 [Matthias]
-* Add a ::adjust-bounds signal to GtkRange to allow spreadsheet style
-  scrollbars. [Jody Goldberg]
-* Add the ability to turn on multiple selection for GtkFileSel [Manish]
-* Bug fixes
-
-Other contributors: Jacob Berkman, Padraig O'Briain, Anders Carlsson,
- Johan Dahlin, Richard Hult, Stefan Kost, Alex Larsson, Thomas Leonard,
- Paolo Maggi, Alexey Malyshev, Federico Mena Quintero, Skip Montaro,
- Sven Neumann, Havoc Pennington, Laszlo Peter, Christian Rose, Joe Shaw,
- Kevin Vandersloot,  Morten Welinder, Peter Williams
-
-Overview of Changes in GTK+ 1.3.13
-==================================
-
-* Tree view fixes. [Kristian Rietveld, Jonathan Blandford, Anders Carlsson]
-* Tree view support for low-vision themes [Bill Haneman]
-* Text view bug fixes. [Havoc Pennington]
-* Win32 fixes and improvements.  [Tor Lillqvist, Hans Breuer, 
-  Archaeopteryx Software]
-* Documentation improvements [Matthias Clasen, Havoc Pennington]
-* Accelerate alpha compositing using RENDER extension if present,
-  and optimize the non-RENDER case a lot. [Owen Taylor]
-* Add support for "optional keybindings" (action signal returns FALSE) [Owen]
-* Fixed the infamous changing directory deletes filename bug 
-  [Owen and a cast of thousands]
-* Add mouse cursor hiding for text widgets [Anders Carlsson]
-* Simple Hangul input module [Yusuke Tabata]
-* Removed the scary startup warning.
-* GdkPixbuf pixel handling fixes [Owen, Michael Hore, Jim Cape]
-* Converted GtkFileSelection and GtkFontSelection to use GtKTreeView widgets
-  instead of the deprecated GtkCList [Owen]
-* gtkhsv.h was installed by mistake, fixed that. [reported by Ross Burton]
-* gdk_pixbuf_render_to_drawable() now also handles alpha pixbufs.
-* Made Gtkimage draw GtkPixmap, GtkImage, GdkPixbuf insensitive, prelighted,
-  etc. [Havoc, Owen]
-* Marked gtk_item_factory_path_from_widget() G_CONST_RETURN. [Matt Wilson]
-* gtk_image_menu_item_new_from_stock() now falls back to
-  new_with_mnemonic, for consistency with gtk_button_new_from_stock()
-  [Havoc Pennington]
-* GdkModifierType is now consistently used for modifier mask parameters
-  [Mark Patton]
-* gtk_widget_set_accel_path() is now publically exported.
-
-Other contributors: Darin Adler, Jeffrey Baker, Damon Chaplin, Brian Cameron, 
-  Murray Cumming, James Henstridge, Jacob Berkman, Arnaud Charlet, Jeff Franks, 
-  Jeff Garzik, Jody Goldberg, Diego Gonzalez, Melvin Hadasht, Raja Harinath, 
-  Tim Janik, Mike Kestner, Mathieu Lacage, Alex Larsson, Ryan Lovett, 
-  Mark McLoughlin, Sven Neumann, Padraig O'Briain, Xavier Ordoquy, Chris Phelps, 
-  Detlef Reichl, Guillermo S. Romero, Federico Mena Quintero, Manish Singh,
-  HideToshi Tajima, Vitaly Tishkov, Jon Trowbridge, Sergey Vlasov.
-
-Overview of Changes in GTK+ 1.3.12
-==================================
-
-* Fix problems with PNG saving [Michael Natterer]
-* Cleanups of deprecated usages [Sebastian Wilhelmi]
-* Win32 fixes [Tor Lillqvist]
-* Documentation improvements [Matthias Clasen, Havoc Pennington, 
-  Vitaly Tishkov]
-* Frame buffer port fixes [Manish Singh]
-* GtkTextView bug fixes [Havoc Pennington, Chris Phelps]
-* Menu behavior improvements [Kristian Rietveld]
-* Make focus line width configurable, focus color work on 
-  dark themes. [Bill Haneman, Owen Taylor]
-* Add state argument to gtk_paint_focus() [Bill]
-* Added incremental revalidation to tree view, for better apparent speed 
-  [Jonathan Blandford]
-* Remove useless gtk_tree_view_column_cell_event() [Jonathan]
-* Display XIM status in a separate window [HideToshi Tajima]
-* Add GDK_DEBUG=nograbs to disable pointer, keyboard grabs [Jacob Berkman]
-* Add menu of Unicode control characters to GtkEntry, GtkTextView 
-  [Dov Grobgeld, Havoc]
-* Pass key releases along to input methods [Owen]
-* Many bug fixes
-
-Other contributors: Darin Adler, Fabrice Bellet, Chris Blizzard, 
-  Hans Breuer, Anders Carlsson, Damon Chaplin, Murray Cumming, Jeff Franks, 
-  James Henstridge, Tim Janik, Alex Larsson, George Lebl, Kjartan, Maraas, 
-  Sven Neumann, Seth Nickell, Padraig O'Briain, Soeren Sandmann, Manish Singh, 
-  Matt Wilson
-
-Overview of Changes in GTK+ 1.3.11
-==================================
-
-* Massive rework of accelerator API and implementation (Tim Janik)
-* Major fixes to resizing and redrawing to eliminate hysteresis
-  and optimize. (Owen Taylor, Soeren Sandmann)
-* Make many widgets NO_WINDOW to improve appearance and reduce
-  drawing overhead (Owen)
-* Text view fixes (Havoc Pennington)
-* Make child widgets in GtkTextView work (Havoc)
-* GtkTreeModelSort fixage (Jonathan Blandford, Kristian Rietveld)
-* Clean up GtkTreeView drag and drop support (Owen)
-* Misc tree view fixes and improvements (Jonathan, Kristian, Anders, Matt Wilson)
-* Add gtk_window_get/set_focus(), gtk_window_set_default() as public
-  functions (Owen, Damian Ivereigh)
-* Fixes to GtkPlug/GtkSocket (Michael Meeks, Owen)
-* Change button ordering in standard dialogs to correspond to 
-  GNOME usability project proposal (Gregory Merchan)
-* Add support for context sensitivity in input methods (Owen)
-* Hook up gtk_im_context_set_use_preedit() (Hidetoshi Tajima)
-* Fix gdk_window_scroll() and other aspects of big windows (Owen)
-* Remove need for X connection for class initialization (Jacob Berkman)
-* Propagate key events to parents of focused widget (Owen)
-* Don't export normal GTK+ marshalers, export deprecated compat marshalers (Owen)
-* Many Win32 Fixes and improvements (Hans Breuer, Tor Lillqvist)
-* Bug and documentation fixing (Matthias Clasen, Anders Carlsson,
-  Jacob Berkman, others.)
-
-Other Contributors:
-  Darin Adler, Marius Andreiana, Erwann Chenede, Murray Cumming, Janet Davis, 
-  Daniel Egger, Daniel Elstner, Jeff Franks, Alex Larsson, George Lebl, 
-  Sergey Kuzminov, Eric Lemings, Arkadiusz Miskiewicz, Padraig O'Briain, Sven Neumann, 
-  Kristian Rietveld, Nicolas Setton, Manish Singh,  Vitaly Tishkov, Sebastian Wilhelmi, 
-  Michael Natterer
-
-Overview of Changes in GTK+ 1.3.10
-==================================
-
-* GtkTextView fixes [Havoc Pennington]
-* GtkTreeView fixes and improvements [Jonathan Blandford, Kristian,
-  Manish Singh, Joshua Pritikin, Oleg Maiboroda, James Henstridge]
-* gtkdemo improvements [Kristian Rietveld]
-* Drag and drop fixes to generic code and widgets 
-  [Owen Taylor, Damian Ivereigh]
-* Documentation improvement [Havoc Pennington, Matthias Clasen]
-* Spelling fixes [Jacob Berkman]
-* Move signals to the GtkEditable interface [Kristian]
-* Further stock image improvements [Jakub Steiner]
-* Support text chunks for the PGN loader, add gdk_pixbuf_get_option()
-  [Sven Neumann]
-* Rename gdk_pixbuf_new_from_stream back to new_from_inline [Owen]
-* Automatically call setlocale(), unless explicitly disabled [Owen]
-* Property addition to various widgets [Michael Meeks, Owen]
-* Support building with automake-1.4 [James]
-* Make GtkRadioButton groups act as a single focus point [Owen]
-* Move gdk_window_lookup etc. to be cross-platform [Matthias]
-* Draw spinbuttons variably sized [Kristian]
-* Separate GdkAtom out from X atoms for compatibility with future
-  multihead changes [Owen]
-* Require gdk_threads_init() to be explicitly called instead
-  of piggybacking off of g_thread_init(). [Owen]
-* Improvements to text-view/label/entry popup menus [Damian, Jacob, Owen]
-* Bug fixes and cleanup [Matthias, others]
-
-Other Contributors:
-  Mark McLoughin, Mikael Hermansson, Soeren Sandmann, Anders Carlsson,
-  Tim Janik, Murray Cumming, Hidetoshi Tajima, Padraig O'Briain, 
-  Hans Breuer, Vitaly Tishkov, Dov Grobgeld
- 
-
-Overview of Changes in GTK+ 1.3.9
-=================================
-
-* Add editable text cells to GtkTreeView.
-  Keynav, drawing fixes in GtkTreeView [Jonathan Blandford]
-* Text widget no longer always has a \n in it. [Havoc Pennington]
-* Text widget bug fixes [Havoc, Dov Grobgeld, Hidetoshi Tajima]
-* Allow -1 for width/height in gdk_pixbuf_render_*(). [Matthias Clasen]
-* Minor fix for major resizing problems in recent releases [Owen Taylor]
-* Restore ability to set _set properties to TRUE for 
-  GtkCellRendererText, GtkTextTag [Owen]
-* Cursor drawing improvements [Owen]
-* Win32 fixes [Hans Breuer]
-* Mark various functions as deprecated or private.
-* Misc bug fixes, portability fixes, and cleanups.
-
-Other Contributors: 
- Vitaly Tishkov, Christian Rose, Frank Belew, Jeff Franks, Sven Neumann,
- Kristian Rietveld, Vitaly Tishkov, Joshua N. Pritikin, Matt Wilson, 
- James Henstridge, Detlef Reichl
-
-Overview of Changes in GTK+ 1.3.8
-=================================
-
-* GtkTreeView and GtkTreeModel API cleanups/improvements [Jrb]
-* GtkOptionMenu scrollwheel support [Alex]
-* GtkModule search paths [Owen]
-* Documenatation updates [Havoc,Jrb]
-* Major Gdk cleanup [Owen]
-* Miscellaneous other fixes/cleanups
-
-Other Contributors:
-  Joshua N Pritikin, Padraig O'Briain, Jakub Steiner, Matthias Clasen,
-  Matt Wilson, James Henstridge
-
-Overview of Changes in GTK+ 1.3.7
-=================================
-
-* Many Pixbuf (loader) improvements [Matthias Clasen, Soeren Sandmann]
-* Added publically installed utility gdk-pixbuf-csource to generate
-  inlined pixbufs in C source code [Tim Janik]
-* Optional movement of button children on press [Soeren, Owen Taylor]
-* Interactive searching in GtkTreeView [Kristian Rietveld]
-* Sorting/ordering improvements for GtkTreeView [Kris, Jonathan Blandford]
-* Animation of expander motion for GtkTreeView [Anders Carlsson]
-* Lots of misc GtkTreeView fixes and improvements [Jonathan]
-* New/improved stock icons [Jakub Steiner] 
-* Code and API rework for window resizing [Havoc Pennington]
-* Converted accel groups to GObject [James Henstridge]
-* More property support improvements
-* Add facility for "secondary" buttons in 
-  GtkButtonBox/GtkDialog [Gregory Merchan]
-* Disentangled child visability from MAPPED state [Owen]
-* Plug/Socket improvements and port to the XEMBED protocol [Owen]
-* Added priorities for styles in RC files, 
-  support multiple parse contents [Owen]
-* Made GdkVisual and GdkDevice GObjects [Alexander Larsson]
-* Key binding improvements [Havoc]
-* Added GtkWidget::event-after signal since normal event handling
-  is now aborted as soon as a handler returned TRUE [Tim]
-* Dnd fixes and improved icon support [Owen]
-* Removed GtkPacker widget
-* Fixing missing paired getters/setters [Kris]
-* Nuked remaining GtkArg cruft, implemented container/child properties [Tim]
-* Added window grab groups [Owen]
-* Many frame buffer improvements [Alex]
-* Win32 fixes and improvements [Hans Breuer]
-* Warning fixes [Darin Adler]
-* Miscellaneous bug and API fixes [Matthias et. al]
-
-Other Contributors:
-  Joshua N Pritikin, Hidetoshi Tajima, Manish Singh, ERDI Gergo, Jens Finke,
-  Chema Celorio, Lee Mallabone, Vitaly Tishkov, Sebastian Wilhelmi,
-  Nicola Girardi, Sven Neumann, Padraig O'Briain, Michael Natterer,
-  Suresh Chandrasekharan, Jonas Borgström, Jay Cox, Michael Meeks,
-  Mathias Hasselmann, Peter Williams, Thomas Broyer, Kjartan Maraas,
-  Joel Becker, Jeff Franks, Brian Cameron, Skip Montanaro
-
-Overview of Changes in GTK+ 1.3.6
-=================================
-
-* Properly renders strikethrough text
-* win32 fixes
-* Added "scale" property to GtkTextTag and GtkCellRendererText to do 
-  relative font scaling
-* Added "format_value" signal to GtkScale to reformat value text
-* framebuffer fixes
-* Property support added to lots of widgets
-* Many GtkTreeView new features and API/implementation fixes
-* Lots of new_with_mnemonic() convenience functions
-* Change GtkImageMenuItem API to be more consistent/useful
-* Added lots of new stock items/icons
-* Rewrote GtkRange/GtkScale/GtkScrollbar, includes support for
-  enabling/disabling extra scrollbar stepper arrows in gtkrc so NeXT
-  themes won't need broken hacks
-* Convenience API for GtkRange similar to the one added to GtkSpinButton
-  a while back
-* Make menubar/toolbar work properly with xthickness/ythickness of 1 or 0, 
-  and move some attributes from program settings to user settings.
-  Allows nice 1-pixel-bevel themes.
-* Moved ::focus virtual function from GtkContainer to GtkWidget
-* Plenty of bug fixes
-
-Overview of Changes in GTK+ 1.3.5
-=================================
-
-* New default theme based on Raleigh theme for 1.2.x.
-* Dependency on the ATK library added as a step to
-  providing accessibility-enabling interfaces
-* XEMBED-based GtkPlug/GtkSocket now basically works.
-* Drag and drop of column headers in GtkTreeView
-* GtkColorSelector work: hooks for saving and propagating palette, UI tweaks,
-  and API sanitation
-* Key binding fixes
-* Configurable padding/spacing in a lot of places
-* Invisible text in GtkTextView fixed
-* SHM segments now created with a mode of 0600
-* Bug fixes
-
-Overview of Changes in GTK+ 1.3.4
-=================================
-
-* Win32 fixes
-* GtkTreeView improvements and fixes
-* Fix glib-2.0.m4
-* Miscellaneous bug fixes
-
-Overview of Changes in GTK+ 1.3.3
-=================================
-
-[ 5600 lines of ChangeLog ]
-
-* API cleanups
-* Win32 work (Tor, Hans Breuer)
-* Focus improvements (Owen)
-* Frame buffer improvements (Alex)
-* Work on GtkTextView (Havoc)
-* Much work on GtkTreeView (Jonathan)
-* Selectable labels (Havoc)
-* Converted many arguments to properties (Lee Mallabone, John Margaglione)
-* Add exact regions to GdkExposeEvent, propagate it. (Alex)
-* Added ability to have resize grips in status bars (etc.) using
-  _NET_WM_MOVERESIZE protocol. (Havoc)
-* Added mnemnonic mechanism to make setting underline accelerators
-  much easier. (Alex)
-* Add per-style property mechanism to allow themes to change 
-  geometry parameters. (Tim)
-* Added global settings mechanisms for settings such as double-click
-  time. (Tim, Owen)
-* Various support functions for new and old WM properties (Havoc, Alex)
-* Add TRUE-stops-returns for boolean-returning signals (Ron Steinke)
-
-Overview of Changes in GTK+ 1.3.2
-=================================
-
-GTK Core:
-
-* New stock-icon and stock-item system. Use themeable pixbufs in
-  dialogs, buttons, etc. [Havoc]
-* Theme engines reworked to use derivation and new object system. [Owen]
-* Added GtkClipboard object for simple selection handling. [Owen]
-* Make GtkEditable an interface, move implementation to GtkOldEditable for
-  compat. [Owen]
-* Better handling of default directionality. [Robert]
-* Use GSignal as backend for GtkSignal and other GObject stuff. [Tim]
-* Move theme engines to GTypePlugin. [Owen]
-
-GDK:
-
-* Beginning of implementation of client parts of new window manager spec. [Owen]
-* Make gdk_drawable_get_image() work with backing store. [Havoc]
-
-Widgets:
-
-* New text widget [Havoc]
-  - Adjustable tab handling.
-  - Ability to have scrolling side areas in new text widget for tabs/line numbers.
-  - Many cleanups and small improvements.
-* Improvements to submenu navigation [Nils Barth/David Santiago] and
-  scrolling menus. [Alex]
-* Simplification of progress bar API. [Havoc]
-* Make GtkImage a generic image-display widget. [Havoc]
-* New GtkTreeView tree widget. Model/view architecture, flexible rendering,
-  large datasets, etc. [Jonathan]
-* New GtkMessageBox widget for message display. [Havoc]
-* Allow labels to have contents set from XML-like markup language. [Havoc]
-* Make dialogs derive from GtkDialog and use stock buttons. [Havoc]
-
-Internationalization:
-
-* Proper character set conversion for clipboard/selection. [Owen]
-* New input method system via loadable modules; support on-the-spot
-  preedit in GtkEntry and new text widget; allow switching input methods
-  on the fly; include modules for XIM and demo Cyrillic-transliteration 
-  module. [Owen]
-* VIQR, Thai, and Inuktitut input methods. [Robert]
-* Convert po files to UTF-8. [Robert]
-
-gdk-pixbuf:
-
-* Full-alpha compositing for gdk-pixbuf on drawable. [Havoc]
-* Add simple saving to gdk-pixbuf. [David Welton/Havoc]
-* Add improved error handling with GError to gdk-pixbuf. [Havoc]
-
-Ports:
-
-* Much work on Win32 Port. [Tor/Hans]
-* Much work on Linux-FB Port. [Elliot/Alex]
-
-Misc:
-
-* Start of new gtk-demo demo program. [Owen/Jonathan]
-* Bug fixes and more bug fixes.
-
-
-Overview of Changes in GTK+ 1.3.1:
-
-* GTK+ now uses the Pango library for text manipulation. All
-  strings in GTK+ now are in Unicode, languages written
-  from right-to-left, and complex-text languages are now supported.
-* The gdk-pixbuf library for image loading and manipulation is 
-  has been integrated with GTK+.
-* The GTK+ object system has mostly been moved to GLib, separating
-  it from the GUI code. Many significant enhancements have been
-  made as part of this.
-* A new text widget is now included. This started as a port
-  of the Tk text widget, and includes such features of the Tk
-  text widget as tags, marks, and unicode text support. It
-  has been enhanced to support model-view operation and the
-  full power of Pango.
-* The GDK library has been extensively revised to support multiple
-  windowing systems. The only fully functional backend in 1.3.1
-  is the X11 backend, however, ports to Win32, Linux-framebuffer,
-  Nano-X, BeOS, and MacOS exist in various states of completion,
-  and at least some of these will be finished and integrated in 
-  before the final GTK+-2.0 release.
-* 32-bit coordinates are now supported throughout GDK and GTK+
-  (they are emulated where not supported by the windowing system.)
-* Many minor bug fixes and enhancements. Incompatible changes
-  are documented in docs/Changes-2.0.txt
-
-Overview of Changes in GTK+ 1.2.8:
-
-* GNU Make 3.79 bug workaround
-* FAQ and tutorial updates and improvements
-* Miscellaneous bug fixes: CList, Calendar, rc-files, FontSelection
-
-Overview of Changes in GTK+ 1.2.7:
-
-* More header cleanups.
-* Fixed activation bug for insensitive widgets.
-* Locale fixes to RC file parsing code.
-* Miscellaneous bugfixes for Item Factory, CList, CTree, X Selections,
-  HScale, VScale, Pixmap, Viewport, OptionMenu, Entry and Notebook.
-* Upgrade to libtool 1.3.4.
-
-Overview of Changes in GTK+ 1.2.6:
-
-* container queue_resize fixes
-* gtk[vh]scale: minor fixups
-* rename idle to idle_id in testgtk to avoid conflicts with 
-  broken libs
-* More consistent naming of gtkrc files
-* Added language support: ro, uk
-
-Overview of Changes in GTK+ 1.2.5:
-
-* more GtkCTree and GtkWindow bug fixes.
-* more redraw/resize queue fixes, better expose event
-  discarding code.
-* more miscellaneous bugs fixed
-* new configure.in option --disable-rebuilds to completely disable
-  rebuilds of autogenerated sources.
-* check for 5.002 now, to avoid failing autogeneration build rules due
-  to old perl versions.
-* fonts (and fontsets) are cached now.
-* more autogeneration make rules and dependency fixups, we should be
-  save with autogeneration up to make -j12 now ;)
-* new window position GTK_WIN_POS_CENTER_ALWAYS, which will recenter the
-  GtkWindow on every size change.
-* major rework of window manager hints handling code, fixed a bunch of
-  races with the new resizing code.
-* the new wm hints and resizing code is absolutely perfect and bug free now,
-  it only lacks testing ;)
-* fixed up various rc style memory problems.
-* gtk_widget_modify_style() now properly changes the style of realized widgets
-  and references the style passed into it. if people worked around this bug,
-  this will introduce a slight memory leak in their code.
-  The code should typically look like:
-            GtkRcStyle *rc_style = gtk_rc_style_new ();
-            [...]
-            gtk_widget_modify_style (widget, rc_style);
-            gtk_rc_style_unref (rc_style);
-* fix problems with positioning menus offscreen.
-* GtkText fixes for some crashes and drawing errors.
-* Better handling for unexpected window destroys in GDK and GTK+.
-  This should make it possible to use a GtkPlug and catch the
-  case where its parent socket is randomly killed.
-* FAQ updates.
-* FileSelection i18n patches, RadioButton fixups.
-* many translation improvements.
-* miscellaneous other bugs fixed.
-
-Overview of Changes in GTK+ 1.2.4:
-
-* DnD improvements (drags can be canceled with Esc now).
-* suppressed configure event reordering in Gdk.
-* rewrite of Gtk's configure event handling.
-* major improvements for the object argument system (Elena Devdariani).
-* major bugfixes for threading, GtkNotebook, GtkItemFactory, GtkCList and
-  GtkCTree.
-* tutorial/FAQ updates, new file generation.txt on autogenerated sources.
-* configure's --with-glib= is "officially" unsupported.
-* upgrade to libtool 1.3.3.
-* various buglets fixed.
-
-Overview of Changes in GTK+ 1.2.3:
-
-* Upgrade to libtool 1.3
-* Check for dgettext (for systems with old versions of GNU Gettext)
-* Many bug fixes (see ChangeLog for details)
-
-Overview of Changes in GTK+ 1.2.2:
-
-* Improved Dnd behaviour with Motif applications.
-* Bug fixes for the Gtk selection code.
-* Minor bug fixes to the Gdk Atom cache and Dnd code (with --display option).
-* Bug fixes and leak plugs for the Gdk IM code.
-* Added gtk_object_get() facility to retrieve object arguments easily.
-  The var args list expects ("arg-name", &value) pairs.
-* Fixed mapping for GdkInputCondition<->GIOCondition, this should fix
-  problems where closed pipes were no longer signaling GDK_INPUT_READ on
-  systems with a native poll().
-* Some cleanups to GtkLabel's memory allocation code (shouldn't leak memory
-  anymore).
-* We don't attempt to lookup xpm color "None" anymore, this should prevent
-  eXodus (commercial X windows server) from popping up a color dialog every
-  time a transparent pixmap is created.
-* Fixed bug where Gtk timeout/idle handlers would execute without the global
-  Gdk lock being held.
-* Other minor bug fixes.
-
-Overview of Changes in GTK+ 1.2.1:
-
-* Many Bug fixes have been applied to the menu and accelerator code.
-* GtkItemFactory can "adopt" foreign menu items now and manage their
-  accelerator installation. This is often required to get GtkItemFactory
-  like accelerator propagation between different windows with the same
-  menu hierarchy and for centralized parsing and saving of accelerators.
-* GtkCList/GtkCTree buttons should always display correctly now.
-* Miscellaneous other bug fixes.
-
-What's New in GTK+ 1.2.0 (since 1.0.x):
-
-* New widgets: GtkFontSelector, GtkPacker, GtkItemFactory, GtkCTree,
-  GtkInvisible, GtkCalendar, GtkLayout, GtkPlug, GtkSocket
-* Many new features and robustness for existing widgets
-* Theme support
-* New DND implementation
-* Internationalization of standard dialogs
-* New key binding system
-* Tearoff menus and menu accelerators
-* Wide character support for entry and text
-* Resizing code has been overhauled
-* Queued redraws of partial areas
-* Far better support for object arguments
-* Speed optimizations
-* Runtime loading of dynamic modules
-* Support for GLib log domains
-* Tutorial improvements
-* A bug fix or two
-
-Overview of Changes in GTK+ 1.1.16:
-
-* Major fixes and improvements for handlebox
-* A change to the way widget->requisition works. Now,
-  widget->requisition is always what the widget requested,
-  unmodified by the usize. See Changes-1.2.txt for details.
-  This correct various bugs with gtk_widget_set_usize().
-* Fixes for XIM on X11R5 systems
-* Don't allow cut-and-paste of text in password-style entries
-* --enable-debug is now on by default for the development release.
-  (When compiling for "production", use --enable-debug=minimum)
-* Handle systems where Helvetica is not present more gracefully
-* Fixes for memory leaks
-* CList and CTree fixes
-* Bug fixes for drawing problems. 
-* Miscellaneous bug fixes to GtkLabel, GtkCList, GtkCTree,
-  GtkColorsel, Focusing, DND
-* Tutorial improvements
-
-Overview of Changes in GTK+ 1.1.15:
-
-* Tutorial Updates
-* Added --libs gthread to gtk-config 
-* Bug fixes
-
-What is new in GTK+ 1.1.14:
-
-* Additions to docs/Changes-1.2.txt
-* Just warn when loading theme engine fails
-* CLAMP GtkScale digits to a meaningful range
-* GTK_LOCALDIR is now defined in a better fashion
-* New functions (feature freeze, we know...):
-    gtk_menu_set_title()
-    gtk_toggle_button_get_active()
-* Some locale fixups in gtkrc code
-* Fixes to make gtk_radio_button_set_group() keep only
-  one radio button in the group active
-* Foreign windows are now always treated as viewable; this fixes
-  a problem where updating didn't occur properly in GtkPlug
-* DND fixes for 64 bit architectures, and for specifying operations 
-  with modifier keys.
-* Major revisions to GtkLayout: avoid having to create window
-  for NO_WINDOW children, adjust allocations of children as 
-  scrolled so queued draws work, and a resize is queued instead
-  of allocating directly in a put() or move()
-
-What is new in GTK+ 1.1.13:
-
-* Dnd and selection bug fixes and memory purification.
-* Widget sensitivity fixups.
-* Tooltips windows are now named "gtk-tooltips" so rc file rules
-  can match tooltips windows. Fixed interaction of tooltips and NO_WINDOW
-  widgets.
-* Spin buttons now update their values upon value retrieval.
-* Overhaul of the resizing vs. redrawing logic to reduce redrawing needs
-  a lot. Gtk makes full use of the draw_area coalescing code now, which
-  got minorly improved as well.
-* Containers map their Gdk windows after their children now to reduce
-  expose event generation.
-* Gdk event queue fixups, this solves the double-click problems people were
-  recently having.
-* Account for the fact that GSource's are only properly reentrant from
-  within dispatch(), thus we don't do Gdk event processing from within
-  check() or prepare() anymore.
-* Rc files feature a bg_pixmap value of "<none>" now.
-* Improved session management support in Gdk.  
-* Automatic disabling of NLS if no gettext is found should work now.
-* Removed deprecated functions, docs/Changes-1.2.txt gives an overview.
-* Gtk+ development now requires GNU autoconf 2.13, GNU automake 1.4
-  and GNU libtool 1.2d.
-* More bug fixes all over the place.
-
-What is new in GTK+ 1.1.12:
-
-* Korean translation added
-* Fixed memory leaks
-* A few other bug fixes
-
-What is new in GTK+ 1.1.11:
-
-* Dutch, Japanese, Swedish, Polish, and Norwegian translations
-* Removed deprecated _interp variants: gtk_container_foreach_interp, 
-  gtk_idle_add_interp, gtk_timeout_add_interp, gtk_signal_connect_interp
-* Lots of cast corrections
-* Many fixes 
-
-What is new in GTK+ 1.1.9:
-
-* Check for broken glibc 2.0 mb functions and avoid them
-* Label and Entry display fixes 
-* Move main thread back to GDK, for locking when translating events
-* Bug fixes
-
-What is new in GTK+ 1.1.8:
-
-* Added support for gettext and the localization of the standard
-  dialogs.
-* Added line-wrapping for the label, and JUSTIFY_FILL
-* Support reordering via drag and drop in  CList and CTree.
-* Replaced GtkDrawWindow widget with a GTK_USER_DRAW flag
-* Extended gtkpaned API to support minimum sizes and proportional
-  resizing.
-* Changed the handling of shared memory segments so as to 
-  remove the need for GTK+ to set up signal handlers.
-* Re-implemented event loop in terms of the event loop
-  that has been added to GLib 1.1.8
-* Added 'grab_focus' signal to allow keyboard accelerators
-  for entries.
-* Load locale specific RC files if present.
-* Bug fixes.
-
-What is new in GTK+ 1.1.7:
-
-* Fixed memory mis-allocation in default files code
-* Various event handling fixes
-* Wide character support for entry and text
-* Destroy widgets _after_ propagating unrealize signals through 
-  widget hierarchy
-* Only build XIM-support if available
-* Tutorial and examples updates
-* Added gtk_drag_source_unset()
-
-What is new in GTK+ 1.1.6:
-
-* The signal system now features emission hooks with special semantics,
-  refer to the ChangeLog for this.
-* Minor? speedups and memory reductions to the emission handling of the
-  signal system.
-* _interp() function variants are deprecated now. the corresponding *_full()
-  variants are provided for a long time now.
-* Dnd abort timeout increased to 10 minutes.
-* GtkScrolledWindow inherits from GtkBin now.
-* GTK_POLICY_NEVER is implemented for scrolled windows now.
-* Lots of API clean ups.
-* Incremental freezing abilities.
-* Integrated widgets from the GNOME tree: GtkLayout, GtkPlug and GtkSocket.
-* New window functions for transient relationship, default size, and 
-  geometry hints
-* Default rc files are now read in (<sysconfdir/etc/gtkrc and ~/.gtkrc)
-  GTK_RC_FILES environment variable and functions are provided to configure
-  this behavior
-* Read doc/Changes-1.2.txt to properly adapt your code.
-* Bug Fixes.
-
-What is new in GTK+ 1.1.5:
-
-* Theme integration
-* Widget style modification is now handled through GtkRcStyles
-* GtkPixmaps now grey out pixmaps when insensitive
-* Notebook enhancements
-* Shadow configurability for menubars and handleboxes
-* DND enhancements
-* gtkfilesel now supports automounters better
-* Implementation of expose compression
-* Queued redraws of partial areas
-* Scrolledwindow (+Viewport) source incompatibilities, children that are added
-  to a scrolled window don't get an automatic viewport anymore. a convenience
-  function gtk_scrolled_window_add_with_viewport() is supplied for this task
-* Deprecated functions will now issue a message, informing the programmer about
-  the use of this function. These functions will get removed in future versions
-* Non-functional functions got removed entirely
-* gtk_widget_new() and gtk_object_new() will now auto-construct new objects.
-  A new function gtk_object_default_construct() is provided now which should
-  be called after every gtk_type_new() to perform the auto-construction
-* Improved argument support of several widgets
-* Bug Fixes
-
-What is new in GTK+ 1.1.3:
-
-* GtkCList/GtkCTree now have the ability to:
-    - hide/show individual columns
-    - disable/enable column resizing
-    - set min and max for column widths
-    - set expander style of the ctree
-    - set/get row and cell styles
-    - set spacing between tree expander and cell contents in ctree
-    - toggle auto_resize for columns
-* Must enhanced DND support, removed old DND code
-* Idle functions are now implemented via GHook, giving a slight speed
-  improvement
-* An environment variable GTK_MODULES which takes a colon separated
-  list of module names GTK+ will now automatically load at gtk_init() startup
-* GtkFontSel now has support for an extra 'base' filter
-* New function gdk_window_set_root_origin to get the real geometry taking
-  into account window manager offsets
-* New function gtk_text_set_line_wrap to toggle line wrapping
-* New function gtk_widget_add_events which safely adds additional
-  events to a widget's event mask
-* New function gdk_event_get_time to get the timestamp from a generic
-  event
-* New widget GtkCalendar
-* New widget GtkInvisible - InputOnly offscreen windows used for reliable
-  pointer grabs and selection handling in DND code
-* New functions gtk_object_remove_no_notify[_by_id] to remove a certain
-  data portion without invocation of its destroy notifier 
-* gtk_spin_button_construct is now deprecated, use gtk_spin_button_configure
-  instead 
-* gtk_clist_set_border is now deprecated, use gtk_clist_set_shadow_type 
-  instead
-* Removed functions gtk_object_set_data_destroy[_by_id] 
-* Documentation additions/updates 
-* HTML and plain text files are now included in the distribution
-* Bug fixes, typeness corrections, and general fixups
-
-What is new in GTK+ 1.1.2:
-
-* Gtk+ is now featuring runtime loading of dynamic modules via the
-  --gtk-modules= command line switch. such modules have to export a
-  G_MODULE_EXPORT void gtk_module_init (gint *argc, gchar ***argv);
-  function which will be invoked to initialize the module. since such
-  modules may create new widget types, they are always resident.
-* The tutorial has been updated again.
-* Changes to menus including tearoff menus and accelerators.
-* Better support for modal dialogs.
-* Removed CAN_FOCUS by default from scrollbars and button children of toolbar.
-* More improvements and fixes for GtkCList and GtkCTree (i.e. row sorting).
-* GtkCTree rows can be unselectable now.
-* The GtkCTree API has undergone major renames (see ChangeLog entry from Lars
-  Hamann on Tue Aug 18 00:29:13 1998).
-* A bunch of varargs functions changed to get va_lists working on systems that
-  implement va_lists as arrays.
-* Improvements to the gdkrgb code.
-* Improvements to Gdk color handling so we greatly reduce server traffic and
-  don't leak colors anymore.
-* Improved internal widget tree iterators (the GtkContainer::foreach signal
-  vanished because of this).
-* Option menus can have the keyboard focus now.
-* More fixups to the text widget.
-* GtkFileSelection should behave much more nicely in combination with AFS now.
-* Support for label underlining.
-* Support for GLib 1.1.3 log domains.
-* Documentation improvements.
-* Configuration fixes on various platforms.
-* Miscellaneous fixes to XInput support.
-* Build with shared library dependencies on Linux
-* Fix for a major bug in the type systems memory allocation code that could
-  cause random crashes.
-* Libtool update to version 1.2b.
-* Lots of bugfixes and cleanups again ;)
-
-
-What is new in GTK+ 1.1.1:
-
-* Tutorial updates and additions.
-* Key binding support for GtkListItems and GtkList.
-* Extended selection mode and autoscrolling for GtkLists.
-* A GtkCtree now operates on GtkCTreeNode* structures rather than GList*.
-* GtkCTreeNodes can now be created from GNode trees.
-* Bug fixes for GtkNotebook, GtkCList, GtkCombo and GdkWindow reparentation.
-
-
-What is new in GTK+ 1.1.0:
-
-* New widget GtkFontSelector.
-* New featureful progress bar.
-* New container widget GtkPacker.
-* New object GtkItemFactory, GtkMenuFactory is deprecated.
-* New key binding system, configurable via rcfiles, similar to styles.
-* New widget GtkCTree with drag selections and keyboard movement and
-  and horizontal scrolling. Features also implemented for GtkCList.
-* Significant speedups to widget creation and destruction through caching
-  colormap and visual queries to the XServer.
-* Speedups for type creation and especially gtk_type_is_a() checks.
-* Speedups in signal lookup, creation and emissions and connection handling.
-* Minor speedups with object data allocation and destruction.
-* Additions to the signal handling API (e.g. *_emitv).
-* Support for rc-file reparsing.
-* Resizing logic is now implemented on container widget basis, rather than
-  for toplevel GtkWindows only.
-* Buttons support relief styles now.
-* Some widgets are now allocated through memchunks to behave more memory wise.
-* Newly included file gtkfeatures.h which defines compatibility macros to
-  test for certain API features upon program compilation.
-* Child arguments support for container widgets.
-* Far better support for object arguments, revamp of the underlying
-  mechanism for speed and reusability. Child/object arguments don't
-  need to be preceded by the "GtkType::" portion anymore.
-* Removed GtkAcceleratorTable in favour of GtkAccelGroup, accelerator display
-  is now performed by a new widget GtkAccelLabel.
-* Overhaul of the resizing code. Resizing behaviour can now be specified
-  on GtkContainer basis, so the underlying algorithm isn't only available
-  for GtkWindows.
-* GtkTables are now fully resizable.
-* The GtkType system now supports an additional base class initialization
-  function.
-* GtkStyles and key bindings can now be looked up depending on the base
-  types of a widget, through a new keyword `class' in rc files.
-* GtkButton derives from GtkBin (finally).  
-* More descriptive error messages on rc parsing.  
-* Runtime information is available to query enum/flag definition values.
-* Upgrade to libtool-1.2
-* Legions of bug fixes, memory leaks, segfaults, of-by-something errors...
-  including those that already went into the 1.0.x branch.
-* A big bunch of features and cosmetic fixups that just got lost in
-  the masses of changesonfigure problem when cross-compiling
--- a/NEWS.pre-3.0
+++ b/NEWS.pre-3.0
--- a/163
+++ b/163
@@ -0,0 +1,163 @@
+General Information
+===================
+
+This is GTK+ version 2.2.1. 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
+=============
+
+* As compared to GTK+-1.2, the default configuration of GTK+-2 has been 
+  stream-lined to reduce confusion on the part of new users or users 
+  coming from other environments.  Users used to older versions of 
+  GTK+ may want to make some adjustments to the default configuration.
+
+   - Emacs keybindings such as Control-A and Control-E to move to the
+     ends of lines are not enabled by default in the editing widgets. To
+     turn on Emacs keybindings, add the line:
+
+      gtk-key-theme-name = "Emacs"
+   
+     To your ~/.gtkrc-2.0
+
+   - Editing of menu accelerators by pressing an accelerator over the
+     menu item is disabled by default. To enable, it, add:
+
+      gtk-can-change-accels = 1
+
+     to your ~/.gtkrc-2.0
+
+   - To improve useability for keyboard operation, GTK+ now selects the
+     contents of an entry when tabbing into it or when it is focused on
+     initial window map. To disable this behavior, add:
+
+      gtk-entry-select-on-focus = 0
+ 
+     to your ~/.gtkrc-2.0
+
+* 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.
+
+* GTK+-2.2 can be build either with Pango-1.0 and version 1 of
+  the Xft library or Pango-1.2 and version 2 of the Xft library
+  (Xft is used to to display anti-aliased fonts) By default, GTK+ and 
+  Pango are built so that applications will not have explicit dependencies 
+  on either version of Xft. To make sure that your application will be 
+  binary compatible with future versions of GTK+:
+
+    - Do not configure Pango or GTK+ with the --enable-static or
+      --enable-explicit-deps options, since they will cause dependencies 
+      on the particular version of Xft.
+
+    - Do not use Xft version 1 directly in your applications.
+
+* There is a bug in the Xft library in XFree86-4.1 and possibly previous
+  versions that causes random crashes when using the Pango Xft
+  backend. If you want to use Xft fonts, you should upgrade to
+  XFree86-4.2.
+
+* Xft support is on by default when using Xft2 but off by
+  default when using Xft1. To change this default, set the
+  variable GDK_USE_XFT to '1' or '0'. For instance, to 
+  turn on Xft fonts when Xft1.
+
+   GDK_USE_XFT=1
+   export GDK_USE_XFT
+
+* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
+  is provided on a as-is basis and has not been tested at all. No
+  guarantees about the degree of workingness or about future
+  compatibility are provided.
+
+* While efforts have been made to make gdk-pixbuf robust against
+  invalid images, using gdk-pixbuf to load untrusted data 
+  is not recommended, due to the likelyhood that there are
+  additional problems where an invalid image could cause
+  gdk-pixbuf to crash or worse.
+
+* 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_BROKEN_FILENAMES environment variable:
+  
+   G_BROKEN_FILENAMES=1
+   export G_BROKEN_FILENAMES
+
+  Best integration of GTK+-2.2 with the environment is achieved by 
+  using a UTF-8 locale.
+
+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 the testgtk program that is built in the
+  gtk/ subdirectory, that will 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. 
+
+   #gimp on byxnet (irc.gimp.org, irc2.gimp.org, irc3.gimp.org, 
+   irc.germany.gimp.org...)s 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 with out 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 preferrably 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
@@ -0,0 +1,163 @@
+General Information
+===================
+
+This is GTK+ version @GTK_VERSION@. 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
+=============
+
+* As compared to GTK+-1.2, the default configuration of GTK+-2 has been 
+  stream-lined to reduce confusion on the part of new users or users 
+  coming from other environments.  Users used to older versions of 
+  GTK+ may want to make some adjustments to the default configuration.
+
+   - Emacs keybindings such as Control-A and Control-E to move to the
+     ends of lines are not enabled by default in the editing widgets. To
+     turn on Emacs keybindings, add the line:
+
+      gtk-key-theme-name = "Emacs"
+   
+     To your ~/.gtkrc-2.0
+
+   - Editing of menu accelerators by pressing an accelerator over the
+     menu item is disabled by default. To enable, it, add:
+
+      gtk-can-change-accels = 1
+
+     to your ~/.gtkrc-2.0
+
+   - To improve useability for keyboard operation, GTK+ now selects the
+     contents of an entry when tabbing into it or when it is focused on
+     initial window map. To disable this behavior, add:
+
+      gtk-entry-select-on-focus = 0
+ 
+     to your ~/.gtkrc-2.0
+
+* 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.
+
+* GTK+-2.2 can be build either with Pango-1.0 and version 1 of
+  the Xft library or Pango-1.2 and version 2 of the Xft library
+  (Xft is used to to display anti-aliased fonts) By default, GTK+ and 
+  Pango are built so that applications will not have explicit dependencies 
+  on either version of Xft. To make sure that your application will be 
+  binary compatible with future versions of GTK+:
+
+    - Do not configure Pango or GTK+ with the --enable-static or
+      --enable-explicit-deps options, since they will cause dependencies 
+      on the particular version of Xft.
+
+    - Do not use Xft version 1 directly in your applications.
+
+* There is a bug in the Xft library in XFree86-4.1 and possibly previous
+  versions that causes random crashes when using the Pango Xft
+  backend. If you want to use Xft fonts, you should upgrade to
+  XFree86-4.2.
+
+* Xft support is on by default when using Xft2 but off by
+  default when using Xft1. To change this default, set the
+  variable GDK_USE_XFT to '1' or '0'. For instance, to 
+  turn on Xft fonts when Xft1.
+
+   GDK_USE_XFT=1
+   export GDK_USE_XFT
+
+* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
+  is provided on a as-is basis and has not been tested at all. No
+  guarantees about the degree of workingness or about future
+  compatibility are provided.
+
+* While efforts have been made to make gdk-pixbuf robust against
+  invalid images, using gdk-pixbuf to load untrusted data 
+  is not recommended, due to the likelyhood that there are
+  additional problems where an invalid image could cause
+  gdk-pixbuf to crash or worse.
+
+* 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_BROKEN_FILENAMES environment variable:
+  
+   G_BROKEN_FILENAMES=1
+   export G_BROKEN_FILENAMES
+
+  Best integration of GTK+-2.2 with the environment is achieved by 
+  using a UTF-8 locale.
+
+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 the testgtk program that is built in the
+  gtk/ subdirectory, that will 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.md
+++ b/README.md
@@ -1,159 +0,0 @@
-GTK+ — The GTK toolkit
-======================
-
-[![Build Status](https://gitlab.gnome.org/GNOME/gtk/badges/master/build.svg)](https://gitlab.gnome.org/GNOME/gtk/pipelines)
-
-General information
-------------------
-
-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 download location
-
-  - https://download.gnome.org/sources/gtk+
-
-The official web site
-
-  - https://www.gtk.org
-
-The official developers blog
-
-  - https://blog.gtk.org
-
-Information about mailing lists can be found at
-
-  - http://www.gtk.org/mailing-lists.php
-
-Nightly documentation can be found at
-  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
-  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
-  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk/
-
-Building and installing
-----------------------
-
-In order to build GTK+ you will need:
-
-  - [a C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
-  - [Python 3](https://www.python.org/)
-  - [Meson](http://mesonbuild.com)
-  - [Ninja](https://ninja-build.org)
-
-You will also need various dependencies, based on the platform you are
-building for:
-
-  - [GLib](https://download.gnome.org/sources/glib)
-  - [GdkPixbuf](https://download.gnome.org/sources/gdk-pixbuf)
-  - [GObject-Introspection](https://download.gnome.org/sources/gobject-introspection)
-  - [Cairo](https://www.cairographics.org)
-  - [Pango](https://download.gnome.org/sources/pango)
-  - [Epoxy](https://github.com/anholt/libepoxy)
-  - [Graphene](https://github.com/ebassi/graphene)
-  - [ATK](https://download.gnome.org/sources/atk)
-  - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)
-
-If you are building the X11 backend, you will also need:
-
-  - Xlib, and the following X extensions:
-    - xrandr
-    - xrender
-    - xi
-    - xext
-    - xfixes
-    - xcursor
-    - xdamage
-    - xcomposite
-  - [atk-bridge-2.0](https://download.gnome.org/sources/at-spi2-atk)
-
-If you are building the Wayland backend, you will also need:
-
-  - Wayland-client
-  - Wayland-protocols
-  - Wayland-cursor
-  - Wayland-EGL
-
-Once you have all the necessary dependencies, you can build GTK+ by using
-Meson:
-
-```sh
-$ meson _build .
-$ cd _build
-$ ninja
-```
-
-You can run the test suite using:
-
-```sh
-$ meson test
-```
-
-And, finally, you can install GTK+ using:
-
-```
-$ sudo ninja install
-```
-
-Complete information about installing GTK+ and related libraries
-can be found in the file:
-
-```
-docs/reference/gtk/html/gtk-building.html
-```
-
-Or [online](https://developer.gnome.org/gtk4/stable/gtk-building.html)
-
-How to report bugs
------------------
-
-Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/new).
-
-In the bug report please include:
-
-* Information about your system. For instance:
-
-   - which version of GTK+ you are using
-   - what operating system and version
-   - for Linux, which distribution
-   - if you built GTK+, the list of options used to configure the build
-
-  And anything else you think is relevant.
-
-* How to reproduce the bug.
-
-  If you can reproduce it with one of the demo applications that are
-  built in the demos/ subdirectory, on one of the test programs that
-  are built in the tests/ subdirectory, that will 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 occurred.
-
-* Further information such as stack traces may be useful, but
-  is not necessary.
-
-Release notes
-------------
-
-The release notes for GTK+ are part of the migration guide in the API
-reference. See:
-
- - [3.x release notes](https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html)
- - [4.x release notes](https://developer.gnome.org/gtk4/unstable/gtk-migrating-3-to-4.html)
-
-Licensing terms
---------------
-
-GTK+ is released under the terms of the GNU Lesser General Public License,
-version 2.1 or, at your option, any later version, as published by the Free
-Software Foundation.
-
-Please, see the `COPYING` file for further information.
--- a/README.win32
+++ b/README.win32
@@ -0,0 +1,90 @@
+The Win32 port of GTK+ is a work in progress, and not as stable or
+correct as the Unix/X11 version. For more information about the Win32
+port, and prebuilt runtime and developer packages see
+http://www.gimp.org/win32/ .
+
+There is a gtk-1-3-win32-production branch of GTK+ that was branched
+off from before the addition of the no-flicker and other recent
+functionality. That is what should be used by "production" code until
+this CVS HEAD (2.0) version is useable. (But note, the Win32 backend
+has never been claimed to be "production quality", although it works
+surprisingly well for the GIMP.)
+
+Building GTK+ on Win32
+======================
+
+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 might be hell to setup correctly. 
+
+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 --enable-maintainer-mode
+
+It might well be that in order for this to work, you will have to get
+a bleeding-edge version of libtool for Win32, run libtoolize yourself,
+and then run autoconf to generate the configure script.
+
+2) Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
+makefile.msc in gdk and gtk.
+
+Alternative 1 also generates Microsoft import libraries (.lib), if you
+have lib.exe available. It might also work for cross-compilation from
+Unix.
+
+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
+===================
+
+To use GTK+ on Win32, you also need either one of the above mentioned
+compilers. Other compilers might work, but don't count on it. Look for
+prebuilt developer packages (DLLs, import libraries, headers) on the
+above website.
+
+Multi-threaded use of GTK+ on Win32
+===================================
+
+Multi-threaded GTK+ programs might work in special simple cases, but
+not in general. Sorry. If you have all GTK+ and GDK calls in the same
+thread, it might work. Otherwise, probably not at all. Possible ways
+to fix this are being investigated.
+
+Wintab
+======
+
+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.
+
+Libintl
+=======
+
+GTK wants to be built with the GNU "intl" library for
+internationalisation (i18n). Get the version ported to Win32 (not a
+very big deal) from the web site mentioned above. The "intl" library
+as gets built as a DLL called libintl-1.dll. If you don't want any
+i18n stuff, undefine ENABLE_NLS, HAVE_GETTEXT and HAVE_LIBINTL in the
+config.h.win32 file, and remove references to the intl library from
+the makefiles.
+
+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 specifyin 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,79 @@
+/* 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_WINSOCK_H
+#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 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/acinclude.m4
+++ b/acinclude.m4
@@ -0,0 +1,12 @@
+# autoconf 2.13 / 2.50 compatibility macro
+
+# GLIB_AC_DIVERT_BEFORE_HELP(STUFF)
+# ---------------------------------
+# Put STUFF early enough so that they are available for $ac_help expansion.
+# Handle both classic (<= v2.13) and modern autoconf
+AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
+       [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
+              [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+$1
+AC_DIVERT_POP()])])])
--- a/autogen.sh
+++ b/autogen.sh
@@ -0,0 +1,112 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+PROJECT=Gtk+
+TEST_TYPE=-d
+FILE=gdk
+
+DIE=0
+
+have_libtool=false
+if libtool --version < /dev/null > /dev/null 2>&1 ; then
+	libtool_version=`libtoolize --version |  libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+	case $libtool_version in
+	    1.4*)
+		have_libtool=true
+		;;
+	esac
+fi
+if $have_libtool ; then : ; else
+	echo
+	echo "You must have libtool 1.4 installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+	DIE=1
+fi
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have autoconf installed to compile $PROJECT."
+	echo "libtool the appropriate package for your distribution,"
+	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+	DIE=1
+}
+
+have_automake=false
+if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`automake-1.4 --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+	case $automake_version in
+	   1.2*|1.3*|1.4) 
+		;;
+	   *)
+		have_automake=true
+		;;
+	esac
+fi
+if $have_automake ; then : ; else
+	echo
+	echo "You must have automake 1.4-p6 installed to compile $PROJECT."
+	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p6.tar.gz"
+	echo "(or a newer version if it is available)"
+	DIE=1
+fi
+
+if test "$DIE" -eq 1; then
+	exit 1
+fi
+
+test $TEST_TYPE $FILE || {
+	echo "You must run this script in the top-level $PROJECT directory"
+	exit 1
+}
+
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        if test -z "$*"; then
+                echo "I am going to run ./configure with no arguments - if you wish "
+                echo "to pass any to it, please specify them on the $0 command line."
+        fi
+fi
+
+case $CC in
+*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
+esac
+
+if test -z "$ACLOCAL_FLAGS"; then
+
+	acdir=`aclocal-1.4 --print-ac-dir`
+        m4list="glib-2.0.m4 glib-gettext.m4"
+
+	for file in $m4list
+	do
+		if [ ! -f "$acdir/$file" ]; then
+			echo "WARNING: aclocal's directory is $acdir, but..."
+			echo "         no file $acdir/$file"
+			echo "         You may see fatal macro warnings below."
+			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
+			echo "         environment variable to \"-I /some/dir\", or install"
+			echo "         $acdir/$file."
+			echo ""
+		fi
+	done
+fi
+
+aclocal-1.4 $ACLOCAL_FLAGS
+
+# optionally feature autoheader
+(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+
+automake-1.4 -a $am_opt
+autoconf
+cd $ORIGDIR
+
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
+
+        echo 
+        echo "Now type 'make' to compile $PROJECT."
+fi
--- a/build-aux/flatpak/org.gtk.Demo.json
+++ b/build-aux/flatpak/org.gtk.Demo.json
@@ -1,74 +0,0 @@
-{
-    "app-id": "org.gtk.Demo",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-demo",
-    "tags": ["devel", "development", "nightly"],
-    "rename-icon": "gtk4-demo",
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
-        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules": [
-        {
-            "name" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name": "graphene",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name": "gtk",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ]
-}
--- a/build-aux/flatpak/org.gtk.WidgetFactory.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory.json
@@ -1,74 +0,0 @@
-{
-    "app-id": "org.gtk.WidgetFactory",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-widget-factory",
-    "tags": ["devel", "development", "nightly"],
-    "rename-icon": "gtk4-widget-factory",
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
-        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules": [
-        {
-            "name" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name": "graphene",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name": "gtk",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ]
-}
--- a/build-aux/meson/post-install.sh
+++ b/build-aux/meson/post-install.sh
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-gtk_api_version=$1
-gtk_abi_version=$2
-gtk_libdir=$3
-gtk_datadir=$4
-
-# Package managers set this so we don't need to run
-if [ -z "$DESTDIR" ]; then
-  echo Compiling GSettings schemas...
-  glib-compile-schemas ${gtk_datadir}/glib-2.0/schemas
-
-  echo Updating desktop database...
-  update-desktop-database -q ${gtk_datadir}/applications
-
-  echo Updating icon cache...
-  gtk-update-icon-cache -q -t -f ${gtk_datadir}/icons/hicolor
-
-  echo Updating module cache for print backends...
-  mkdir -p ${gtk_libdir}/gtk-4.0/4.0.0/printbackends
-  gio-querymodules ${gtk_libdir}/gtk-4.0/4.0.0/printbackends
-
-  echo Updating module cache for input methods...
-  mkdir -p ${gtk_libdir}/gtk-4.0/4.0.0/immodules
-  gio-querymodules ${gtk_libdir}/gtk-4.0/4.0.0/immodules
-fi
--- a/config.h.meson
+++ b/config.h.meson
@@ -1,317 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
-
-/* The prefix for our gettext translation domains. */
-#mesondefine GETTEXT_PACKAGE
-
-/* Disable deprecation warnings from glib */
-#mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS
-
-/* Define the location where the catalogs will be installed */
-#mesondefine GTK_LOCALEDIR
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
-
-/* Have the cloudproviders library */
-#mesondefine HAVE_CLOUDPROVIDERS
-
-/* define if we have colord */
-#mesondefine HAVE_COLORD
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#mesondefine HAVE_CRT_EXTERNS_H
-
-/* Define to 1 if CUPS 1.6 API is available */
-#mesondefine HAVE_CUPS_API_1_6
-
-/* Define to 1 if you have the `dcgettext' function. */
-#mesondefine HAVE_DCGETTEXT
-
-/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
-   */
-#mesondefine HAVE_DECL_ISINF
-
-/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
-   */
-#mesondefine HAVE_DECL_ISNAN
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#mesondefine HAVE_DLFCN_H
-
-/* Have the ffmpeg library */
-#mesondefine HAVE_FFMPEG
-
-/* Define to 1 if you have the <ftw.h> header file. */
-#mesondefine HAVE_FTW_H
-
-/* Define to 1 if you have the `getpagesize' function. */
-#mesondefine HAVE_GETPAGESIZE
-
-/* Define to 1 if you have the `getresuid' function. */
-#mesondefine HAVE_GETRESUID
-
-/* Define if gio-unix is available */
-#mesondefine HAVE_GIO_UNIX
-
-/* Define if GStreamer support is available */
-#mesondefine HAVE_GSTREAMER
-
-/* Define to 1 if you have the `httpGetAuthString' function. */
-#mesondefine HAVE_HTTPGETAUTHSTRING
-
-/* Define if cups http_t authstring field is accessible */
-#mesondefine HAVE_HTTP_AUTHSTRING
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#mesondefine HAVE_INTTYPES_H
-
-/* Define to 1 if the system has the type `IPrintDialogCallback'. */
-#mesondefine HAVE_IPRINTDIALOGCALLBACK
-
-/* Define to 1 if you have the <locale.h> header file. */
-#mesondefine HAVE_LOCALE_H
-
-/* Define to 1 if you have the `lstat' function. */
-#mesondefine HAVE_LSTAT
-
-/* Define to 1 if you have the `mallinfo' function. */
-#mesondefine HAVE_MALLINFO
-
-/* Define to 1 if you have the <memory.h> header file. */
-#mesondefine HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mkstemp' function. */
-#mesondefine HAVE_MKSTEMP
-
-/* Define to 1 if you have a working `mmap' system call. */
-#mesondefine HAVE_MMAP
-
-/* Define to 1 if you have the `nearbyint' function. */
-#mesondefine HAVE_NEARBYINT
-
-/* Define to 1 if you have the `posix_fallocate' function. */
-#mesondefine HAVE_POSIX_FALLOCATE
-
-/* Have the Xrandr extension library */
-#mesondefine HAVE_RANDR
-
-/* Have the Xrandr 1.5 extension library */
-#mesondefine HAVE_RANDR15
-
-/* Define to 1 if you have the `rint' function. */
-#mesondefine HAVE_RINT
-
-/* Define to 1 if you have the `round' function. */
-#mesondefine HAVE_ROUND
-
-/* Define to 1 if you have the `sincos' function. */
-#mesondefine HAVE_SINCOS
-
-/* Define to 1 if you have the `log2` function */
-#mesondefine HAVE_LOG2
-
-/* Define to 1 if you ahve the `exp2` function */
-#mesondefine HAVE_EXP2
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#mesondefine HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#mesondefine HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#mesondefine HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#mesondefine HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#mesondefine HAVE_SYS_MMAN_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#mesondefine HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#mesondefine HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#mesondefine HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#mesondefine HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#mesondefine HAVE_UNISTD_H
-
-/* Have the XCOMPOSITE X extension */
-#mesondefine HAVE_XCOMPOSITE
-
-/* Have the Xcursor library */
-#mesondefine HAVE_XCURSOR
-
-/* Have the XDAMAGE X extension */
-#mesondefine HAVE_XDAMAGE
-
-/* Have the XFIXES X extension */
-#mesondefine HAVE_XFIXES
-
-/* Define to 1 if XFree Xinerama is available */
-#mesondefine HAVE_XFREE_XINERAMA
-
-/* Have XGenericEvent */
-#mesondefine HAVE_XGENERICEVENTS
-
-/* Define to use XKB extension */
-#mesondefine HAVE_XKB
-
-/* Have the SYNC extension library */
-#mesondefine HAVE_XSYNC
-
-/* Define to 1 if you have the `_lock_file' function */
-#mesondefine HAVE__LOCK_FILE
-
-/* Define to 1 if you have the `flockfile' function */
-#mesondefine HAVE_FLOCKFILE
-
-/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
-#mesondefine HAVE__NL_MEASUREMENT_MEASUREMENT
-
-/* Define if _NL_PAPER_HEIGHT is available */
-#mesondefine HAVE__NL_PAPER_HEIGHT
-
-/* Define if _NL_PAPER_WIDTH is available */
-#mesondefine HAVE__NL_PAPER_WIDTH
-
-/* Define if _NL_TIME_FIRST_WEEKDAY is available */
-#mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#mesondefine LT_OBJDIR
-
-/* Define if <X11/extensions/XIproto.h> needed for xReply */
-#mesondefine NEED_XIPROTO_H_FOR_XREPLY
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#mesondefine NO_MINUS_C_MINUS_O
-
-/* Define to the address where bug reports for this package should be sent. */
-#mesondefine PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#mesondefine PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#mesondefine PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#mesondefine PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#mesondefine PACKAGE_URL
-
-/* Define to the version of this package. */
-#mesondefine PACKAGE_VERSION
-
-/* Use NSBundle functions to determine load paths for libraries, translations,
-   etc. */
-#mesondefine QUARTZ_RELOCATION
-
-/* Define to 1 if you have the ANSI C header files. */
-#mesondefine STDC_HEADERS
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Define to 1 if XInput 2.0 is available */
-#mesondefine XINPUT_2
-
-/* Define to 1 if XInput 2.2 is available */
-#mesondefine XINPUT_2_2
-
-/* Define to 1 if the X Window System is missing or not being used. */
-#mesondefine X_DISPLAY_MISSING
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#mesondefine _FILE_OFFSET_BITS
-
-/* defines how to decorate public symbols while building */
-#mesondefine _GDK_EXTERN
-
-/* Define for large files, on AIX-style hosts. */
-#mesondefine _LARGE_FILES
-
-/* Define to 1 if on MINIX. */
-#mesondefine _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#mesondefine _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#mesondefine _POSIX_SOURCE
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#mesondefine gid_t
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#mesondefine uid_t
-
-/* Define to 1 if linux/memfd.h exists */
-#mesondefine HAVE_LINUX_MEMFD_H
-
-#mesondefine HAVE_LINUX_INPUT_H
-
-#mesondefine HAVE_DEV_EVDEV_INPUT_H
-
-#mesondefine GTK_SYSCONFDIR
-
-#mesondefine GTK_LOCALEDIR
-
-#mesondefine GTK_DATADIR
-
-#mesondefine GTK_LIBDIR
-
-#mesondefine GTK_PRINT_BACKENDS
-
-#mesondefine HAVE_HARFBUZZ
-
-#mesondefine HAVE_PANGOFT
-
-#mesondefine ISO_CODES_PREFIX
-
-#mesondefine MALLOC_IS_ALIGNED16
-
-#mesondefine HAVE_POSIX_MEMALIGN
-
-#mesondefine HAVE_MEMALIGN
-
-#mesondefine HAVE_ALIGNED_ALLOC
-
-#mesondefine HAVE__ALIGNED_MALLOC
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -0,0 +1,289 @@
+/* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
+/* 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_SYS_SELECT_H */
+#ifndef _MSC_VER
+#define HAVE_SYS_TIME_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_SYS_TIME_H */
+#endif /* _MSC_VER */
+#define HAVE_WINSOCK_H 1
+#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 X11R6 additions to XIM */
+/* #undef USE_X11R6_XIM */
+
+/* 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).  */
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define if using `alloca.c'. */
+/* #undef C_ALLOCA */
+
+/* always defined to indicate that i18n is enabled */
+#define ENABLE_NLS 1
+
+/* Define if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define if you have the <argz.h> header file. */
+/* #undef HAVE_ARGZ_H */
+
+/* Define if you have the `bind_textdomain_codeset' function. */
+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
+
+/* Is the wctype implementation broken */
+/* #undef HAVE_BROKEN_WCTYPE */
+
+/* Define if you have the `dcgettext' function. */
+#define HAVE_DCGETTEXT 1
+
+/* Define if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define if you have the `getpagesize' function. */
+#ifndef _MSC_VER
+#define HAVE_GETPAGESIZE 1
+#else /* _MSC_VER */
+/* #undef HAVE_GETPAGESIZE */
+#endif /* _MSC_VER */
+
+/* Define if you have the `getresuid' function. */
+/* #undef HAVE_GETRESUID */
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#define HAVE_GETTEXT 1
+
+/* Define if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+/* #undef HAVE_LC_MESSAGES */
+
+/* Define if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define if you have the `lstat' function. */
+/* #undef HAVE_LSTAT */
+
+/* Define if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define if you have the `mkstemp' function. */
+/* #undef HAVE_MKSTEMP */
+
+/* Define if you have a working `mmap' system call. */
+/* #undef HAVE_MMAP */
+
+/* Define if you have the `munmap' function. */
+/* #undef HAVE_MUNMAP */
+
+/* Define if you have the <nl_types.h> header file. */
+/* #undef HAVE_NL_TYPES_H */
+
+/* Define if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define if you have the <pwd.h> header file. */
+/* #undef HAVE_PWD_H */
+
+/* Define if you have the `setenv' function. */
+/* #undef HAVE_SETENV */
+
+/* Define if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define if you have the <stdint.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_STDINT_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_STDINT_H */
+#endif /* _MSC_VER */
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the `strcasecmp' function. */
+#ifndef _MSC_VER
+#define HAVE_STRCASECMP 1
+#else /* _MSC_VER */
+/* #undef HAVE_STRCASECMP */
+#endif /* _MSC_VER */
+
+/* Define if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define 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 /* _MSC_VER */
+
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* #undef HAVE_SYS_WAIT_H */
+
+/* Define if you have the <unistd.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_UNISTD_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_UNISTD_H */
+#endif /* _MSC_VER */
+
+/* Have wchar.h include file */
+#define HAVE_WCHAR_H 1
+
+/* Have wctype.h include file */
+#define HAVE_WCTYPE_H 1
+
+/* Define if you have the <winsock.h> header file. */
+#define HAVE_WINSOCK_H 1
+
+/* Define if you have the `__argz_count' function. */
+/* #undef HAVE___ARGZ_COUNT */
+
+/* Define if you have the `__argz_next' function. */
+/* #undef HAVE___ARGZ_NEXT */
+
+/* Define if you have the `__argz_stringify' function. */
+/* #undef HAVE___ARGZ_STRINGIFY */
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
+
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define if the X Window System is missing or not being used. */
+/* #undef X_DISPLAY_MISSING */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#define gid_t int
+
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+/* #undef inline */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#define uid_t int
--- 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
@@ -0,0 +1,8 @@
+
+if USE_X11
+XDIRS=gdk-pixbuf-xlib
+else
+XDIRS=
+endif
+
+SUBDIRS=$(XDIRS)
--- 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
@@ -0,0 +1,90 @@
+2002-08-06  jacob berkman  <jacob@ximian.com>
+
+	* Makefile.am (lib_LTLIBRARIES): link against xlibs
+
+2002-01-25  Federico Mena Quintero  <federico@ximian.com>
+
+	Merge from gdk-pixbuf stable.
+
+	* gdk-pixbuf-xlib-drawable.c (rgb565msb): Fixed the endianness
+	conversion --- swap the individual 16 bit values instead of taking
+	everying as a 32 bit value.
+	(rgb565lsb): Likewise.
+	(rgb555lsb): Likewise.
+	(rgb555msb): Likewise.
+
+2001-11-26  Akira TAGOH  <tagoh@redhat.com>
+
+	* Makefile.am (libgdk_pixbuf_xlib_1_3_la_LDFLAGS):
+	Added -version-info.
+
+2001-05-19  Havoc Pennington  <hp@pobox.com>
+
+	* gdk-pixbuf-xlibrgb.c: docs
+
+2001-06-04  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlibrgb.c (xlib_rgb_init): remove C++ comment,
+	reported by Dan McNichol
+
+Mon Jan  8 11:41:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (INCLUDES): Add @x_cflags@ (#36310)
+
+2001-01-02  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlib-2.0.pc.in (Description): fix up description a bit.
+
+2000-10-06  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlib.c: Put display/screen here, instead of in 
+	the main gdk-pixbuf library as it was in 1.0; since the io-xpm 
+	loader doesn't use these variables anymore it should be OK
+
+2000-09-26  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c
+	(gdk_pixbuf_xlib_get_from_drawable): Do not use
+	gdk_screen_{width,height}().  Thanks to John Harper for pointing
+	this out.
+
+2000-08-26  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c: Added API reference docs.
+
+2000-08-25  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c (handle_x_error): Return
+	0.
+	(xlib_window_is_viewable): Return FALSE in the last case.
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-render.c: Updated the inline docs.
+
+	* gdk-pixbuf/gdk-pixbuf-xlib.c: Added API docs.
+
+2000-08-25  John Harper  <john@dcs.warwick.ac.uk>
+
+	Work to create an Xlib version of gdk-pixbuf (with the Xlib
+	port of GdkRGB for rendering):
+
+	* configure.in: check for X libraries, set and substitute
+	GDK_PIXBUF_XLIB_{LIBDIR,INCLUDEDIR,LIBS} variables
+
+	* gdk_pixbuf_xlibConf.sh.in: new file -- gnome-config details
+	for the gdk-pixbuf-xlib library
+	* Makefile.am: build and install gdk_pixbuf_xlibConf.sh
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-render.c,
+	gdk-pixbuf/gdk-pixbuf-xlib.c, gdk-pixbuf/gdk-pixbuf-xlib.h,
+	gdk-pixbuf/gdk-pixbuf-xlib-private.h,
+	gdk-pixbuf/gdk-pixbuf-xlib-drawable.c: new files, ported the
+	GDK dependent parts of gdk-pixbuf to use Xlib. Functions that
+	were called gdk_pixbuf_FOO are now gdk_pixbuf_xlib_FOO
+
+	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c,
+	gdk-pixbuf/gdk-pixbuf-xlibrgb.h: added Chris Blizzard's Xlib
+	port of GdkRGB (from Mozilla CVS)
+
+	* gdk-pixbuf/Makefile.am: build a library libgdk_pixbuf_xlib.la
+	including the non-GDK dependent objects from libgdk_pixbuf.la
+	plus the Xlib ports and xlibrgb
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -0,0 +1,35 @@
+lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
+
+INCLUDES = @STRIP_BEGIN@			\
+	-I$(top_srcdir) -I$(top_builddir) 	\
+	-I$(top_srcdir)/gdk-pixbuf 		\
+	-I$(top_srcdir)/contrib 		\
+	-DG_DISABLE_DEPRECATED			\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
+	@GDK_PIXBUF_XLIB_DEP_CFLAGS@		\
+@STRIP_END@
+
+libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
+	-export-dynamic						\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+libgdk_pixbuf_xlib_2_0_la_LIBADD = \
+	@GDK_PIXBUF_XLIB_DEP_LIBS@
+
+libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
+	gdk-pixbuf-xlib-private.h	\
+        gdk-pixbuf-xlib.c               \
+        gdk-pixbuf-xlib-render.c        \
+        gdk-pixbuf-xlib-drawable.c      \
+        gdk-pixbuf-xlibrgb.c
+
+libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-2.0/gdk-pixbuf-xlib
+
+libgdk_pixbuf_xlibinclude_HEADERS =         		\
+        gdk-pixbuf-xlib.h               	    	\
+        gdk-pixbuf-xlibrgb.h
+
+pkgconfigdir   = $(libdir)/pkgconfig
+pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
+
+EXTRA_DIST = gdk-pixbuf-xlib-2.0.pc.in
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GdkPixbuf Xlib
+Description: GdkPixbuf rendering for Xlib
+Version: @VERSION@
+Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0
+Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
+Cflags: -I${includedir}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h
@@ -0,0 +1,30 @@
+/* GdkPixbuf library - Xlib header file
+ *
+ * Authors: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GDK_PIXBUF_XLIB_PRIVATE_H
+#define GDK_PIXBUF_XLIB_PRIVATE_H
+
+#include "gdk-pixbuf-xlib.h"
+#include <X11/Xlib.h>
+
+extern Display *gdk_pixbuf_dpy;
+extern int gdk_pixbuf_screen;
+
+#endif
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
@@ -0,0 +1,398 @@
+/* GdkPixbuf library - Rendering functions
+ *
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Author: Federico Mena-Quintero <federico@gimp.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Trivially ported to Xlib(RGB) by John Harper. */
+
+#include <config.h>
+#include "gdk-pixbuf-private.h"
+#include "gdk-pixbuf-xlib-private.h"
+
+
+
+/**
+ * gdk_pixbuf_xlib_render_threshold_alpha:
+ * @pixbuf: A pixbuf.
+ * @bitmap: Bitmap where the bilevel mask will be painted to.
+ * @src_x: Source X coordinate.
+ * @src_y: source Y coordinate.
+ * @dest_x: Destination X coordinate.
+ * @dest_y: Destination Y coordinate.
+ * @width: Width of region to threshold.
+ * @height: Height of region to threshold.
+ * @alpha_threshold: Opacity values below this will be painted as zero; all
+ * other values will be painted as one.
+ *
+ * Takes the opacity values in a rectangular portion of a pixbuf and thresholds
+ * them to produce a bi-level alpha mask that can be used as a clipping mask for
+ * a drawable.
+ *
+ **/
+void
+gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
+					int src_x, int src_y,
+					int dest_x, int dest_y,
+					int width, int height,
+					int alpha_threshold)
+{
+	GC gc;
+	XColor color;
+	int x, y;
+	guchar *p;
+	int start, start_status;
+	int status;
+	XGCValues gcv;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (bitmap != 0);
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	g_return_if_fail (alpha_threshold >= 0 && alpha_threshold <= 255);
+
+	if (width == 0 || height == 0)
+		return;
+
+	gc = XCreateGC (gdk_pixbuf_dpy, bitmap, 0, &gcv);
+
+	if (!pixbuf->has_alpha) {
+		color.pixel = (alpha_threshold == 255) ? 0 : 1;
+		XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+		XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
+				dest_x, dest_y, width, height);
+		XFreeGC (gdk_pixbuf_dpy, gc);
+		return;
+	}
+
+	color.pixel = 0;
+	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+	XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
+			dest_x, dest_y, width, height);
+
+	color.pixel = 1;
+	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+
+	for (y = 0; y < height; y++) {
+		p = (pixbuf->pixels + (y + src_y) * pixbuf->rowstride + src_x * pixbuf->n_channels
+		     + pixbuf->n_channels - 1);
+
+		start = 0;
+		start_status = *p < alpha_threshold;
+
+		for (x = 0; x < width; x++) {
+			status = *p < alpha_threshold;
+
+			if (status != start_status) {
+				if (!start_status)
+					XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
+						   start + dest_x, y + dest_y,
+						   x - 1 + dest_x, y + dest_y);
+
+				start = x;
+				start_status = status;
+			}
+
+			p += pixbuf->n_channels;
+		}
+
+		if (!start_status)
+			XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
+				   start + dest_x, y + dest_y,
+				   x - 1 + dest_x, y + dest_y);
+	}
+
+	XFreeGC (gdk_pixbuf_dpy, gc);
+}
+
+
+
+/* Creates a buffer by stripping the alpha channel of a pixbuf */
+static guchar *
+remove_alpha (GdkPixbuf *pixbuf, int x, int y, int width, int height, int *rowstride)
+{
+	guchar *buf;
+	int xx, yy;
+	guchar *src, *dest;
+
+	g_assert (pixbuf->n_channels == 4);
+	g_assert (pixbuf->has_alpha);
+	g_assert (width > 0 && height > 0);
+	g_assert (x >= 0 && x + width <= pixbuf->width);
+	g_assert (y >= 0 && y + height <= pixbuf->height);
+
+	*rowstride = 4 * ((width * 3 + 3) / 4);
+
+	buf = g_new (guchar, *rowstride * height);
+
+	for (yy = 0; yy < height; yy++) {
+		src = pixbuf->pixels + pixbuf->rowstride * (yy + y) + x * pixbuf->n_channels;
+		dest = buf + *rowstride * yy;
+
+		for (xx = 0; xx < width; xx++) {
+			*dest++ = *src++;
+			*dest++ = *src++;
+			*dest++ = *src++;
+			src++;
+		}
+	}
+
+	return buf;
+}
+
+/**
+ * gdk_pixbuf_xlib_render_to_drawable:
+ * @pixbuf: A pixbuf.
+ * @drawable: Destination drawable.
+ * @gc: GC used for rendering.
+ * @src_x: Source X coordinate within pixbuf.
+ * @src_y: Source Y coordinate within pixbuf.
+ * @dest_x: Destination X coordinate within drawable.
+ * @dest_y: Destination Y coordinate within drawable.
+ * @width: Width of region to render, in pixels.
+ * @height: Height of region to render, in pixels.
+ * @dither: Dithering mode for XlibRGB.
+ * @x_dither: X offset for dither.
+ * @y_dither: Y offset for dither.
+ *
+ * Renders a rectangular portion of a pixbuf to a drawable while using the
+ * specified GC.  This is done using XlibRGB, so the specified drawable must
+ * have the XlibRGB visual and colormap.  Note that this function will ignore
+ * the opacity information for images with an alpha channel; the GC must already
+ * have the clipping mask set if you want transparent regions to show through.
+ *
+ * For an explanation of dither offsets, see the XlibRGB documentation.  In
+ * brief, the dither offset is important when re-rendering partial regions of an
+ * image to a rendered version of the full image, or for when the offsets to a
+ * base position change, as in scrolling.  The dither matrix has to be shifted
+ * for consistent visual results.  If you do not have any of these cases, the
+ * dither offsets can be both zero.
+ **/
+void
+gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
+				    Drawable drawable, GC gc,
+				    int src_x, int src_y,
+				    int dest_x, int dest_y,
+				    int width, int height,
+				    XlibRgbDither dither,
+				    int x_dither, int y_dither)
+{
+	guchar *buf;
+	int rowstride;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (drawable != 0);
+	g_return_if_fail (gc != 0);
+
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	if (width == 0 || height == 0)
+		return;
+
+	/* This will have to be modified once we support other image types.
+	 * Also, GdkRGB does not have gdk_draw_rgb_32_image_dithalign(), so we
+	 * have to pack the buffer first.  Sigh.
+	 */
+
+	if (pixbuf->has_alpha)
+		buf = remove_alpha (pixbuf, src_x, src_y, width, height, &rowstride);
+	else {
+		buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 3;
+		rowstride = pixbuf->rowstride;
+	}
+
+	xlib_draw_rgb_image_dithalign (drawable, gc,
+				       dest_x, dest_y,
+				       width, height,
+				       dither,
+				       buf, rowstride,
+				       x_dither, y_dither);
+
+	if (pixbuf->has_alpha)
+		g_free (buf);
+}
+
+
+
+/**
+ * gdk_pixbuf_xlib_render_to_drawable_alpha:
+ * @pixbuf: A pixbuf.
+ * @drawable: Destination drawable.
+ * @src_x: Source X coordinate within pixbuf.
+ * @src_y: Source Y coordinates within pixbuf.
+ * @dest_x: Destination X coordinate within drawable.
+ * @dest_y: Destination Y coordinate within drawable.
+ * @width: Width of region to render, in pixels.
+ * @height: Height of region to render, in pixels.
+ * @alpha_mode: If the image does not have opacity information, this is ignored.
+ * Otherwise, specifies how to handle transparency when rendering.
+ * @alpha_threshold: If the image does have opacity information and @alpha_mode
+ * is GDK_PIXBUF_ALPHA_BILEVEL, specifies the threshold value for opacity
+ * values.
+ * @dither: Dithering mode for XlibRGB.
+ * @x_dither: X offset for dither.
+ * @y_dither: Y offset for dither.
+ *
+ * Renders a rectangular portion of a pixbuf to a drawable.  This is done using
+ * XlibRGB, so the specified drawable must have the XlibRGB visual and colormap.
+ *
+ * When used with #GDK_PIXBUF_ALPHA_BILEVEL, this function has to create a bitmap
+ * out of the thresholded alpha channel of the image and, it has to set this
+ * bitmap as the clipping mask for the GC used for drawing.  This can be a
+ * significant performance penalty depending on the size and the complexity of
+ * the alpha channel of the image.  If performance is crucial, consider handling
+ * the alpha channel yourself (possibly by caching it in your application) and
+ * using gdk_pixbuf_xlib_render_to_drawable() or GdkRGB directly instead.
+ **/
+void
+gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
+					  int src_x, int src_y,
+					  int dest_x, int dest_y,
+					  int width, int height,
+					  GdkPixbufAlphaMode alpha_mode,
+					  int alpha_threshold,
+					  XlibRgbDither dither,
+					  int x_dither, int y_dither)
+{
+	Pixmap bitmap = 0;
+	GC gc;
+	XGCValues gcv;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (drawable != 0);
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	if (width == 0 || height == 0)
+		return;
+
+	gc = XCreateGC (gdk_pixbuf_dpy, drawable, 0, &gcv);
+
+	if (pixbuf->has_alpha) {
+		/* Right now we only support GDK_PIXBUF_ALPHA_BILEVEL, so we
+		 * unconditionally create the clipping mask.
+		 */
+
+		bitmap = XCreatePixmap (gdk_pixbuf_dpy,
+					RootWindow (gdk_pixbuf_dpy,
+						    gdk_pixbuf_screen),
+					width, height, 1);
+		gdk_pixbuf_xlib_render_threshold_alpha (pixbuf, bitmap,
+							src_x, src_y,
+							0, 0,
+							width, height,
+							alpha_threshold);
+
+		XSetClipMask (gdk_pixbuf_dpy, gc, bitmap);
+		XSetClipOrigin (gdk_pixbuf_dpy, gc, dest_x, dest_y);
+	}
+
+	gdk_pixbuf_xlib_render_to_drawable (pixbuf, drawable, gc,
+					    src_x, src_y,
+					    dest_x, dest_y,
+					    width, height,
+					    dither,
+					    x_dither, y_dither);
+
+	if (bitmap)
+	        XFreePixmap (gdk_pixbuf_dpy, bitmap);
+
+	XFreeGC (gdk_pixbuf_dpy, gc);
+}
+
+/**
+ * gdk_pixbuf_xlib_render_pixmap_and_mask:
+ * @pixbuf: A pixbuf.
+ * @pixmap_return: Return value for the created pixmap.
+ * @mask_return: Return value for the created mask.
+ * @alpha_threshold: Threshold value for opacity values.
+ *
+ * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
+ * and @mask_return arguments, respectively, and renders a pixbuf and its
+ * corresponding tresholded alpha mask to them.  This is merely a convenience
+ * function; applications that need to render pixbufs with dither offsets or to
+ * given drawables should use gdk_pixbuf_xlib_render_to_drawable_alpha() or
+ * gdk_pixbuf_xlib_render_to_drawable(), and
+ * gdk_pixbuf_xlib_render_threshold_alpha().
+ *
+ * If the pixbuf does not have an alpha channel, then *@mask_return will be set
+ * to None.
+ **/
+void
+gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
+					Pixmap *pixmap_return,
+					Pixmap *mask_return,
+					int alpha_threshold)
+{
+        g_return_if_fail (pixbuf != NULL);
+
+	if (pixmap_return) {
+		GC gc;
+		XGCValues gcv;
+
+		*pixmap_return = XCreatePixmap (gdk_pixbuf_dpy,
+						RootWindow (gdk_pixbuf_dpy,
+							    gdk_pixbuf_screen),
+						pixbuf->width,
+						pixbuf->height,
+						xlib_rgb_get_depth ());
+		gc = XCreateGC (gdk_pixbuf_dpy, *pixmap_return, 0, &gcv);
+		gdk_pixbuf_xlib_render_to_drawable (pixbuf, *pixmap_return, gc,
+						    0, 0, 0, 0,
+						    pixbuf->width,
+						    pixbuf->height,
+						    XLIB_RGB_DITHER_NORMAL,
+						    0, 0);
+		XFreeGC (gdk_pixbuf_dpy, gc);
+	}
+
+	if (mask_return) {
+		if (pixbuf->has_alpha) {
+		    *mask_return = XCreatePixmap (gdk_pixbuf_dpy,
+						  RootWindow (gdk_pixbuf_dpy,
+							      gdk_pixbuf_screen),
+						  pixbuf->width,
+						  pixbuf->height, 1);
+		    gdk_pixbuf_xlib_render_threshold_alpha (pixbuf,
+							    *mask_return,
+							    0, 0, 0, 0,
+							    pixbuf->width,
+							    pixbuf->height,
+							    alpha_threshold);
+		} else
+			*mask_return = 0;
+	}
+}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
@@ -0,0 +1,63 @@
+/* GdkPixbuf library - Initialization functions
+ *
+ * Author: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <X11/Xlib.h>
+#include <gdk-pixbuf/gdk-pixbuf-private.h>
+#include "gdk-pixbuf-xlib-private.h"
+
+Display *gdk_pixbuf_dpy = NULL;
+int gdk_pixbuf_screen = -1;
+
+/**
+ * gdk_pixbuf_xlib_init:
+ * @display: X display to use.
+ * @screen_num: Screen number.
+ * 
+ * Initializes the gdk-pixbuf Xlib machinery by calling xlib_rgb_init().  This
+ * function should be called near the beginning of your program, or before using
+ * any of the gdk-pixbuf-xlib functions.
+ **/
+void
+gdk_pixbuf_xlib_init (Display *display, int screen_num)
+{
+    xlib_rgb_init (display, ScreenOfDisplay (display, screen_num));
+    gdk_pixbuf_dpy = display;
+    gdk_pixbuf_screen = screen_num;
+}
+
+/**
+ * gdk_pixbuf_xlib_init_with_depth:
+ * @display: X display to use.
+ * @screen_num: Screen number.
+ * @prefDepth: Preferred depth for XlibRGB.
+ * 
+ * Similar to gdk_pixbuf_xlib_init(), but also lets you specify the preferred
+ * depth for XlibRGB if you do not want it to use the default depth it picks.
+ **/
+void
+gdk_pixbuf_xlib_init_with_depth (Display *display,
+				 int screen_num, int prefDepth)
+{
+    xlib_rgb_init_with_depth (display, ScreenOfDisplay (display, screen_num),
+			      prefDepth);
+    gdk_pixbuf_dpy = display;
+    gdk_pixbuf_screen = screen_num;
+}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -0,0 +1,82 @@
+/* GdkPixbuf library - Xlib header file
+ *
+ * Authors: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GDK_PIXBUF_XLIB_H
+#define GDK_PIXBUF_XLIB_H
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
+#include <X11/Xlib.h>
+
+
+
+/* init */
+
+void gdk_pixbuf_xlib_init (Display *display, int screen_num);
+
+void gdk_pixbuf_xlib_init_with_depth (Display *display, int screen_num,
+				      int prefDepth);
+
+
+
+/* render */
+
+void gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
+					     int src_x, int src_y,
+					     int dest_x, int dest_y,
+					     int width, int height,
+					     int alpha_threshold);
+
+void gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
+					 Drawable drawable, GC gc,
+					 int src_x, int src_y,
+					 int dest_x, int dest_y,
+					 int width, int height,
+					 XlibRgbDither dither,
+					 int x_dither, int y_dither);
+
+
+void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
+					       Drawable drawable,
+					       int src_x, int src_y,
+					       int dest_x, int dest_y,
+					       int width, int height,
+					       GdkPixbufAlphaMode alpha_mode,
+					       int alpha_threshold,
+					       XlibRgbDither dither,
+					       int x_dither, int y_dither);
+
+void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
+					     Pixmap *pixmap_return,
+					     Pixmap *mask_return,
+					     int alpha_threshold);
+
+
+
+/* drawable */
+
+GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
+					      Drawable src,
+					      Colormap cmap, Visual *visual,
+					      int src_x, int src_y,
+					      int dest_x, int dest_y,
+					      int width, int height);
+
+#endif /* GDK_PIXBUF_XLIB_H */
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
@@ -0,0 +1,195 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "MPL"); you may not use this file except in
+ * compliance with the MPL.  You may obtain a copy of the MPL at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the MPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
+ * for the specific language governing rights and limitations under the
+ * MPL.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU Library General Public License (the "LGPL"), in
+ * which case the provisions of the LGPL are applicable instead of
+ * those above.  If you wish to allow use of your version of this file
+ * only under the terms of the LGPL and not to allow others to use
+ * your version of this file under the MPL, indicate your decision by
+ * deleting the provisions above and replace them with the notice and
+ * other provisions required by the LGPL.  If you do not delete the
+ * provisions above, a recipient may use your version of this file
+ * under either the MPL or the LGPL.
+ */
+
+/*
+ * This code is derived from GdkRgb.
+ * For more information on GdkRgb, see http://www.levien.com/gdkrgb/
+ * Raph Levien <raph@acm.org>
+ */
+
+/* Ported by Christopher Blizzard to Xlib.  With permission from the
+ * original authors of this file, the contents of this file are also
+ * redistributable under the terms of the Mozilla Public license.  For
+ * information about the Mozilla Public License, please see the
+ * license information at http://www.mozilla.org/MPL/
+ */
+
+/* This code is copyright the following authors:
+ * Raph Levien          <raph@acm.org>
+ * Manish Singh         <manish@gtk.org>
+ * Tim Janik            <timj@gtk.org>
+ * Peter Mattis         <petm@xcf.berkeley.edu>
+ * Spencer Kimball      <spencer@xcf.berkeley.edu>
+ * Josh MacDonald       <jmacd@xcf.berkeley.edu>
+ * Christopher Blizzard <blizzard@redhat.com>
+ * Owen Taylor          <otaylor@redhat.com>
+ * Shawn T. Amundson    <amundson@gtk.org>
+*/
+
+
+#ifndef __XLIB_RGB_H__
+#define __XLIB_RGB_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xos.h>
+#include <X11/Intrinsic.h>
+
+#include <glib.h>
+
+typedef struct _XlibRgbCmap XlibRgbCmap;
+
+struct _XlibRgbCmap {
+  unsigned int colors[256];
+  unsigned char lut[256]; /* for 8-bit modes */
+};
+
+void
+xlib_rgb_init (Display *display, Screen *screen);
+void
+xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth);
+
+unsigned long
+xlib_rgb_xpixel_from_rgb (guint32 rgb);
+
+void
+xlib_rgb_gc_set_foreground (GC gc, guint32 rgb);
+
+void
+xlib_rgb_gc_set_background (GC gc, guint32 rgb);
+
+typedef enum
+{
+  XLIB_RGB_DITHER_NONE,
+  XLIB_RGB_DITHER_NORMAL,
+  XLIB_RGB_DITHER_MAX
+} XlibRgbDither;
+
+void
+xlib_draw_rgb_image (Drawable drawable,
+		     GC gc,
+		     int x,
+		     int y,
+		     int width,
+		     int height,
+		     XlibRgbDither dith,
+		     unsigned char *rgb_buf,
+		     int rowstride);
+
+void
+xlib_draw_rgb_image_dithalign (Drawable drawable,
+			       GC gc,
+			       int x,
+			       int y,
+			       int width,
+			       int height,
+			       XlibRgbDither dith,
+			       unsigned char *rgb_buf,
+			       int rowstride,
+			       int xdith,
+			       int ydith);
+
+void
+xlib_draw_rgb_32_image (Drawable drawable,
+			GC gc,
+			int x,
+			int y,
+			int width,
+			int height,
+			XlibRgbDither dith,
+			unsigned char *buf,
+			int rowstride);
+
+void
+xlib_draw_gray_image (Drawable drawable,
+		      GC gc,
+		      int x,
+		      int y,
+		      int width,
+		      int height,
+		      XlibRgbDither dith,
+		      unsigned char *buf,
+		      int rowstride);
+
+XlibRgbCmap *
+xlib_rgb_cmap_new (guint32 *colors, int n_colors);
+
+void
+xlib_rgb_cmap_free (XlibRgbCmap *cmap);
+
+void
+xlib_draw_indexed_image (Drawable drawable,
+                         GC gc,
+                         int x,
+                         int y,
+                         int width,
+                         int height,
+                         XlibRgbDither dith,
+                         unsigned char *buf,
+                         int rowstride,
+                         XlibRgbCmap *cmap);
+
+/* Below are some functions which are primarily useful for debugging
+   and experimentation. */
+Bool
+xlib_rgb_ditherable (void);
+
+void
+xlib_rgb_set_verbose (Bool verbose);
+
+/* experimental colormap stuff */
+void
+xlib_rgb_set_install (Bool install);
+
+void
+xlib_rgb_set_min_colors (int min_colors);
+
+Colormap
+xlib_rgb_get_cmap (void);
+
+Visual *
+xlib_rgb_get_visual (void);
+
+XVisualInfo *
+xlib_rgb_get_visual_info (void);
+
+int
+xlib_rgb_get_depth (void);
+
+Display *
+xlib_rgb_get_display (void);
+
+Screen *
+xlib_rgb_get_screen (void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __XLIB_RGB_H__ */
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -0,0 +1,18 @@
+libgtk1 for Debian
+----------------------
+
+The GIMP Tool Kit (gtk) is a set of widgets to help you program
+programs for the X Windowing System easily and powerfully.
+
+gtk is the moving force behind The GNU Image Manipulation Program (The
+GIMP) -- the number one freely-available image editing and creation
+program available. 
+
+gtk is rapidly under development, and the source tree has officially
+been separated from The GIMP now, as other teams of programmers
+are beginning to write software using its great widget set -- like
+GNOME, a desktop interface for X, and gzilla, a freely available
+web browser for X.
+
+Ben Gertzfield <che@debian.org>, Mon, 29 Sep 1997 13:11:45 -0700
+
--- a/debian/build
+++ b/debian/build
@@ -0,0 +1,62 @@
+#!/usr/bin/perl -w
+
+				# Adjust debian/changelog and build a new
+				# Debian package of a CVS archive.
+
+				# Written 17 November 1998 by Ben Gertzfield
+				# <che@debian.org>
+
+				# This work is released under the GNU
+				# General Public License, version 2 or
+				# later.
+
+use strict;
+use diagnostics;
+use File::Copy;
+
+my $maintainer = 'Ben Gertzfield <che@debian.org>';
+
+my @date = localtime;
+
+my $datestr = sprintf("%d%.2d%.2d", $date[5] + 1900, $date[4] + 1, $date[3]);
+my $revision = '01';
+
+open (CHANGELOG, 'debian/changelog') or die "Couldn't open debian/changelog: $!\n";
+
+$_ = <CHANGELOG>;
+chomp;
+
+close CHANGELOG;
+
+my ($package, $last_date, $last_revision) = /^(.*?) \((.*?)\.(.*)?\)/;
+
+if ($last_date eq $datestr) {
+  $revision = sprintf("%.2d", $last_revision + 1);
+}
+
+my $new_version = "$datestr.$revision";
+
+copy('debian/changelog', 'debian/changelog.old') or die "Couldn't copy debian/changelog to debian/changelog.old: $!\n";
+
+open(NEWCHANGELOG, ">debian/changelog") or die "Couldn't open debian/changelog for writing: $!\n";
+
+print NEWCHANGELOG "$package ($new_version) unstable; urgency=low\n\n  * CVS snapshot build at " . scalar localtime() . "\n\n -- $maintainer  " . `date -R` . "\n";
+
+open(OLDCHANGELOG, "debian/changelog.old") or die "Couldn't open debian/changelog.old: $!\n";
+
+while (<OLDCHANGELOG>) {
+  print NEWCHANGELOG;
+}
+
+close OLDCHANGELOG;
+close NEWCHANGELOG;
+
+unlink('debian/changelog.old') or die "Couldn't unlink debian/changelog.old: $!\n";
+
+open(NEWVERSION, '>debian/version') or die "Couldn't open debian/version for writing: $!\n";
+print NEWVERSION "$new_version\n";
+close NEWVERSION;
+
+system('dpkg-buildpackage -b -rfakeroot -us -uc');
+unlink 'debian/version' or die "Couldn't unlink debian/version: $!\n";
+
--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,10 @@
+gtk+-cvs (19981116.01) unstable; urgency=low
+
+  * First test build from CVS
+
+ -- Ben Gertzfield <che@debian.org>  Tue, 17 Nov 1998 12:02:13 -0800
+
+Local variables:
+mode: debian-changelog
+add-log-mailing-address: "che@debian.org"
+End:
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,81 @@
+Source: gtk+-cvs
+Priority: extra
+Section: libs
+Maintainer: Ben Gertzfield <che@debian.org>
+Standards-Version: 2.4.0.0
+
+Package: libgtk-cvs-1.1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libgtk-dev (<< 1:1.0.2), libgtk1.1
+Description: CVS build of the GIMP Toolkit set of widgets for X
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ . 
+ The GIMP Toolkit is a freely available set of widgets for X.
+ GTK is easy to use, and has been implemented in such projects as
+ The GNU Image Manipulation Program (The GIMP), GNOME, a GNU
+ desktop set of utilities for X, and gzilla, a GNU web-browser.
+ .
+ This is the unstable 1.1 branch of GTK. It is not intended for use
+ with stable projects!
+
+Package: libgtk-cvs-dev
+Architecture: any
+Section: devel
+Depends: libgtk-cvs-1.1 (=${Source-Version}), libglib-cvs-dev
+Suggests: libgtk-cvs-doc
+Provides: libgtk1.1-dev
+Replaces: libgtk1.1-dev
+Conflicts: libgtk-dev, libgtk1 (<< 1:1.0.4), libgtk1.1-dev
+Description: CVS build of development files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains the header files and static libraries for the
+ GIMP Toolkit set of widgets for X. 
+ .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
+ Install this package if you wish to develop your own X programs using
+ the GIMP Toolkit 1.1, or if you wish to compile your own plug-ins for
+ The GIMP.
+
+Package: libgtk-cvs-doc
+Architecture: all
+Section: doc
+Conflicts: libgtk-dev (<< 1:0.99.4), libgtk-doc, libgtk1.1-doc
+Description: CVS build of documentation for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains lots of info-files, HTML docs, FAQs, and
+ other handy documentation about the GIMP Toolkit set of widgets
+ for X. 
+ .
+ This package documents the unstable 1.1 release of the GIMP Toolkit.
+ . 
+ Install this package if you want to have lots of info about the
+ GIMP toolkit when you're programming.
+
+Package: libgtk-cvs-dbg
+Architecture: any
+Section: devel
+Depends: libgtk-cvs-1.1 (= ${Source-Version}), libgtk-cvs-dev (= ${Source-Version})
+Suggests: libgtk-cvs-doc
+Conflicts: libgtk1.1-dbg
+Description: CVS build of debugging files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains the debugging static libraries for the
+ GIMP Toolkit set of widgets for X. 
+ .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
+ Install this package if you wish to debug your own X programs using
+ the GIMP Toolkit 1.1, or if you wish to debug your own plug-ins for
+ The GIMP.
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,8 @@
+This package was debianized by Ben Gertzfield <che@debian.org> on
+Tue, 17 Nov 1998 12:07:17 -0800
+
+It was produced from the CVS repository at cvs.gimp.org.
+
+It may be redistributed under the terms of the GNU LGPL, Version 2 or
+later, found on Debian systems in the file /usr/doc/copyright/LGPL.
+
--- a/debian/libgtk-cvs-dev.files
+++ b/debian/libgtk-cvs-dev.files
@@ -0,0 +1,9 @@
+usr/lib/libgdk.so
+usr/lib/libgdk.a
+usr/lib/libgtk.so
+usr/lib/libgtk.a
+usr/include/gdk/
+usr/include/gtk/
+usr/bin/gtk-config
+usr/man/man1/gtk-config.1
+usr/share/aclocal/gtk.m4
--- a/debian/libgtk-cvs-dev.postinst
+++ b/debian/libgtk-cvs-dev.postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
--- a/debian/libgtk-cvs-dev.prerm
+++ b/debian/libgtk-cvs-dev.prerm
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+install-info --quiet --remove gtk
+
+#DEBHELPER#
--- a/debian/libgtk-cvs-doc.files
+++ b/debian/libgtk-cvs-doc.files
@@ -0,0 +1,8 @@
+usr/info/gdk.info
+usr/info/gtk.info
+usr/info/gtk.info-1
+usr/info/gtk.info-2
+usr/info/gtk.info-3
+usr/info/gtk.info-4
+usr/info/gtk.info-5
+
--- a/debian/libgtk-cvs-doc.postinst
+++ b/debian/libgtk-cvs-doc.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+install-info --quiet --description="The GIMP Toolkit." \
+ --section "The GIMP" "The GIMP" /usr/info/gtk.info.gz
+
+install-info --quiet --description="The GIMP Drawing Kit." \
+ --section "The GIMP" "The GIMP" /usr/info/gdk.info.gz
+
+#DEBHELPER#
--- a/debian/libgtk-cvs-doc.prerm
+++ b/debian/libgtk-cvs-doc.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+install-info --quiet --remove gtk
+install-info --quiet --remove gdk
+
+#DEBHELPER#
--- a/debian/postinst
+++ b/debian/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+ldconfig
+
+#DEBHELPER#
--- a/debian/rules
+++ b/debian/rules
@@ -0,0 +1,160 @@
+#!/usr/bin/make -f
+
+# debian/rules file for gtk+ Debian package
+# written April 1998 by Ben Gertzfield <che@debian.org
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	./autogen.sh --prefix=/usr --with-xinput=xfree
+	$(MAKE)
+	cd docs && make distdocs
+	cd ..
+	touch build-stamp
+
+build-dbg: build-dbg-stamp
+build-dbg-stamp:
+	dh_testdir
+	./configure --prefix=/usr --with-xinput=xfree --enable-debug=yes
+	$(MAKE)
+	touch build-dbg-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs 
+	-$(MAKE) maintainer-clean
+	cd ..
+	-$(MAKE) distclean
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
+	dh_clean
+
+clean-dbg:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs
+	-$(MAKE) maintainer-clean
+	cd ..
+	-$(MAKE) distclean
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
+	dh_clean -k
+
+install: install-stamp
+install-stamp: build
+	dh_testdir
+	dh_testroot
+	dh_clean
+	$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	touch install-stamp
+
+install-dbg: install-dbg-stamp
+install-dbg-stamp: build-dbg
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) prefix=`pwd`/debian/libgtk-cvs-dbg/usr install
+	touch install-dbg-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install libgtk-cvs-doc
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install libgtk-cvs-dev libgtk-cvs-1.1 libgtk-cvs-dbg
+
+libgtk-cvs-1.1: build
+	dh_testdir -plibgtk-cvs-1.1 
+	dh_testroot -plibgtk-cvs-1.1
+	dh_installdirs -plibgtk-cvs-1.1
+	# Add here commands to install the files into debian/tmp
+	rm -rf debian/tmp/usr/bin debian/tmp/usr/include debian/tmp/usr/info debian/tmp/usr/lib/glib debian/tmp/usr/share/aclocal debian/tmp/usr/man debian/tmp/usr/lib/*.la
+	dh_installdocs -plibgtk-cvs-1.1
+	dh_installchangelogs -plibgtk-cvs-1.1
+	dh_strip -plibgtk-cvs-1.1
+	dh_compress -plibgtk-cvs-1.1
+	dh_fixperms -plibgtk-cvs-1.1
+	dh_installdeb -plibgtk-cvs-1.1
+	dh_shlibdeps -plibgtk-cvs-1.1
+	dh_gencontrol -plibgtk-cvs-1.1
+	dh_makeshlibs -plibgtk-cvs-1.1 -V 'libgtk-cvs-1.1 (='`cat debian/version`')'
+	dh_md5sums -plibgtk-cvs-1.1
+	dh_builddeb -plibgtk-cvs-1.1
+
+libgtk-cvs-dev: build
+	dh_testdir -plibgtk-cvs-dev
+	dh_testroot -plibgtk-cvs-dev
+	dh_clean -plibgtk-cvs-dev -k
+	dh_installdirs -plibgtk-cvs-dev
+	# Add here commands to install the files into debian/tmp
+	dh_movefiles -plibgtk-cvs-dev
+	cp gtk-config debian/tmp/usr/bin
+	dh_installdocs -plibgtk-cvs-dev 
+	dh_installchangelogs -plibgtk-cvs-dev
+	dh_strip -plibgtk-cvs-dev
+	dh_compress -plibgtk-cvs-dev
+	dh_fixperms -plibgtk-cvs-dev
+	dh_installdeb -plibgtk-cvs-dev
+	dh_shlibdeps -plibgtk-cvs-dev
+	dh_gencontrol -plibgtk-cvs-dev
+	dh_md5sums -plibgtk-cvs-dev
+	dh_builddeb -plibgtk-cvs-dev
+
+libgtk-cvs-doc:
+	dh_testdir -plibgtk-cvs-doc
+	dh_testroot -plibgtk-cvs-doc
+	dh_clean -plibgtk-cvs-doc -k
+	dh_installdirs -plibgtk-cvs-doc usr/doc/libgtk-cvs-doc/faq-html \
+	  usr/doc/libgtk-cvs-doc/tutorial-html usr/doc/libgtk-cvs-doc/italian-tutorial-html usr/doc/libgtk-cvs-doc/french-tutorial-html usr/doc/libgtk-cvs-doc/gdk-html
+	dh_movefiles -plibgtk-cvs-doc
+	cp docs/html/gtkfaq*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/faq-html
+	cp docs/html/gtk_tut-*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut_it*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/gtk_tut_fr*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/gdk* debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/gdk-html
+	cp docs/text/*.txt debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/
+
+	dh_installdocs -plibgtk-cvs-doc docs/{debugging,developers,styles,text_widget,widget_system,gtk-config,refcounting}.txt TODO NEWS
+	dh_installchangelogs -plibgtk-cvs-doc
+	dh_strip -plibgtk-cvs-doc
+	dh_compress -plibgtk-cvs-doc
+	dh_fixperms -plibgtk-cvs-doc
+	dh_installdeb -plibgtk-cvs-doc
+	dh_shlibdeps -plibgtk-cvs-doc
+	dh_gencontrol -plibgtk-cvs-doc
+	dh_md5sums -plibgtk-cvs-doc
+	dh_builddeb -plibgtk-cvs-doc
+
+libgtk-cvs-dbg: clean-dbg install-dbg
+	dh_testdir -plibgtk-cvs-dbg
+	dh_testroot -plibgtk-cvs-dbg
+	dh_installdirs -plibgtk-cvs-dbg
+	# Add here commands to install the files into debian/libgtk-cvs-dbg
+	rm -rf debian/libgtk-cvs-dbg/usr/bin debian/libgtk-cvs-dbg/usr/include debian/libgtk-cvs-dbg/usr/info debian/libgtk-cvs-dbg/usr/lib/glib debian/libgtk-cvs-dbg/usr/man debian/libgtk-cvs-dbg/usr/share debian/libgtk-cvs-dbg/usr/lib/*.{la,so*}
+	for file in `find debian/libgtk-cvs-dbg/usr/lib -name '*.a'` ; do \
+	  mv $$file debian/libgtk-cvs-dbg/usr/lib/`basename $$file .a`_g.a; \
+        done
+	dh_installdocs -plibgtk-cvs-dbg
+	dh_installchangelogs -plibgtk-cvs-dbg
+	dh_compress -plibgtk-cvs-dbg
+	dh_fixperms -plibgtk-cvs-dbg
+	dh_installdeb -plibgtk-cvs-dbg
+	dh_shlibdeps -plibgtk-cvs-dbg
+	dh_gencontrol -plibgtk-cvs-dbg
+	dh_md5sums -plibgtk-cvs-dbg
+	dh_builddeb -plibgtk-cvs-dbg
+
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
--- 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
@@ -0,0 +1,78 @@
+## Makefile.am for gtk+/demos
+
+SUBDIRS = gtk-demo
+
+INCLUDES = @STRIP_BEGIN@ \
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gdk				\
+	-DG_DISABLE_DEPRECATED	 			\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+	-DGDK_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED			\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_DEP_CFLAGS@				\
+@STRIP_END@
+
+DEPS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@ 				\
+	$(top_builddir)/gtk/@gtktargetlib@
+
+LDADDS = @STRIP_BEGIN@ 							\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@        			\
+	$(top_builddir)/gtk/@gtktargetlib@ 				\
+@STRIP_END@
+
+noinst_PROGRAMS = 		\
+	testpixbuf 		\
+	testpixbuf-drawable 	\
+	testanimation 		\
+	testpixbuf-save		\
+	testpixbuf-scale 	\
+	pixbuf-demo
+
+if CROSS_COMPILING
+pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
+else
+pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$$topdir/gdk-pixbuf/gdk-pixbuf.loaders $$topdir/gdk-pixbuf/gdk-pixbuf-csource
+endif
+
+test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders apple-red.png gnome-foot.png
+	(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
+	  cd $(srcdir) &&				     \
+	      $(pixbuf_csource) --build-list \
+	        apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h || (rm -f $$curdir/test-inline-pixbufs.h && false))
+
+testpixbuf_DEPENDENCIES = $(DEPS)
+testpixbuf_drawable_DEPENDENCIES = $(DEPS)
+testpixbuf_save_DEPENDENCIES = $(DEPS)
+testpixbuf_scale_DEPENDENCIES = $(DEPS)
+testanimation_DEPENDENCIES = $(DEPS)
+pixbuf_demo_DEPENDENCIES = $(DEPS)
+
+testpixbuf_LDADD = $(LDADDS)
+testpixbuf_drawable_LDADD = $(LDADDS)
+testpixbuf_save_LDADD = $(LDADDS)
+testpixbuf_scale_LDADD = $(LDADDS)
+testanimation_LDADD = $(LDADDS)
+pixbuf_demo_LDADD = $(LDADDS)
+
+testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
+$(testpixbuf_OBJECTS): test-inline-pixbufs.h
+testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
+testpixbuf_save_SOURCES = testpixbuf-save.c
+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 =			\
+	apple-red.png		\
+	background.jpg		\
+	gnome-applets.png	\
+	gnome-calendar.png	\
+	gnome-foot.png		\
+	gnome-gimp.png		\
+	gnome-gmush.png		\
+	gnome-gsame.png		\
+	gnu-keys.png
--- a/demos/apple-red.png
+++ b/demos/apple-red.png
--- a/demos/background.jpg
+++ b/demos/background.jpg
--- a/demos/gnome-applets.png
+++ b/demos/gnome-applets.png
--- a/demos/gnome-calendar.png
+++ b/demos/gnome-calendar.png
--- a/demos/gnome-foot.png
+++ b/demos/gnome-foot.png
--- a/demos/gnome-gimp.png
+++ b/demos/gnome-gimp.png
--- a/demos/gnome-gmush.png
+++ b/demos/gnome-gmush.png
--- a/demos/gnome-gsame.png
+++ b/demos/gnome-gsame.png
--- a/demos/gnu-keys.png
+++ b/demos/gnu-keys.png
--- a/demos/gtk-demo/.cvsignore
+++ b/demos/gtk-demo/.cvsignore
@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+.libs
+.deps
+gtk-demo
+demos.h
+
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -0,0 +1,83 @@
+## Makefile.am for gtk+/demos
+
+democodedir=$(datadir)/gtk-2.0/demo
+
+## These should be in the order you want them to appear in the 
+## demo app, which means alphabetized by demo title, not filename
+demos = @STRIP_BEGIN@	\
+	appwindow.c	\
+	button_box.c	\
+	changedisplay.c	\
+	colorsel.c	\
+	dialog.c	\
+	drawingarea.c	\
+	editable_cells.c \
+	images.c	\
+	item_factory.c	\
+	list_store.c	\
+	menus.c		\
+	panes.c		\
+	pixbufs.c	\
+	sizegroup.c	\
+	stock_browser.c	\
+	textview.c	\
+	tree_store.c	\
+@STRIP_END@
+
+INCLUDES = @STRIP_BEGIN@ \
+	-DDEMOCODEDIR="\"$(democodedir)\""		\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gdk				\
+	-DG_DISABLE_DEPRECATED	 			\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+	-DGDK_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED 			\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_DEP_CFLAGS@				\
+@STRIP_END@
+
+DEPS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@ 				\
+	$(top_builddir)/gtk/@gtktargetlib@
+
+LDADDS = @STRIP_BEGIN@ 							\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@        			\
+	$(top_builddir)/gtk/@gtktargetlib@ 				\
+@STRIP_END@
+
+bin_PROGRAMS = gtk-demo
+
+BUILT_SOURCES = demos.h
+
+EXTRA_DIST = 		\
+	geninclude.pl	\
+	$(IMAGEFILES)
+
+demos.h: $(demos) geninclude.pl
+	(cd $(srcdir) && $(PERL) ./geninclude.pl $(demos) > demos.h)
+
+gtk_demo_SOURCES = 		\
+	$(demos)		\
+	demo-common.h		\
+	main.c			\
+	demos.h
+
+gtk_demo_DEPENDENCIES = $(DEPS)
+gtk_demo_LDADD = $(LDADDS)
+
+IMAGEFILES=	alphatest.png		\
+	        apple-red.png		\
+		background.jpg		\
+		floppybuddy.gif		\
+		gnome-applets.png	\
+		gnome-calendar.png	\
+		gnome-foot.png		\
+		gnome-gimp.png		\
+		gnome-gmush.png		\
+		gnome-gsame.png		\
+		gnu-keys.png		\
+		gtk-logo-rgb.gif
+
+democode_DATA = $(demos) $(IMAGEFILES)
--- a/demos/gtk-demo/alias_cursor.png
+++ b/demos/gtk-demo/alias_cursor.png
--- a/demos/gtk-demo/all_scroll_cursor.png
+++ b/demos/gtk-demo/all_scroll_cursor.png
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -1,546 +0,0 @@
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-typedef GtkApplication DemoApplication;
-typedef GtkApplicationClass DemoApplicationClass;
-
-G_DEFINE_TYPE (DemoApplication, demo_application, GTK_TYPE_APPLICATION)
-
-typedef struct {
-  GtkApplicationWindow parent_instance;
-
-  GtkWidget *message;
-  GtkWidget *infobar;
-  GtkWidget *status;
-  GtkWidget *menutool;
-  GMenuModel *toolmenu;
-  GtkTextBuffer *buffer;
-
-  int width;
-  int height;
-  gboolean maximized;
-  gboolean fullscreen;
-} DemoApplicationWindow;
-typedef GtkApplicationWindowClass DemoApplicationWindowClass;
-
-G_DEFINE_TYPE (DemoApplicationWindow, demo_application_window, GTK_TYPE_APPLICATION_WINDOW)
-
-static void create_window (GApplication *app, const char *contents);
-
-static void
-show_action_dialog (GSimpleAction *action)
-{
-  const gchar *name;
-  GtkWidget *dialog;
-
-  name = g_action_get_name (G_ACTION (action));
-
-  dialog = gtk_message_dialog_new (NULL,
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_CLOSE,
-                                   "You activated action: \"%s\"",
-                                    name);
-
-  g_signal_connect (dialog, "response",
-                    G_CALLBACK (gtk_widget_destroy), NULL);
-
-  gtk_widget_show (dialog);
-}
-
-static void
-show_action_infobar (GSimpleAction *action,
-                     GVariant      *parameter,
-                     gpointer       data)
-{
-  DemoApplicationWindow *window = data;
-  gchar *text;
-  const gchar *name;
-  const gchar *value;
-
-  name = g_action_get_name (G_ACTION (action));
-  value = g_variant_get_string (parameter, NULL);
-
-  text = g_strdup_printf ("You activated radio action: \"%s\".\n"
-                          "Current value: %s", name, value);
-  gtk_label_set_text (GTK_LABEL (window->message), text);
-  gtk_widget_show (window->infobar);
-  g_free (text);
-}
-
-static void
-activate_action (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  show_action_dialog (action);
-}
-
-static void
-activate_new (GSimpleAction *action,
-              GVariant      *parameter,
-              gpointer       user_data)
-{
-  GApplication *app = user_data;
-
-  create_window (app, NULL);
-}
-
-static void
-open_response_cb (GtkNativeDialog *dialog,
-                  gint             response_id,
-                  gpointer         user_data)
-{
-  GtkFileChooserNative *native = user_data;
-  GApplication *app = g_object_get_data (G_OBJECT (native), "app");
-  GtkWidget *message_dialog;
-  GFile *file;
-  char *contents;
-  GError *error = NULL;
-
-  if (response_id == GTK_RESPONSE_ACCEPT)
-    {
-      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (native));
-
-      if (g_file_load_contents (file, NULL, &contents, NULL, NULL, &error))
-        {
-          create_window (app, contents);
-          g_free (contents);
-        }
-      else
-        {
-          message_dialog = gtk_message_dialog_new (NULL,
-                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                   GTK_MESSAGE_ERROR,
-                                                   GTK_BUTTONS_CLOSE,
-                                                   "Error loading file: \"%s\"",
-                                                   error->message);
-          g_signal_connect (message_dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
-          gtk_widget_show (message_dialog);
-          g_error_free (error);
-        }
-    }
-
-  gtk_native_dialog_destroy (GTK_NATIVE_DIALOG (native));
-  g_object_unref (native);
-}
-
-
-static void
-activate_open (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  GApplication *app = user_data;
-  GtkFileChooserNative *native;
-
-  native = gtk_file_chooser_native_new ("Open File",
-                                        NULL,
-                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        "_Open",
-                                        "_Cancel");
-
-  g_object_set_data_full (G_OBJECT (native), "app", g_object_ref (app), g_object_unref);
-  g_signal_connect (native,
-                    "response",
-                    G_CALLBACK (open_response_cb),
-                    native);
-
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (native));
-}
-
-static void
-activate_toggle (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  GVariant *state;
-
-  show_action_dialog (action);
-
-  state = g_action_get_state (G_ACTION (action));
-  g_action_change_state (G_ACTION (action), g_variant_new_boolean (!g_variant_get_boolean (state)));
-  g_variant_unref (state);
-}
-
-static void
-activate_radio (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
-{
-  show_action_infobar (action, parameter, user_data);
-
-  g_action_change_state (G_ACTION (action), parameter);
-}
-
-static void
-activate_about (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-
-  const gchar *authors[] = {
-    "Peter Mattis",
-    "Spencer Kimball",
-    "Josh MacDonald",
-    "and many more...",
-    NULL
-  };
-
-  const gchar *documentors[] = {
-    "Owen Taylor",
-    "Tony Gale",
-    "Matthias Clasen <mclasen@redhat.com>",
-    "and many more...",
-    NULL
-  };
-
-  gtk_show_about_dialog (GTK_WINDOW (window),
-                         "program-name", "GTK+ Code Demos",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
-                                                     PACKAGE_VERSION,
-                                                     gtk_get_major_version (),
-                                                     gtk_get_minor_version (),
-                                                     gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
-                         "license-type", GTK_LICENSE_LGPL_2_1,
-                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ functions.",
-                         "authors", authors,
-                         "documenters", documentors,
-                         "logo-icon-name", "gtk4-demo",
-                         "title", "About GTK+ Code Demos",
-                         NULL);
-}
-
-static void
-activate_quit (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  GtkApplication *app = user_data;
-  GtkWidget *win;
-  GList *list, *next;
-
-  list = gtk_application_get_windows (app);
-  while (list)
-    {
-      win = list->data;
-      next = list->next;
-
-      gtk_widget_destroy (GTK_WIDGET (win));
-
-      list = next;
-    }
-}
-
-static void
-update_statusbar (GtkTextBuffer         *buffer,
-                  DemoApplicationWindow *window)
-{
-  gchar *msg;
-  gint row, col;
-  gint count;
-  GtkTextIter iter;
-
-  /* clear any previous message, underflow is allowed */
-  gtk_statusbar_pop (GTK_STATUSBAR (window->status), 0);
-
-  count = gtk_text_buffer_get_char_count (buffer);
-
-  gtk_text_buffer_get_iter_at_mark (buffer,
-                                    &iter,
-                                    gtk_text_buffer_get_insert (buffer));
-
-  row = gtk_text_iter_get_line (&iter);
-  col = gtk_text_iter_get_line_offset (&iter);
-
-  msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
-                         row, col, count);
-
-  gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, msg);
-
-  g_free (msg);
-}
-
-static void
-mark_set_callback (GtkTextBuffer         *buffer,
-                   const GtkTextIter     *new_location,
-                   GtkTextMark           *mark,
-                   DemoApplicationWindow *window)
-{
-  update_statusbar (buffer, window);
-}
-
-static void
-change_theme_state (GSimpleAction *action,
-                    GVariant      *state,
-                    gpointer       user_data)
-{
-  GtkSettings *settings = gtk_settings_get_default ();
-
-  g_object_set (G_OBJECT (settings),
-                "gtk-application-prefer-dark-theme",
-                g_variant_get_boolean (state),
-                NULL);
-
-  g_simple_action_set_state (action, state);
-}
-
-static void
-change_radio_state (GSimpleAction *action,
-                    GVariant      *state,
-                    gpointer       user_data)
-{
-  g_simple_action_set_state (action, state);
-}
-
-static GActionEntry app_entries[] = {
-  { "new", activate_new, NULL, NULL, NULL },
-  { "open", activate_open, NULL, NULL, NULL },
-  { "save", activate_action, NULL, NULL, NULL },
-  { "save-as", activate_action, NULL, NULL, NULL },
-  { "quit", activate_quit, NULL, NULL, NULL },
-  { "dark", activate_toggle, NULL, "false", change_theme_state }
-};
-
-static GActionEntry win_entries[] = {
-  { "shape", activate_radio, "s", "'oval'", change_radio_state },
-  { "bold", activate_toggle, NULL, "false", NULL },
-  { "about", activate_about, NULL, NULL, NULL },
-  { "file1", activate_action, NULL, NULL, NULL },
-  { "logo", activate_action, NULL, NULL, NULL }
-};
-
-static void
-clicked_cb (GtkWidget *widget, DemoApplicationWindow *window)
-{
-  gtk_widget_hide (window->infobar);
-}
-
-static void
-startup (GApplication *app)
-{
-  GtkBuilder *builder;
-  GMenuModel *appmenu;
-  GMenuModel *menubar;
-
-  G_APPLICATION_CLASS (demo_application_parent_class)->startup (app);
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/application_demo/menus.ui", NULL);
-
-  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
-  menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
-
-  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
-  gtk_application_set_menubar (GTK_APPLICATION (app), menubar);
-
-  g_object_unref (builder);
-}
-
-static void
-create_window (GApplication *app,
-               const char   *content)
-{
-  DemoApplicationWindow *window;
-
-  window = (DemoApplicationWindow *)g_object_new (demo_application_window_get_type (),
-                                                  "application", app,
-                                                  NULL);
-  if (content)
-    gtk_text_buffer_set_text (window->buffer, content, -1);
-
-  gtk_window_present (GTK_WINDOW (window));
-}
-
-static void
-activate (GApplication *app)
-{
-  create_window (app, NULL);
-}
-
-static void
-demo_application_init (DemoApplication *app)
-{
-  GSettings *settings;
-  GAction *action;
-
-  settings = g_settings_new ("org.gtk.Demo");
-
-  g_action_map_add_action_entries (G_ACTION_MAP (app),
-                                   app_entries, G_N_ELEMENTS (app_entries),
-                                   app);
-
-  action = g_settings_create_action (settings, "color");
-
-  g_action_map_add_action (G_ACTION_MAP (app), action);
-
-  g_object_unref (settings);
-}
-
-static void
-demo_application_class_init (DemoApplicationClass *class)
-{
-  GApplicationClass *app_class = G_APPLICATION_CLASS (class);
-
-  app_class->startup = startup;
-  app_class->activate = activate;
-}
-
-static void
-demo_application_window_store_state (DemoApplicationWindow *win)
-{
-  GSettings *settings;
-
-  settings = g_settings_new ("org.gtk.Demo");
-  g_settings_set (settings, "window-size", "(ii)", win->width, win->height);
-  g_settings_set_boolean (settings, "maximized", win->maximized);
-  g_settings_set_boolean (settings, "fullscreen", win->fullscreen);
-  g_object_unref (settings);
-}
-
-static void
-demo_application_window_load_state (DemoApplicationWindow *win)
-{
-  GSettings *settings;
-
-  settings = g_settings_new ("org.gtk.Demo");
-  g_settings_get (settings, "window-size", "(ii)", &win->width, &win->height);
-  win->maximized = g_settings_get_boolean (settings, "maximized");
-  win->fullscreen = g_settings_get_boolean (settings, "fullscreen");
-  g_object_unref (settings);
-}
-
-static void
-demo_application_window_init (DemoApplicationWindow *window)
-{
-  GtkWidget *menu;
-
-  window->width = -1;
-  window->height = -1;
-  window->maximized = FALSE;
-  window->fullscreen = FALSE;
-
-  gtk_widget_init_template (GTK_WIDGET (window));
-
-  menu = gtk_menu_new_from_model (window->toolmenu);
-  gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (window->menutool), menu);
-
-  g_action_map_add_action_entries (G_ACTION_MAP (window),
-                                   win_entries, G_N_ELEMENTS (win_entries),
-                                   window);
-}
-
-static void
-demo_application_window_constructed (GObject *object)
-{
-  DemoApplicationWindow *window = (DemoApplicationWindow *)object;
-
-  demo_application_window_load_state (window);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), window->width, window->height);
-
-  if (window->maximized)
-    gtk_window_maximize (GTK_WINDOW (window));
-
-  if (window->fullscreen)
-    gtk_window_fullscreen (GTK_WINDOW (window));
-
-  G_OBJECT_CLASS (demo_application_window_parent_class)->constructed (object);
-}
-
-static void
-demo_application_window_size_allocate (GtkWidget           *widget,
-                                       const GtkAllocation *allocation,
-                                       int                  baseline)
-{
-  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->size_allocate (widget, allocation,
-                                                                          baseline);
-
-  if (!window->maximized && !window->fullscreen)
-    gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height);
-}
-
-static void
-surface_state_changed (GtkWidget *widget)
-{
-  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-  GdkSurfaceState new_state;
-
-  new_state = gdk_surface_get_state (gtk_widget_get_surface (widget));
-  window->maximized = (new_state & GDK_SURFACE_STATE_MAXIMIZED) != 0;
-  window->fullscreen = (new_state & GDK_SURFACE_STATE_FULLSCREEN) != 0;
-}
-
-static void
-demo_application_window_realize (GtkWidget *widget)
-{
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->realize (widget);
-
-  g_signal_connect_swapped (gtk_widget_get_surface (widget), "notify::state",
-                            G_CALLBACK (surface_state_changed), widget);
-}
-
-static void
-demo_application_window_unrealize (GtkWidget *widget)
-{
-  g_signal_handlers_disconnect_by_func (gtk_widget_get_surface (widget),
-                                        surface_state_changed, widget);
-
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->unrealize (widget);
-}
-
-static void
-demo_application_window_destroy (GtkWidget *widget)
-{
-  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-
-  demo_application_window_store_state (window);
-
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->destroy (widget);
-}
-
-static void
-demo_application_window_class_init (DemoApplicationWindowClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->constructed = demo_application_window_constructed;
-
-  widget_class->size_allocate = demo_application_window_size_allocate;
-  widget_class->realize = demo_application_window_realize;
-  widget_class->unrealize = demo_application_window_unrealize;
-  widget_class->destroy = demo_application_window_destroy;
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui");
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, message);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, infobar);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, status);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, buffer);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, menutool);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, toolmenu);
-  gtk_widget_class_bind_template_callback (widget_class, clicked_cb);
-  gtk_widget_class_bind_template_callback (widget_class, update_statusbar);
-  gtk_widget_class_bind_template_callback (widget_class, mark_set_callback);
-}
-
-int
-main (int argc, char *argv[])
-{
-  GtkApplication *app;
-
-  app = GTK_APPLICATION (g_object_new (demo_application_get_type (),
-                                       "application-id", "org.gtk.Demo2",
-                                       "flags", G_APPLICATION_HANDLES_OPEN,
-                                       NULL));
-
-  return g_application_run (G_APPLICATION (app), 0, NULL);
-}
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <template class="DemoApplicationWindow" parent="GtkApplicationWindow">
-    <property name="title" translatable="yes">Application Class</property>
-    <property name="default-width">200</property>
-    <property name="default-height">200</property>
-    <property name="icon-name">document-open</property>
-    <child>
-      <object class="GtkGrid">
-        <child>
-          <object class="GtkToolbar">
-            <property name="hexpand">1</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-            <child>
-              <object class="GtkMenuToolButton" id="menutool">
-                <property name="icon-name">document-open</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolButton">
-                <property name="icon-name">application-exit</property>
-                <property name="action-name">app.quit</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem">
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolButton">
-                <property name="icon-name">applications-other</property>
-                <property name="action-name">win.logo</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkInfoBar" id="infobar">
-            <property name="visible">0</property>
-            <property name="hexpand">1</property>
-            <child internal-child="content_area">
-              <object class="GtkBox" id="content_area">
-                <child>
-                  <object class="GtkLabel" id="message">
-                    <property name="hexpand">1</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child internal-child="action_area">
-              <object class="GtkBox">
-                <child>
-                  <object class="GtkButton">
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">_OK</property>
-                    <property name="use-underline">1</property>
-                    <signal name="clicked" handler="clicked_cb"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow">
-            <property name="shadow-type">in</property>
-            <child>
-              <object class="GtkTextView">
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="buffer">buffer</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStatusbar" id="status">
-            <property name="hexpand">1</property>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </template>
-  <menu id="toolmenu">
-    <item>
-      <attribute name="label">File1</attribute>
-      <attribute name="action">win.file1</attribute>
-    </item>
-  </menu>
-  <object class="GtkTextBuffer" id="buffer">
-    <signal name="changed" handler="update_statusbar"/>
-    <signal name="mark-set" handler="mark_set_callback"/>
-  </object>
-</interface>
--- a/demos/gtk-demo/application_demo.c
+++ b/demos/gtk-demo/application_demo.c
@@ -1,95 +0,0 @@
-/* Application Class
- *
- * Demonstrates a simple application.
- *
- * This example uses GtkApplication, GtkApplicationWindow, GtkBuilder
- * as well as GMenu and GResource. Due to the way GtkApplication is structured,
- * it is run as a separate process.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-static gboolean name_seen;
-static GtkWidget *placeholder;
-
-static void
-on_name_appeared (GDBusConnection *connection,
-                  const gchar     *name,
-                  const gchar     *name_owner,
-                  gpointer         user_data)
-{
-  name_seen = TRUE;
-}
-
-static void
-on_name_vanished (GDBusConnection *connection,
-                  const gchar     *name,
-                  gpointer         user_data)
-{
-  if (!name_seen)
-    return;
-
-  if (placeholder)
-    {
-      gtk_widget_destroy (placeholder);
-      g_object_unref (placeholder);
-      placeholder = NULL;
-    }
-}
-
-#ifdef G_OS_WIN32
-#define APP_EXTENSION ".exe"
-#else
-#define APP_EXTENSION
-#endif
-
-GtkWidget *
-do_application_demo (GtkWidget *toplevel)
-{
-  static guint watch = 0;
-
-  if (watch == 0)
-    watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                              "org.gtk.Demo2",
-                              0,
-                              on_name_appeared,
-                              on_name_vanished,
-                              NULL, NULL);
-
-  if (placeholder == NULL)
-    {
-      const gchar *command;
-      GError *error = NULL;
-
-      if (g_file_test ("./gtk4-demo-application" APP_EXTENSION, G_FILE_TEST_IS_EXECUTABLE))
-        command = "./gtk4-demo-application" APP_EXTENSION;
-      else
-        command = "gtk4-demo-application";
-
-      if (!g_spawn_command_line_async (command, &error))
-        {
-          g_warning ("%s", error->message);
-          g_error_free (error);
-        }
-
-      placeholder = gtk_label_new ("");
-      g_object_ref_sink (placeholder);
-    }
-  else
-    {
-      g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
-                                   "org.gtk.Demo2",
-                                   "/org/gtk/Demo2",
-                                   "org.gtk.Actions",
-                                   "Activate",
-                                   g_variant_new ("(sava{sv})", "quit", NULL, NULL),
-                                   NULL,
-                                   0,
-                                   G_MAXINT,
-                                   NULL, NULL);
-    }
-
-  return placeholder;
-}
--- a/demos/gtk-demo/appmenu.ui
+++ b/demos/gtk-demo/appmenu.ui
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.10 -->
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>
--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -0,0 +1,351 @@
+/* Application main window
+ *
+ * Demonstrates a typical application window, with menubar, toolbar, statusbar.
+ */
+
+#include <gtk/gtk.h>
+#include "demo-common.h"
+
+static GtkWidget *window = NULL;
+
+
+static void
+menuitem_cb (gpointer             callback_data,
+             guint                callback_action,
+             GtkWidget           *widget)
+{
+  GtkWidget *dialog;
+  
+  dialog = gtk_message_dialog_new (GTK_WINDOW (callback_data),
+                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_INFO,
+                                   GTK_BUTTONS_CLOSE,
+                                   "You selected or toggled the menu item: \"%s\"",
+                                    gtk_item_factory_path_from_widget (widget));
+
+  /* Close dialog on user response */
+  g_signal_connect (dialog,
+                    "response",
+                    G_CALLBACK (gtk_widget_destroy),
+                    NULL);
+  
+  gtk_widget_show (dialog);
+}
+
+
+static GtkItemFactoryEntry menu_items[] =
+{
+  { "/_File",            NULL,         0,                     0, "<Branch>" },
+  { "/File/_New",        "<control>N", menuitem_cb,       0, "<StockItem>", GTK_STOCK_NEW },
+  { "/File/_Open",       "<control>O", menuitem_cb,       0, "<StockItem>", GTK_STOCK_OPEN },
+  { "/File/_Save",       "<control>S", menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
+  { "/File/Save _As...", NULL,         menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
+  { "/File/sep1",        NULL,         menuitem_cb,       0, "<Separator>" },
+  { "/File/_Quit",       "<control>Q", menuitem_cb,       0, "<StockItem>", GTK_STOCK_QUIT },
+
+  { "/_Preferences",                    NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/_Color",             NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/Color/_Red",         NULL, menuitem_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Color/_Green",       NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/Color/_Blue",        NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/_Shape",             NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/Shape/_Square",      NULL, menuitem_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Shape/_Rectangle",   NULL, menuitem_cb, 0, "/Preferences/Shape/Square" },
+  { "/_Preferences/Shape/_Oval",        NULL, menuitem_cb, 0, "/Preferences/Shape/Rectangle" },
+
+  /* If you wanted this to be right justified you would use "<LastBranch>", not "<Branch>".
+   * Right justified help menu items are generally considered a bad idea now days.
+   */
+  { "/_Help",            NULL,         0,                     0, "<Branch>" },
+  { "/Help/_About",      NULL,         menuitem_cb,       0 },
+};
+
+static void
+toolbar_cb (GtkWidget *button,
+            gpointer   data)
+{
+  GtkWidget *dialog;
+  
+  dialog = gtk_message_dialog_new (GTK_WINDOW (data),
+                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_INFO,
+                                   GTK_BUTTONS_CLOSE,
+                                   "You selected a toolbar button");
+
+  /* Close dialog on user response */
+  g_signal_connect (dialog,
+                    "response",
+                    G_CALLBACK (gtk_widget_destroy),
+                    NULL);
+  
+  gtk_widget_show (dialog);
+}
+
+/* This function registers our custom toolbar icons, so they can be themed.
+ *
+ * It's totally optional to do this, you could just manually insert icons
+ * and have them not be themeable, especially if you never expect people
+ * to theme your app.
+ */
+static void
+register_stock_icons (void)
+{
+  static gboolean registered = FALSE;
+  
+  if (!registered)
+    {
+      GdkPixbuf *pixbuf;
+      GtkIconFactory *factory;
+      char *filename;
+
+      static GtkStockItem items[] = {
+        { "demo-gtk-logo",
+          "_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 the current directory first,
+       * so you can run gtk-demo without installing GTK, then looks
+       * in the location where the file is installed.
+       */
+      pixbuf = NULL;
+      filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
+      if (filename)
+	{
+	  pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+	  g_free (filename);
+	}
+
+      /* Register icon to accompany stock item */
+      if (pixbuf != NULL)
+        {
+          GtkIconSet *icon_set;
+          GdkPixbuf *transparent;
+
+          /* 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);
+          g_object_unref (pixbuf);
+          g_object_unref (transparent);
+        }
+      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);
+    }
+}
+
+static void
+update_statusbar (GtkTextBuffer *buffer,
+                  GtkStatusbar  *statusbar)
+{
+  gchar *msg;
+  gint row, col;
+  gint count;
+  GtkTextIter iter;
+  
+  gtk_statusbar_pop (statusbar, 0); /* clear any previous message, underflow is allowed */
+
+  count = gtk_text_buffer_get_char_count (buffer);
+
+  gtk_text_buffer_get_iter_at_mark (buffer,
+                                    &iter,
+                                    gtk_text_buffer_get_insert (buffer));
+
+  row = gtk_text_iter_get_line (&iter);
+  col = gtk_text_iter_get_line_offset (&iter);
+
+  msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
+                         row, col, count);
+
+  gtk_statusbar_push (statusbar, 0, msg);
+
+  g_free (msg);
+}
+
+static void
+mark_set_callback (GtkTextBuffer     *buffer,
+                   const GtkTextIter *new_location,
+                   GtkTextMark       *mark,
+                   gpointer           data)
+{
+  update_statusbar (buffer, GTK_STATUSBAR (data));
+}
+
+GtkWidget *
+do_appwindow (void)
+{  
+  if (!window)
+    {
+      GtkWidget *table;
+      GtkWidget *toolbar;
+      GtkWidget *statusbar;
+      GtkWidget *contents;
+      GtkWidget *sw;
+      GtkTextBuffer *buffer;
+      GtkAccelGroup *accel_group;      
+      GtkItemFactory *item_factory;
+
+      register_stock_icons ();
+      
+      /* Create the toplevel window
+       */
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Application Window");
+
+      /* NULL window variable when window is closed */
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &window);
+
+      table = gtk_table_new (1, 4, FALSE);
+      
+      gtk_container_add (GTK_CONTAINER (window), table);
+      
+      /* Create the menubar
+       */
+      
+      accel_group = gtk_accel_group_new ();
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+      g_object_unref (accel_group);
+      
+      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
+
+      /* Set up item factory to go away with the window */
+      g_object_ref (item_factory);
+      gtk_object_sink (GTK_OBJECT (item_factory));
+      g_object_set_data_full (G_OBJECT (window),
+                              "<main>",
+                              item_factory,
+                              (GDestroyNotify) g_object_unref);
+
+      /* create menu items */
+      gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items),
+                                     menu_items, window);
+
+      gtk_table_attach (GTK_TABLE (table),
+			gtk_item_factory_get_widget (item_factory, "<main>"),
+                        /* X direction */          /* Y direction */
+                        0, 1,                      0, 1,
+                        GTK_EXPAND | GTK_FILL,     0,
+                        0,                         0);
+
+      /* Create the toolbar
+       */
+      toolbar = gtk_toolbar_new ();
+
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                                GTK_STOCK_OPEN,
+                                "This is a demo button with an 'open' icon",
+                                NULL,
+                                G_CALLBACK (toolbar_cb),
+                                window, /* user data for callback */
+                                -1);  /* -1 means "append" */
+
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                                GTK_STOCK_QUIT,
+                                "This is a demo button with a 'quit' icon",
+                                NULL,
+                                G_CALLBACK (toolbar_cb),
+                                window, /* user data for callback */
+                                -1);  /* -1 means "append" */
+
+      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
+
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                                "demo-gtk-logo",
+                                "This is a demo button with a 'gtk' icon",
+                                NULL,
+                                G_CALLBACK (toolbar_cb),
+                                window, /* user data for callback */
+                                -1);  /* -1 means "append" */
+
+      gtk_table_attach (GTK_TABLE (table),
+                        toolbar,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   1, 2,
+                        GTK_EXPAND | GTK_FILL,  0,
+                        0,                      0);
+
+      /* Create document
+       */
+
+      sw = gtk_scrolled_window_new (NULL, NULL);
+
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
+
+      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,                   2, 3,
+                        GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
+                        0,                      0);
+
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   200, 200);
+      
+      contents = gtk_text_view_new ();
+
+      gtk_container_add (GTK_CONTAINER (sw),
+                         contents);
+
+      /* Create statusbar */
+
+      statusbar = gtk_statusbar_new ();
+      gtk_table_attach (GTK_TABLE (table),
+                        statusbar,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   3, 4,
+                        GTK_EXPAND | GTK_FILL,  0,
+                        0,                      0);
+
+      /* Show text widget info in the statusbar */
+      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
+      
+      g_signal_connect_object (buffer,
+                               "changed",
+                               G_CALLBACK (update_statusbar),
+                               statusbar,
+                               0);
+
+      g_signal_connect_object (buffer,
+                               "mark_set", /* cursor moved */
+                               G_CALLBACK (mark_set_callback),
+                               statusbar,
+                               0);
+      
+      update_statusbar (buffer, GTK_STATUSBAR (statusbar));
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show_all (window);
+    }
+  else
+    {    
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
+
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -1,200 +0,0 @@
-/* Assistant
- *
- * Demonstrates a sample multi-step assistant. Assistants are used to divide
- * an operation into several simpler sequential steps, and to guide the user
- * through these steps.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *assistant = NULL;
-static GtkWidget *progress_bar = NULL;
-
-static gboolean
-apply_changes_gradually (gpointer data)
-{
-  gdouble fraction;
-
-  /* Work, work, work... */
-  fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress_bar));
-  fraction += 0.05;
-
-  if (fraction < 1.0)
-    {
-      gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), fraction);
-      return G_SOURCE_CONTINUE;
-    }
-  else
-    {
-      /* Close automatically once changes are fully applied. */
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
-      return G_SOURCE_REMOVE;
-    }
-}
-
-static void
-on_assistant_apply (GtkWidget *widget, gpointer data)
-{
-  /* Start a timer to simulate changes taking a few seconds to apply. */
-  g_timeout_add (100, apply_changes_gradually, NULL);
-}
-
-static void
-on_assistant_close_cancel (GtkWidget *widget, gpointer data)
-{
-  GtkWidget **assistant = (GtkWidget **) data;
-
-  gtk_widget_destroy (*assistant);
-  *assistant = NULL;
-}
-
-static void
-on_assistant_prepare (GtkWidget *widget, GtkWidget *page, gpointer data)
-{
-  gint current_page, n_pages;
-  gchar *title;
-
-  current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (widget));
-  n_pages = gtk_assistant_get_n_pages (GTK_ASSISTANT (widget));
-
-  title = g_strdup_printf ("Sample assistant (%d of %d)", current_page + 1, n_pages);
-  gtk_window_set_title (GTK_WINDOW (widget), title);
-  g_free (title);
-
-  /* The fourth page (counting from zero) is the progress page.  The
-  * user clicked Apply to get here so we tell the assistant to commit,
-  * which means the changes up to this point are permanent and cannot
-  * be cancelled or revisited. */
-  if (current_page == 3)
-      gtk_assistant_commit (GTK_ASSISTANT (widget));
-}
-
-static void
-on_entry_changed (GtkWidget *widget, gpointer data)
-{
-  GtkAssistant *assistant = GTK_ASSISTANT (data);
-  GtkWidget *current_page;
-  gint page_number;
-  const gchar *text;
-
-  page_number = gtk_assistant_get_current_page (assistant);
-  current_page = gtk_assistant_get_nth_page (assistant, page_number);
-  text = gtk_entry_get_text (GTK_ENTRY (widget));
-
-  if (text && *text)
-    gtk_assistant_set_page_complete (assistant, current_page, TRUE);
-  else
-    gtk_assistant_set_page_complete (assistant, current_page, FALSE);
-}
-
-static void
-create_page1 (GtkWidget *assistant)
-{
-  GtkWidget *box, *label, *entry;
-
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-
-  label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_box_pack_start (GTK_BOX (box), label);
-
-  entry = gtk_entry_new ();
-  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (box), entry);
-  g_signal_connect (G_OBJECT (entry), "changed",
-                    G_CALLBACK (on_entry_changed), assistant);
-
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);
-}
-
-static void
-create_page2 (GtkWidget *assistant)
-{
-  GtkWidget *box, *checkbutton;
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-
-  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
-                                                 "even if you do not check this");
-  gtk_box_pack_start (GTK_BOX (box), checkbutton);
-
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");
-}
-
-static void
-create_page3 (GtkWidget *assistant)
-{
-  GtkWidget *label;
-
-  label = gtk_label_new ("This is a confirmation page, press 'Apply' to apply changes");
-
-  gtk_widget_show (label);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), label);
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_CONFIRM);
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation");
-}
-
-static void
-create_page4 (GtkWidget *assistant)
-{
-  progress_bar = gtk_progress_bar_new ();
-  gtk_widget_set_halign (progress_bar, GTK_ALIGN_FILL);
-  gtk_widget_set_valign (progress_bar, GTK_ALIGN_CENTER);
-  gtk_widget_set_hexpand (progress_bar, TRUE);
-  gtk_widget_set_margin_start (progress_bar, 40);
-  gtk_widget_set_margin_end (progress_bar, 40);
-
-  gtk_widget_show (progress_bar);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), progress_bar);
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), progress_bar, GTK_ASSISTANT_PAGE_PROGRESS);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), progress_bar, "Applying changes");
-
-  /* This prevents the assistant window from being
-   * closed while we're "busy" applying changes.
-   */
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), progress_bar, FALSE);
-}
-
-GtkWidget*
-do_assistant (GtkWidget *do_widget)
-{
-  if (!assistant)
-    {
-      assistant = gtk_assistant_new ();
-
-      gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
-
-      gtk_window_set_display (GTK_WINDOW (assistant),
-                              gtk_widget_get_display (do_widget));
-
-      create_page1 (assistant);
-      create_page2 (assistant);
-      create_page3 (assistant);
-      create_page4 (assistant);
-
-      g_signal_connect (G_OBJECT (assistant), "cancel",
-                        G_CALLBACK (on_assistant_close_cancel), &assistant);
-      g_signal_connect (G_OBJECT (assistant), "close",
-                        G_CALLBACK (on_assistant_close_cancel), &assistant);
-      g_signal_connect (G_OBJECT (assistant), "apply",
-                        G_CALLBACK (on_assistant_apply), NULL);
-      g_signal_connect (G_OBJECT (assistant), "prepare",
-                        G_CALLBACK (on_assistant_prepare), NULL);
-    }
-
-  if (!gtk_widget_get_visible (assistant))
-    gtk_widget_show (assistant);
-  else
-    {
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
-    }
-
-  return assistant;
-}
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkWindow" id="window">
-    <property name="resizable">0</property>
-    <property name="title">CSS Blend Modes</property>
-    <property name="default-width">400</property>
-    <property name="default-height">300</property>
-    <child>
-      <object class="GtkGrid">
-        <property name="row-spacing">12</property>
-        <property name="column-spacing">12</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label" translatable="yes">Blend mode:</property>
-            <property name="xalign">0</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow">
-            <property name="can-focus">1</property>
-            <property name="vexpand">1</property>
-            <property name="shadow-type">in</property>
-            <property name="min-content-width">150</property>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStackSwitcher">
-            <property name="halign">center</property>
-            <property name="hexpand">1</property>
-            <property name="stack">stack</property>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="stack">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="hhomogeneous">0</property>
-            <property name="vhomogeneous">0</property>
-            <property name="transition-type">crossfade</property>
-            <child>
-              <object class="GtkGrid">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">12</property>
-                <property name="column-spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Duck</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Background</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="duck"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="gradient"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">
-Blended picture</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend0"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page0</property>
-                <property name="title" translatable="yes">Ducky</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">12</property>
-                <property name="column-spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Red</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Blue</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="red"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="blue"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">
-Blended picture</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend1"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">Blends</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">6</property>
-                <property name="column-spacing">12</property>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="cyan"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="magenta"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="yellow"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend2"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Cyan</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Magenta</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Yellow</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Blended picture</property>
-                    <property name="xalign">0</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page2</property>
-                <property name="title" translatable="yes">CMYK</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="titlebar">
-    </child>
-  </object>
-</interface>
--- a/demos/gtk-demo/blends.png
+++ b/demos/gtk-demo/blends.png
--- a/demos/gtk-demo/brick.png
+++ b/demos/gtk-demo/brick.png
--- a/demos/gtk-demo/brick2.png
+++ b/demos/gtk-demo/brick2.png
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -1,124 +0,0 @@
-/* Builder
- *
- * Demonstrates an interface loaded from a XML description.
- */
-
-#include <gtk/gtk.h>
-
-static void
-quit_activate (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-
-  gtk_widget_destroy (window);
-}
-
-static void
-about_activate (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GtkBuilder *builder;
-  GtkWidget *about_dlg;
-
-  builder = g_object_get_data (G_OBJECT (window), "builder");
-  about_dlg = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
-  gtk_dialog_run (GTK_DIALOG (about_dlg));
-  gtk_widget_hide (about_dlg);
-}
-
-static void
-help_activate (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  g_print ("Help not available\n");
-}
-
-static GActionEntry win_entries[] = {
-  { "quit", quit_activate, NULL, NULL, NULL },
-  { "about", about_activate, NULL, NULL, NULL },
-  { "help", help_activate, NULL, NULL, NULL }
-};
-
-GtkWidget *
-do_builder (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *toolbar;
-  GActionGroup *actions;
-  GtkAccelGroup *accel_group;
-  GtkWidget *item;
-
-  if (!window)
-    {
-      GtkBuilder *builder;
-
-      builder = gtk_builder_new_from_resource ("/builder/demo.ui");
-
-      gtk_builder_connect_signals (builder, NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar1"));
-      gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
-                                   "primary-toolbar");
-      actions = (GActionGroup*)g_simple_action_group_new ();
-      g_action_map_add_action_entries (G_ACTION_MAP (actions),
-                                       win_entries, G_N_ELEMENTS (win_entries),
-                                       window);
-      gtk_widget_insert_action_group (window, "win", actions);
-      accel_group = gtk_accel_group_new ();
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "new_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_n, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "open_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_o, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "save_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "quit_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "copy_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_c, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "cut_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_x, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "paste_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_v, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "help_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_F1, 0, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "about_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_F7, 0, GTK_ACCEL_VISIBLE);
-
-      g_object_set_data_full (G_OBJECT(window), "builder", builder, g_object_unref);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -3,47 +3,45 @@
 * The Button Box widgets are used to arrange buttons with padding.
 */

-#include <glib/gi18n.h>
 #include <gtk/gtk.h>

 static GtkWidget *
 create_bbox (gint  horizontal,
-             char *title,
-             gint  spacing,
-             gint  layout)
+	     char *title, 
+	     gint  spacing,
+	     gint  layout)
 {
  GtkWidget *frame;
  GtkWidget *bbox;
  GtkWidget *button;
-
+	
  frame = gtk_frame_new (title);

  if (horizontal)
-    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+    bbox = gtk_hbutton_box_new ();
  else
-    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
-
-  g_object_set (bbox, "margin", 5, NULL);
+    bbox = gtk_vbutton_box_new ();

+  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);
  gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-
-  button = gtk_button_new_with_label (_("OK"));
+  
+  button = gtk_button_new_from_stock (GTK_STOCK_OK);
  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  button = gtk_button_new_with_label (_("Cancel"));
+  
+  button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  button = gtk_button_new_with_label (_("Help"));
+  
+  button = gtk_button_new_from_stock (GTK_STOCK_HELP);
  gtk_container_add (GTK_CONTAINER (bbox), button);

  return frame;
 }

 GtkWidget *
-do_button_box (GtkWidget *do_widget)
+do_button_box (void)
 {
  static GtkWidget *window = NULL;
  GtkWidget *main_vbox;
@@ -51,77 +49,77 @@ do_button_box (GtkWidget *do_widget)
  GtkWidget *hbox;
  GtkWidget *frame_horz;
  GtkWidget *frame_vert;
-
+	
  if (!window)
  {
    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_display (GTK_WINDOW (window),
-                            gtk_widget_get_display (do_widget));
    gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
-
+    
    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed),
-                      &window);
+		      G_CALLBACK (gtk_widget_destroyed),
+		      &window);
+    
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

-    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (main_vbox, "margin", 10, NULL);
+    main_vbox = gtk_vbox_new (FALSE, 0);
    gtk_container_add (GTK_CONTAINER (window), main_vbox);
-
+    
    frame_horz = gtk_frame_new ("Horizontal Button Boxes");
-    gtk_widget_set_margin_top (frame_horz, 10);
-    gtk_widget_set_margin_bottom (frame_horz, 10);
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz);
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-    g_object_set (vbox, "margin", 10, NULL);
+    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), 10);
    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);

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

-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE));
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START));
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END));
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER));
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND));
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
+			TRUE, TRUE, 5);
+    
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
+			TRUE, TRUE, 5);
+    
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			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);
-
-    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-    g_object_set (hbox, "margin", 10, NULL);
+    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), 10);
    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);

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

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

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

-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END));
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER));
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND));
+    gtk_box_pack_start (GTK_BOX (hbox), 
+			create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
+			TRUE, TRUE, 5);
  }

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

  return window;
 }
--- a/demos/gtk-demo/cell_cursor.png
+++ b/demos/gtk-demo/cell_cursor.png
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -1,33 +1,34 @@
 /* Change Display
- *
- * Demonstrates migrating a window between different displays.
- * A display is a mouse and keyboard with some number of
- * associated monitors. The neat thing about having multiple
- * displays is that they can be on a completely separate
+ * 
+ * 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
+ * into a single physical work area. The neat thing about having
+ * multiple displays is that they can be on a completely separate
 * computers, as long as there is a network connection to the
 * computer where the application is running.
 *
 * Only some of the windowing systems where GTK+ runs have the
- * concept of multiple displays. (The X Window System is the
- * main example.) Other windowing systems can only handle one
- * keyboard and mouse, and combine all monitors into
- * a single display.
+ * concept of multiple displays and screens. (The X Window System
+ * is the main example.) Other windowing systems can only
+ * handle one keyboard and mouse, and combine all monitors into
+ * a single screen.
 *
 * This is a moderately complex example, and demonstrates:
 *
- *  - Tracking the currently open displays
+ *  - Tracking the currently open displays and screens
 *
- *  - Changing the display for a window
+ *  - Changing the screen for a window
 *
 *  - Letting the user choose a window by clicking on it
- *
+ * 
 *  - Using GtkListStore and GtkTreeView
 *
 *  - Using GtkDialog
 */
 #include <string.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include "demo-common.h"

 /* The ChangeDisplayInfo structure corresponds to a toplevel window and
 * holds pointers to widgets inside the toplevel window along with other
@@ -42,8 +43,11 @@ struct _ChangeDisplayInfo
  GtkSizeGroup *size_group;

  GtkTreeModel *display_model;
-
+  GtkTreeModel *screen_model;
+  GtkTreeSelection *screen_selection;
+  
  GdkDisplay *current_display;
+  GdkScreen *current_screen;
 };

 /* These enumerations provide symbolic names for the columns
@@ -68,33 +72,27 @@ enum
 static GtkWidget *
 find_toplevel_at_pointer (GdkDisplay *display)
 {
-  GdkSurface *pointer_window;
+  GdkWindow *pointer_window;
  GtkWidget *widget = NULL;

-  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (),
-                                                      NULL, NULL);
+  pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);

-  /* The user data field of a GdkSurface is used to store a pointer
+  /* The user data field of a GdkWindow is used to store a pointer
   * to the widget that created it.
   */
  if (pointer_window)
-    {
-      gpointer widget_ptr;
-      gdk_surface_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;
 }

-static void
-released_cb (GtkGestureMultiPress *gesture,
-             guint                 n_press,
-             gdouble               x,
-             gdouble               y,
-             gboolean             *clicked)
+static gboolean
+button_release_event_cb (GtkWidget       *widget,
+			 GdkEventButton  *event,
+			 gboolean        *clicked)
 {
  *clicked = TRUE;
+  return TRUE;
 }

 /* Asks the user to click on a window, then waits for them click
@@ -102,60 +100,57 @@ released_cb (GtkGestureMultiPress *gesture,
 * window under the pointer, or NULL, if there is none.
 */
 static GtkWidget *
-query_for_toplevel (GdkDisplay *display,
-                    const char *prompt)
+query_for_toplevel (GdkScreen  *screen,
+		    const char *prompt)
 {
+  GdkDisplay *display = gdk_screen_get_display (screen);
  GtkWidget *popup, *label, *frame;
  GdkCursor *cursor;
  GtkWidget *toplevel = NULL;
-  GdkDevice *device;
-
+  
  popup = gtk_window_new (GTK_WINDOW_POPUP);
-  gtk_window_set_display (GTK_WINDOW (popup), display);
+  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);
-  g_object_set (label, "margin", 10, NULL);
+  gtk_misc_set_padding (GTK_MISC (label), 10, 10);
  gtk_container_add (GTK_CONTAINER (frame), label);
-
-  gtk_widget_show (popup);
-  cursor = gdk_cursor_new_from_name ("crosshair", NULL);
-  device = gtk_get_current_event_device ();
-
-  if (gdk_seat_grab (gdk_device_get_seat (device),
-                     gtk_widget_get_surface (popup),
-                     GDK_SEAT_CAPABILITY_ALL_POINTING,
-                     FALSE, cursor, NULL, NULL, NULL) == GDK_GRAB_SUCCESS)
+  
+  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,
+			cursor,
+			GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
    {
-      GtkGesture *gesture = gtk_gesture_multi_press_new ();
      gboolean clicked = FALSE;
-
-      g_signal_connect (gesture, "released",
-                        G_CALLBACK (released_cb), &clicked);
-      gtk_widget_add_controller (popup, GTK_EVENT_CONTROLLER (gesture));
-
-      /* Process events until clicked is set by our button release event handler.
+      
+      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);
-
-      gdk_seat_ungrab (gdk_device_get_seat (device));
-
-      toplevel = find_toplevel_at_pointer (display);
+	g_main_context_iteration (NULL, TRUE);
+      
+      toplevel = find_toplevel_at_pointer (gdk_screen_get_display (screen));
      if (toplevel == popup)
-        toplevel = NULL;
+	toplevel = NULL;
    }
-
-  g_object_unref (cursor);
+      
+  gdk_cursor_unref (cursor);
  gtk_widget_destroy (popup);
-
+  gdk_flush ();			/* Really release the grab */
+  
  return toplevel;
 }

@@ -165,17 +160,46 @@ query_for_toplevel (GdkDisplay *display,
 static void
 query_change_display (ChangeDisplayInfo *info)
 {
-  GdkDisplay *display = gtk_widget_get_display (info->window);
+  GdkScreen *screen = gtk_widget_get_screen (info->window);
  GtkWidget *toplevel;

-  toplevel = query_for_toplevel (display,
-                                 "Please select the toplevel\n"
-                                 "to move to the new display");
+  toplevel = query_for_toplevel (screen,
+				 "Please select the toplevel\n"
+				 "to move to the new screen");

  if (toplevel)
-    gtk_window_set_display (GTK_WINDOW (toplevel), info->current_display);
+    gtk_window_set_screen (GTK_WINDOW (toplevel), info->current_screen);
  else
-    gdk_display_beep (display);
+    gdk_display_beep (gdk_screen_get_display (screen));
+}
+
+/* Fills in the screen list based on the current display
+ */
+static void
+fill_screens (ChangeDisplayInfo *info)
+{
+  gtk_list_store_clear (GTK_LIST_STORE (info->screen_model));
+
+  if (info->current_display)
+    {
+      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,
+			      SCREEN_COLUMN_SCREEN, screen,
+			      -1);
+
+	  if (i == 0)
+	    gtk_tree_selection_select_iter (info->screen_selection, &iter);
+	}
+    }
 }

 /* Called when the user clicks on a button in our dialog or
@@ -184,8 +208,8 @@ query_change_display (ChangeDisplayInfo *info)
 */
 static void
 response_cb (GtkDialog         *dialog,
-             gint               response_id,
-             ChangeDisplayInfo *info)
+	     gint               response_id,
+	     ChangeDisplayInfo *info)
 {
  if (response_id == GTK_RESPONSE_OK)
    query_change_display (info);
@@ -199,21 +223,20 @@ response_cb (GtkDialog         *dialog,
 */
 static void
 open_display_cb (GtkWidget         *button,
-                 ChangeDisplayInfo *info)
+		 ChangeDisplayInfo *info)
 {
-  GtkWidget *content_area;
  GtkWidget *dialog;
  GtkWidget *display_entry;
  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,
-                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
-                                        _("_OK"), GTK_RESPONSE_OK,
-                                        NULL);
+					GTK_WINDOW (info->window),
+					GTK_DIALOG_MODAL,
+					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					GTK_STOCK_OK, GTK_RESPONSE_OK,
+					NULL);

  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
  display_entry = gtk_entry_new ();
@@ -221,38 +244,37 @@ open_display_cb (GtkWidget         *button,
  dialog_label =
    gtk_label_new ("Please enter the name of\nthe new display\n");

-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
-  gtk_container_add (GTK_CONTAINER (content_area), dialog_label);
-  gtk_container_add (GTK_CONTAINER (content_area), display_entry);
+  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog_label);
+  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), display_entry);

  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;
-
+	break;
+      
      new_screen_name = gtk_editable_get_chars (GTK_EDITABLE (display_entry),
-                                                0, -1);
+						0, -1);

      if (strcmp (new_screen_name, "") != 0)
-        {
-          result = gdk_display_open (new_screen_name);
-          if (!result)
-            {
-              gchar *error_msg =
-                g_strdup_printf  ("Can't open display:\n\t%s\nplease try another one\n",
-                                  new_screen_name);
-              gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
-              g_free (error_msg);
-            }
+	{
+	  result = gdk_display_open (new_screen_name);
+	  if (!result)
+	    {
+	      gchar *error_msg =
+		g_strdup_printf  ("Can't open display :\n\t%s\nplease try another one\n",
+				  new_screen_name);
+	      gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
+	      g_free (error_msg);
+	    }

-          g_free (new_screen_name);
-        }
+	  g_free (new_screen_name);
+	}
    }
-
+  
  gtk_widget_destroy (dialog);
 }

@@ -261,7 +283,7 @@ open_display_cb (GtkWidget         *button,
 */
 static void
 close_display_cb (GtkWidget         *button,
-                  ChangeDisplayInfo *info)
+		  ChangeDisplayInfo *info)
 {
  if (info->current_display)
    gdk_display_close (info->current_display);
@@ -273,19 +295,37 @@ close_display_cb (GtkWidget         *button,
 */
 static void
 display_changed_cb (GtkTreeSelection  *selection,
-                    ChangeDisplayInfo *info)
+		    ChangeDisplayInfo *info)
 {
  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,
-                        -1);
+			DISPLAY_COLUMN_DISPLAY, &info->current_display,
+			-1);
  else
    info->current_display = NULL;
+
+  fill_screens (info);
+}
+
+/* Called when the selected row in the sceen list changes.
+ * Updates info->current_screen.
+ */
+static void
+screen_changed_cb (GtkTreeSelection  *selection,
+		   ChangeDisplayInfo *info)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    gtk_tree_model_get (model, &iter,
+			SCREEN_COLUMN_SCREEN, &info->current_screen,
+			-1);
+  else
+    info->current_screen = NULL;
 }

 /* This function is used both for creating the "Display" and
@@ -295,27 +335,27 @@ display_changed_cb (GtkTreeSelection  *selection,
 */
 static void
 create_frame (ChangeDisplayInfo *info,
-              const char        *title,
-              GtkWidget        **frame,
-              GtkWidget        **tree_view,
-              GtkWidget        **button_vbox)
+	      const char        *title,
+	      GtkWidget        **frame,
+	      GtkWidget        **tree_view,
+	      GtkWidget        **button_vbox)
 {
  GtkTreeSelection *selection;
  GtkWidget *scrollwin;
  GtkWidget *hbox;
-
+  
  *frame = gtk_frame_new (title);

-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  g_object_set (hbox, "margin", 8, NULL);
+  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);
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
-                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+				  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
-                                       GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (hbox), scrollwin);
+				       GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0);

  *tree_view = gtk_tree_view_new ();
  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
@@ -324,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_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox);
+  *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);
 }

@@ -343,8 +383,7 @@ left_align_button_new (const char *label)
  GtkWidget *button = gtk_button_new_with_mnemonic (label);
  GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));

-  gtk_widget_set_halign (child, GTK_ALIGN_START);
-  gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
+  gtk_misc_set_alignment (GTK_MISC (child), 0., 0.5);

  return button;
 }
@@ -365,27 +404,58 @@ 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);
-
+  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);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);

  info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
-                                                            G_TYPE_STRING,
-                                                            GDK_TYPE_DISPLAY);
+							    G_TYPE_STRING,
+							    GDK_TYPE_DISPLAY);

  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->display_model);

  column = gtk_tree_view_column_new_with_attributes ("Name",
-                                                     gtk_cell_renderer_text_new (),
-                                                     "text", DISPLAY_COLUMN_NAME,
-                                                     NULL);
+						     gtk_cell_renderer_text_new (),
+						     "text", DISPLAY_COLUMN_NAME,
+						     NULL);
  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);

  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
  g_signal_connect (selection, "changed",
-                    G_CALLBACK (display_changed_cb), info);
+		    G_CALLBACK (display_changed_cb), info);
+
+  return frame;
+}
+
+/* Creates the "Screen" frame in the main window.
+ */
+GtkWidget *
+create_screen_frame (ChangeDisplayInfo *info)
+{
+  GtkWidget *frame;
+  GtkWidget *tree_view;
+  GtkWidget *button_vbox;
+  GtkTreeViewColumn *column;
+
+  create_frame (info, "Screen", &frame, &tree_view, &button_vbox);
+
+  info->screen_model = (GtkTreeModel *)gtk_list_store_new (SCREEN_NUM_COLUMNS,
+							   G_TYPE_INT,
+							   GDK_TYPE_SCREEN);
+
+  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->screen_model);
+
+  column = gtk_tree_view_column_new_with_attributes ("Number",
+						     gtk_cell_renderer_text_new (),
+						     "text", SCREEN_COLUMN_NUMBER,
+						     NULL);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+
+  info->screen_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
+  g_signal_connect (info->screen_selection, "changed",
+		    G_CALLBACK (screen_changed_cb), info);

  return frame;
 }
@@ -395,8 +465,8 @@ create_display_frame (ChangeDisplayInfo *info)
 */
 static void
 display_closed_cb (GdkDisplay        *display,
-                   gboolean           is_error,
-                   ChangeDisplayInfo *info)
+		   gboolean           is_error,
+		   ChangeDisplayInfo *info)
 {
  GtkTreeIter iter;
  gboolean valid;
@@ -406,15 +476,15 @@ 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);
+			  DISPLAY_COLUMN_DISPLAY, &tmp_display,
+			  -1);
      if (tmp_display == display)
-        {
-          gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
-          break;
-        }
+	{
+	  gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
+	  break;
+	}
    }
 }

@@ -424,27 +494,27 @@ display_closed_cb (GdkDisplay        *display,
 */
 static void
 add_display (ChangeDisplayInfo *info,
-             GdkDisplay        *display)
+	     GdkDisplay        *display)
 {
  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,
-                      DISPLAY_COLUMN_DISPLAY, display,
-                      -1);
+		      DISPLAY_COLUMN_NAME, name,
+		      DISPLAY_COLUMN_DISPLAY, display,
+		      -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
 */
 static void
 display_opened_cb (GdkDisplayManager *manager,
-                   GdkDisplay        *display,
-                   ChangeDisplayInfo *info)
+		   GdkDisplay        *display,
+		   ChangeDisplayInfo *info)
 {
  add_display (info, display);
 }
@@ -465,8 +535,8 @@ initialize_displays (ChangeDisplayInfo *info)

  g_slist_free (tmp_list);

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

 /* Cleans up when the toplevel is destroyed; we remove the
@@ -481,28 +551,23 @@ destroy_info (ChangeDisplayInfo *info)
  GSList *tmp_list;

  g_signal_handlers_disconnect_by_func (manager,
-                                        display_opened_cb,
-                                        info);
+					display_opened_cb,
+					info);

  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
    g_signal_handlers_disconnect_by_func (tmp_list->data,
-                                          display_closed_cb,
-                                          info);
-
+					  display_closed_cb,
+					  info);
+  
  g_slist_free (tmp_list);

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

 static void
-destroy_cb (GObject            *object,
-            ChangeDisplayInfo **info)
+destroy_cb (GtkObject          *object,
+	    ChangeDisplayInfo **info)
 {
  destroy_info (*info);
  *info = NULL;
@@ -512,44 +577,46 @@ destroy_cb (GObject            *object,
 * it. Otherwise, destroys it.
 */
 GtkWidget *
-do_changedisplay (GtkWidget *do_widget)
+do_changedisplay (void)
 {
  static ChangeDisplayInfo *info = NULL;

  if (!info)
    {
-      GtkWidget *content_area;
      GtkWidget *vbox;
      GtkWidget *frame;

      info = g_new0 (ChangeDisplayInfo, 1);

-      info->window = gtk_dialog_new_with_buttons ("Change Display",
-                                                  GTK_WINDOW (do_widget),
-                                                  0,
-                                                  "Close", GTK_RESPONSE_CLOSE,
-                                                  "Change", GTK_RESPONSE_OK,
-                                                  NULL);
+      info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
+					    NULL, /* parent */
+					    GTK_DIALOG_NO_SEPARATOR,
+					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
+					    "Change",         GTK_RESPONSE_OK,
+					    NULL);

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

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

-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox);
+      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);
+      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);

      initialize_displays (info);

-      gtk_widget_show (info->window);
+      gtk_widget_show_all (info->window);
      return info->window;
    }
  else
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -1,359 +0,0 @@
-/* Clipboard
- *
- * GdkClipboard is used for clipboard handling. This demo shows how to
- * copy and paste text to and from the clipboard.
- *
- * 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.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <string.h>
-
-static GtkWidget *window = NULL;
-
-void
-copy_button_clicked (GtkWidget *button,
-                     gpointer   user_data)
-{
-  GtkWidget *entry;
-  GdkClipboard *clipboard;
-
-  entry = GTK_WIDGET (user_data);
-
-  /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry);
-
-  /* Set clipboard text */
-  gdk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)));
-}
-
-void
-paste_received (GObject      *source_object,
-                GAsyncResult *result,
-                gpointer      user_data)
-{
-  GdkClipboard *clipboard;
-  GtkWidget *entry;
-  char *text;
-  GError *error = NULL;
-
-  clipboard = GDK_CLIPBOARD (source_object);
-  entry = GTK_WIDGET (user_data);
-
-  /* Get the resulting text of the read operation */
-  text = gdk_clipboard_read_text_finish (clipboard, result, &error);
-
-  if (text)
-    {
-      /* Set the entry text */
-      gtk_entry_set_text (GTK_ENTRY (entry), text);
-      g_free (text);
-    }
-  else
-    {
-      GtkWidget *dialog;
-
-      /* Show an error about why pasting failed.
-       * Usually you probably want to ignore such failures,
-       * but for demonstration purposes, we show the error.
-       */
-      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "Could not paste text: %s",
-                                       error->message);
-      g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
-      gtk_widget_show (dialog);
-
-      g_error_free (error);
-    }
-}
-
-void
-paste_button_clicked (GtkWidget *button,
-                      gpointer   user_data)
-{
-  GtkWidget *entry;
-  GdkClipboard *clipboard;
-
-  entry = GTK_WIDGET (user_data);
-
-  /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry);
-
-  /* Request the contents of the clipboard, contents_received will be
-     called when we do get the contents.
-   */
-  gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
-}
-
-static GdkPaintable *
-get_image_paintable (GtkImage *image)
-{
-  const gchar *icon_name;
-  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
-
-  switch (gtk_image_get_storage_type (image))
-    {
-    case GTK_IMAGE_PAINTABLE:
-      return g_object_ref (gtk_image_get_paintable (image));
-    case GTK_IMAGE_ICON_NAME:
-      icon_name = gtk_image_get_icon_name (image);
-      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
-      icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, 48, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
-      if (icon_info == NULL)
-        return NULL;
-      return GDK_PAINTABLE (gtk_icon_info_load_texture (icon_info));
-    default:
-      g_warning ("Image storage type %d not handled",
-                 gtk_image_get_storage_type (image));
-      return NULL;
-    }
-}
-
-static void
-drag_begin (GtkWidget      *widget,
-            GdkDrag        *drag,
-            gpointer        data)
-{
-  GdkPaintable *paintable;
-
-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (paintable)
-    {
-      gtk_drag_set_icon_paintable (drag, paintable, -2, -2);
-      g_object_unref (paintable);
-    }
-}
-
-void
-drag_data_get (GtkWidget        *widget,
-               GdkDrag          *drag,
-               GtkSelectionData *selection_data,
-               guint             info,
-               gpointer          data)
-{
-  GdkPaintable *paintable;
-
-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (GDK_IS_TEXTURE (paintable))
-    gtk_selection_data_set_texture (selection_data, GDK_TEXTURE (paintable));
-}
-
-static void
-drag_data_received (GtkWidget        *widget,
-                    GdkDrop          *drop,
-                    GtkSelectionData *selection_data,
-                    gpointer          data)
-{
-  if (gtk_selection_data_get_length (selection_data) > 0)
-    {
-      GdkTexture *texture;
-
-      texture = gtk_selection_data_get_texture (selection_data);
-      gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
-      g_object_unref (texture);
-    }
-}
-
-static void
-copy_image (GtkMenuItem *item,
-            gpointer     data)
-{
-  GdkClipboard *clipboard;
-  GdkPaintable *paintable;
-
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  paintable = get_image_paintable (GTK_IMAGE (data));
-
-  if (GDK_IS_TEXTURE (paintable))
-    gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
-
-  if (paintable)
-    g_object_unref (paintable);
-}
-
-static void
-paste_image_received (GObject      *source,
-                      GAsyncResult *result,
-                      gpointer      data)
-{
-  GdkTexture *texture;
-
-  texture = gdk_clipboard_read_texture_finish (GDK_CLIPBOARD (source), result, NULL);
-  if (texture == NULL)
-    return;
-    
-  gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
-}
-
-static void
-paste_image (GtkMenuItem *item,
-             gpointer     data)
-{
-  GdkClipboard *clipboard;
-
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  gdk_clipboard_read_texture_async (clipboard,
-                                    NULL,
-                                    paste_image_received,
-                                    data);
-}
-
-static void
-pressed_cb (GtkGesture *gesture,
-            int         n_press,
-            double      x,
-            double      y,
-            GtkWidget  *image)
-{
-  GtkWidget *menu;
-  GtkWidget *item;
-
-  menu = gtk_menu_new ();
-
-  item = gtk_menu_item_new_with_mnemonic (_("_Copy"));
-  g_signal_connect (item, "activate", G_CALLBACK (copy_image), image);
-  gtk_widget_show (item);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-  item = gtk_menu_item_new_with_mnemonic (_("_Paste"));
-  g_signal_connect (item, "activate", G_CALLBACK (paste_image), image);
-  gtk_widget_show (item);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-  gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
-}
-
-GtkWidget *
-do_clipboard (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *vbox, *hbox;
-      GtkWidget *label;
-      GtkWidget *entry, *button;
-      GtkWidget *image;
-      GtkGesture *gesture;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      g_object_set (vbox, "margin", 8, NULL);
-
-      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);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
-
-      /* Create the first entry */
-      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry);
-
-      /* Create the button */
-      button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_box_pack_start (GTK_BOX (hbox), button);
-      g_signal_connect (button, "clicked",
-                        G_CALLBACK (copy_button_clicked), entry);
-
-      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
-
-      /* Create the second entry */
-      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry);
-
-      /* Create the button */
-      button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_box_pack_start (GTK_BOX (hbox), button);
-      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);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
-
-      /* Create the first image */
-      image = gtk_image_new_from_icon_name ("dialog-warning");
-      gtk_container_add (GTK_CONTAINER (hbox), image);
-
-      /* make image a drag source */
-      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
-      gtk_drag_source_add_image_targets (image);
-      g_signal_connect (image, "drag-begin",
-                        G_CALLBACK (drag_begin), image);
-      g_signal_connect (image, "drag-data-get",
-                        G_CALLBACK (drag_data_get), image);
-
-      /* accept drops on image */
-      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
-                         NULL, GDK_ACTION_COPY);
-      gtk_drag_dest_add_image_targets (image);
-      g_signal_connect (image, "drag-data-received",
-                        G_CALLBACK (drag_data_received), image);
-
-      /* context menu on image */
-      gesture = gtk_gesture_multi_press_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
-      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
-
-      /* Create the second image */
-      image = gtk_image_new_from_icon_name ("process-stop");
-      gtk_container_add (GTK_CONTAINER (hbox), image);
-
-      /* make image a drag source */
-      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
-      gtk_drag_source_add_image_targets (image);
-      g_signal_connect (image, "drag-begin",
-                        G_CALLBACK (drag_begin), image);
-      g_signal_connect (image, "drag-data-get",
-                        G_CALLBACK (drag_data_get), image);
-
-      /* accept drops on image */
-      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
-                         NULL, GDK_ACTION_COPY);
-      gtk_drag_dest_add_image_targets (image);
-      g_signal_connect (image, "drag-data-received",
-                        G_CALLBACK (drag_data_received), image);
-
-      /* context menu on image */
-      gesture = gtk_gesture_multi_press_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
-      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/Show More
+++ b/Show More