Update to 2.2.0.

Subjective extract of changes:
* Only close dialogs on Escape if they have a cancel button. [James Willcox]
* Add Home/End/Page_Up/Page_Down keybindings for menus [Owen,
  Narayana Pattipati, Marius Andreiana]
* Improved default color scheme [Soeren Sandmann, with advise from
  Tuomas Kuosmanen and Garrett LeSage]
* Make pixmap creation functions take a GdkDrawable not a GdkWindow
  [Kristian Rietveld]
* Support move-resize emulation for all edges. [Matthias Clasen]
* Remove extra selections for ButtonRelease in XInput code
  [Garry Osgood, Owen]
* Support RTL flipping for statusbars [Matthias]
* Use octal escapes rather than literal UTF-8 in strings [Owen]
* Make a lot of read-only data const. [Matthias, Morten Welinder]
* Use g_get_application_name() for default window titles and
  for the title of the client leader window [Owen, Havoc Pennington]
* Complete resize-grippy support, move-resize emulation
  [Anders Carlsson, Matthias Clasen]
* On screen change, recreate the widget's Pango context [Owen]
* Make g_object_set (gtk_settings_get_default (), ...) to override
  settings from XSETTINGS and ~/.gtkrc [Jonathan Blandford]
* Make GtkInputDialog multihead aware [Owen]
* Add a ::screen-changed signal to GtkWidget [Owen Taylor]
* Draw/check menu items insensitive [Soeren, Tim Evans]
* Add ::snap-edge-set-property to GtkHandleBox [Owen, Matthias]
* RTL flipping improvements for GtkHandleBox, GtkMenuItem, GtkOptionMenu,
  GtkCheckMenuItem [Matthias Clasen]
* Handle painting text on dark-colored progressbars [Soeren]
* Sort the input method list in the right click popup [Abigail Brady]
* Don't grab the focus to the default button in a GtkDialog [Daniel Elstner]
* Remove usage of XLookupString outside of GtkIMContextXIM [Owen]
* Handle Shift/Caps/Num_Lock properly for non-Xkb [Owen]
* Add a --screen option to set default screen [Balamurali Viswanathan, Owen]
* Add simple support for startup notification [Havoc Pennington]
* Handle focus indication for check and radio buttons without children
  [Dave Camp, Owen]
* Much work on improve submenu navigation [Soeren Sandmann]
* Add "selected_shadow_type" property for menus [Soeren]
* Add "scrollbar_spacing" style property [Anders Carlsson, Owen]
* Rework GtkPaned keynav [Soeren, Calum Benson]
* Sensitivity and keynav fixes for GtkFileSelection [Muktha Narayan, Owen]
* Removed mnemonics for GtkToolbar Items [Mikael Hallendal]
* Allow themes to set GtkTreeView even/odd row colors [Kristian]
* Add support for separately installed Pixbuf loaders [Matthias Clasen]
* Export gdk_event_new(), discourage stack allocated events [Owen]
* gdk_draw_pixbuf() as better name for gdk_pixbuf_render_to_drawable() [Owen]
* Basic support for RandR extension [Keith Packard, Owen]
* Allow moving paned sliders all the way to the edge [Owen, Darin Adler]
* Add tag_table construct property to GtkTextBuffer [Daniel Elstner]
* gtk_window_set_[default_]icon_from_file [Owen, Havoc]
* Multihead support
* Add GdkDisplay, GdkScreen structures
* Add _for_display(), _for_screen() variants where needed in GDK and GTK+
  (In other cases, make the variants methods on GdkDisplay/GdkScreen
* Adapt GTK+ widgets to be multihead safe
* Allow initialization of GTK+ without opening a display with gtk_parse_args()
* Add multihead support to demos/tests.
* Xinerama support [Erwann Chenede, Matthias Clasen]
* Allow GDK backends to add custom argument parsing [Sven Neumann]
* Add ::keys-changed signal to GdkKeymap, handle keymap changes for keybindings [Owen]
* Add style property for drawing menu items without shadow [Soeren]
* gtk_widget_modify_color_component/font(): Allow clearing
  current modifications. [Owen]
* Add GtkWidget::is_focus, GtkWindow::is_active properties [Owen]
* Some XEMBED changes for standards compliance and Qt compatibility [Owen]
* Improve label behavior when it gets a too small allocation [Soeren]
* Add support for depth 8 StaticColor visuals to gdkrgb [Matthias]
* Theme drawing improvements [Soeren]
* Add types for GtkRowReference, GtkClipboard [Jonathan Blandford, James Henstridge, Owen]
* Use G_TYPE_FLAG_ABSTRACT for abstract types [Matthias]
* Add gtk_menu_shell_select_first() [Owen]
* Add gtk_notebook_get_n_pages() [Havoc Pennington]
* Allow accel_path = NULL for gtk_menu_item_set_accel_path().
* Allow icon sizes to be changed via a GtkSetting [Bill Haneman, Brian Cameron, Owen]
* Improve gdk-pixbuf loader tests [Soeren Sandmann]
* Use iTXT chunks when necessary in PNG image saver [Matthias]
* Add incremental loading for progressive jpegs [Matthias]
* Add load-at-size functionality [Matthias]
* Add a loader for .ANI animations [Matthias]
* Load hotspot for .ICO files [Matthias]
* Add gtk-im-preedit-style/gtk-im-status-style XSETTINGS [Hidetoshi Tajima]

Lots of bug fixes and enhancements.

12 files changed, 343 insertions, 353 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 7af50327b99..53cf00f1e98 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.17 2002/12/19 12:59:29 grant Exp $
+# $NetBSD: Makefile,v 1.18 2002/12/24 04:07:31 wiz Exp $
 #
 
-DISTNAME=		gtk+-2.0.9
+DISTNAME=		gtk+-2.2.0
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
-			${MASTER_SITE_GNOME:=sources/gtk+/2.0/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
+			${MASTER_SITE_GNOME:=sources/gtk+/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
@@ -15,12 +15,14 @@ COMMENT=		Gimp toolkit. Libraries for building X11 user interfaces
 
 BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GMAKE=		yes
 
 GNU_CONFIGURE=		 yes
 CONFIGURE_ARGS+=	--with-xinput=xfree
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
+TEST_TARGET=		check
 
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 6338af500e4..5012d9d3110 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.12 2002/11/29 17:25:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2002/12/24 04:07:32 wiz Exp $
 bin/gdk-pixbuf-csource
+bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
+etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtk.immodules
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
@@ -14,6 +18,8 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
+include/gtk-2.0/gdk/gdkdisplay.h
+include/gtk-2.0/gdk/gdkdisplaymanager.h
 include/gtk-2.0/gdk/gdkdnd.h
 include/gtk-2.0/gdk/gdkdrawable.h
 include/gtk-2.0/gdk/gdkenumtypes.h
@@ -32,6 +38,7 @@ include/gtk-2.0/gdk/gdkprivate.h
 include/gtk-2.0/gdk/gdkproperty.h
 include/gtk-2.0/gdk/gdkregion.h
 include/gtk-2.0/gdk/gdkrgb.h
+include/gtk-2.0/gdk/gdkscreen.h
 include/gtk-2.0/gdk/gdkselection.h
 include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
@@ -182,93 +189,96 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
 include/gtk-2.0/gtk/gtkvseparator.h
 include/gtk-2.0/gtk/gtkwidget.h
 include/gtk-2.0/gtk/gtkwindow.h
-lib/gtk-2.0/2.0.0/immodules/im-am-et.a
-lib/gtk-2.0/2.0.0/immodules/im-am-et.la
-lib/gtk-2.0/2.0.0/immodules/im-am-et.so
-lib/gtk-2.0/2.0.0/immodules/im-cyrillic-translit.a
-lib/gtk-2.0/2.0.0/immodules/im-cyrillic-translit.la
-lib/gtk-2.0/2.0.0/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/2.0.0/immodules/im-hangul.a
-lib/gtk-2.0/2.0.0/immodules/im-hangul.la
-lib/gtk-2.0/2.0.0/immodules/im-hangul.so
-lib/gtk-2.0/2.0.0/immodules/im-inuktitut.a
-lib/gtk-2.0/2.0.0/immodules/im-inuktitut.la
-lib/gtk-2.0/2.0.0/immodules/im-inuktitut.so
-lib/gtk-2.0/2.0.0/immodules/im-ipa.a
-lib/gtk-2.0/2.0.0/immodules/im-ipa.la
-lib/gtk-2.0/2.0.0/immodules/im-ipa.so
-lib/gtk-2.0/2.0.0/immodules/im-thai-broken.a
-lib/gtk-2.0/2.0.0/immodules/im-thai-broken.la
-lib/gtk-2.0/2.0.0/immodules/im-thai-broken.so
-lib/gtk-2.0/2.0.0/immodules/im-ti-er.a
-lib/gtk-2.0/2.0.0/immodules/im-ti-er.la
-lib/gtk-2.0/2.0.0/immodules/im-ti-er.so
-lib/gtk-2.0/2.0.0/immodules/im-ti-et.a
-lib/gtk-2.0/2.0.0/immodules/im-ti-et.la
-lib/gtk-2.0/2.0.0/immodules/im-ti-et.so
-lib/gtk-2.0/2.0.0/immodules/im-viqr.a
-lib/gtk-2.0/2.0.0/immodules/im-viqr.la
-lib/gtk-2.0/2.0.0/immodules/im-viqr.so
-lib/gtk-2.0/2.0.0/immodules/im-xim.a
-lib/gtk-2.0/2.0.0/immodules/im-xim.la
-lib/gtk-2.0/2.0.0/immodules/im-xim.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-bmp.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-bmp.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-gif.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-gif.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-ico.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-ico.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-jpeg.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-jpeg.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-png.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-png.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-png.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-pnm.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-pnm.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-ras.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-ras.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-tga.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-tga.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-tiff.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-tiff.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-wbmp.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-wbmp.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-xbm.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-xbm.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-xpm.a
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-xpm.la
-lib/gtk-2.0/2.0.0/loaders/libpixbufloader-xpm.so
+lib/gtk-2.0/2.2.0/immodules/im-am-et.a
+lib/gtk-2.0/2.2.0/immodules/im-am-et.la
+lib/gtk-2.0/2.2.0/immodules/im-am-et.so
+lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la
+lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/2.2.0/immodules/im-hangul.a
+lib/gtk-2.0/2.2.0/immodules/im-hangul.la
+lib/gtk-2.0/2.2.0/immodules/im-hangul.so
+lib/gtk-2.0/2.2.0/immodules/im-inuktitut.a
+lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la
+lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so
+lib/gtk-2.0/2.2.0/immodules/im-ipa.a
+lib/gtk-2.0/2.2.0/immodules/im-ipa.la
+lib/gtk-2.0/2.2.0/immodules/im-ipa.so
+lib/gtk-2.0/2.2.0/immodules/im-thai-broken.a
+lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la
+lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so
+lib/gtk-2.0/2.2.0/immodules/im-ti-er.a
+lib/gtk-2.0/2.2.0/immodules/im-ti-er.la
+lib/gtk-2.0/2.2.0/immodules/im-ti-er.so
+lib/gtk-2.0/2.2.0/immodules/im-ti-et.a
+lib/gtk-2.0/2.2.0/immodules/im-ti-et.la
+lib/gtk-2.0/2.2.0/immodules/im-ti-et.so
+lib/gtk-2.0/2.2.0/immodules/im-viqr.a
+lib/gtk-2.0/2.2.0/immodules/im-viqr.la
+lib/gtk-2.0/2.2.0/immodules/im-viqr.so
+lib/gtk-2.0/2.2.0/immodules/im-xim.a
+lib/gtk-2.0/2.2.0/immodules/im-xim.la
+lib/gtk-2.0/2.2.0/immodules/im-xim.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.a
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la
+lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so
 lib/gtk-2.0/include/gdkconfig.h
 lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
-lib/libgdk-x11-2.0.so.0
-lib/libgdk-x11-2.0.so.0.9
+lib/libgdk-x11-2.0.so.200
+lib/libgdk-x11-2.0.so.200.0
 lib/libgdk_pixbuf-2.0.a
 lib/libgdk_pixbuf-2.0.la
 lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf-2.0.so.0.9
+lib/libgdk_pixbuf-2.0.so.200
+lib/libgdk_pixbuf-2.0.so.200.0
 lib/libgdk_pixbuf_xlib-2.0.a
 lib/libgdk_pixbuf_xlib-2.0.la
 lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.so.0.9
+lib/libgdk_pixbuf_xlib-2.0.so.200
+lib/libgdk_pixbuf_xlib-2.0.so.200.0
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
-lib/libgtk-x11-2.0.so.0
-lib/libgtk-x11-2.0.so.0.9
+lib/libgtk-x11-2.0.so.200
+lib/libgtk-x11-2.0.so.200.0
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -282,6 +292,7 @@ share/gtk-2.0/demo/apple-red.png
 share/gtk-2.0/demo/appwindow.c
 share/gtk-2.0/demo/background.jpg
 share/gtk-2.0/demo/button_box.c
+share/gtk-2.0/demo/changedisplay.c
 share/gtk-2.0/demo/colorsel.c
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
@@ -305,7 +316,12 @@ share/gtk-2.0/demo/sizegroup.c
 share/gtk-2.0/demo/stock_browser.c
 share/gtk-2.0/demo/textview.c
 share/gtk-2.0/demo/tree_store.c
-share/gtk-doc/html/gdk-pixbuf/a4187.html
+share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
+share/gtk-doc/html/gdk-pixbuf/apa.html
+share/gtk-doc/html/gdk-pixbuf/apas02.html
+share/gtk-doc/html/gdk-pixbuf/apas03.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-animation.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-creating.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-loading.html
@@ -318,18 +334,21 @@ share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-inline.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-module-interface.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-scaling.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-util.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-versioning.html
-share/gtk-doc/html/gdk-pixbuf/gdkpixbufloader.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp
+share/gtk-doc/html/gdk-pixbuf/home.png
 share/gtk-doc/html/gdk-pixbuf/index.html
 share/gtk-doc/html/gdk-pixbuf/index.sgml
+share/gtk-doc/html/gdk-pixbuf/left.png
 share/gtk-doc/html/gdk-pixbuf/license.html
-share/gtk-doc/html/gdk-pixbuf/r27.html
-share/gtk-doc/html/gdk-pixbuf/x4206.html
-share/gtk-doc/html/gdk-pixbuf/x4254.html
+share/gtk-doc/html/gdk-pixbuf/right.png
+share/gtk-doc/html/gdk-pixbuf/rn01.html
+share/gtk-doc/html/gdk-pixbuf/up.png
+share/gtk-doc/html/gdk/GdkDisplay.html
+share/gtk-doc/html/gdk/GdkDisplayManager.html
+share/gtk-doc/html/gdk/GdkScreen.html
 share/gtk-doc/html/gdk/X_cursor.png
 share/gtk-doc/html/gdk/arrow.png
 share/gtk-doc/html/gdk/based_arrow_down.png
@@ -357,39 +376,42 @@ share/gtk-doc/html/gdk/draft_small.png
 share/gtk-doc/html/gdk/draped_box.png
 share/gtk-doc/html/gdk/exchange.png
 share/gtk-doc/html/gdk/fleur.png
-share/gtk-doc/html/gdk/gdk-bitmaps-and-pixmaps.html
-share/gtk-doc/html/gdk/gdk-colormaps-and-colors.html
-share/gtk-doc/html/gdk/gdk-cursors.html
-share/gtk-doc/html/gdk/gdk-drag-and-drop.html
-share/gtk-doc/html/gdk/gdk-drawing-primitives.html
-share/gtk-doc/html/gdk/gdk-event-structures.html
-share/gtk-doc/html/gdk/gdk-events.html
-share/gtk-doc/html/gdk/gdk-fonts.html
-share/gtk-doc/html/gdk/gdk-gdkrgb.html
-share/gtk-doc/html/gdk/gdk-general.html
-share/gtk-doc/html/gdk/gdk-graphics-contexts.html
-share/gtk-doc/html/gdk/gdk-images.html
-share/gtk-doc/html/gdk/gdk-input-devices.html
-share/gtk-doc/html/gdk/gdk-input.html
-share/gtk-doc/html/gdk/gdk-keyboard-handling.html
-share/gtk-doc/html/gdk/gdk-pango-interaction.html
-share/gtk-doc/html/gdk/gdk-pixbufs.html
-share/gtk-doc/html/gdk/gdk-points-rectangles-and-regions.html
-share/gtk-doc/html/gdk/gdk-properties-and-atoms.html
-share/gtk-doc/html/gdk/gdk-selections.html
-share/gtk-doc/html/gdk/gdk-threads.html
-share/gtk-doc/html/gdk/gdk-visuals.html
-share/gtk-doc/html/gdk/gdk-windows.html
-share/gtk-doc/html/gdk/gdk-x-window-system-interaction.html
+share/gtk-doc/html/gdk/gdk-Bitmaps-and-Pixmaps.html
+share/gtk-doc/html/gdk/gdk-Colormaps-and-Colors.html
+share/gtk-doc/html/gdk/gdk-Cursors.html
+share/gtk-doc/html/gdk/gdk-Drag-and-Drop.html
+share/gtk-doc/html/gdk/gdk-Drawing-Primitives.html
+share/gtk-doc/html/gdk/gdk-Event-Structures.html
+share/gtk-doc/html/gdk/gdk-Events.html
+share/gtk-doc/html/gdk/gdk-Fonts.html
+share/gtk-doc/html/gdk/gdk-GdkRGB.html
+share/gtk-doc/html/gdk/gdk-General.html
+share/gtk-doc/html/gdk/gdk-Graphics-Contexts.html
+share/gtk-doc/html/gdk/gdk-Images.html
+share/gtk-doc/html/gdk/gdk-Input-Devices.html
+share/gtk-doc/html/gdk/gdk-Input.html
+share/gtk-doc/html/gdk/gdk-Keyboard-Handling.html
+share/gtk-doc/html/gdk/gdk-Pango-Interaction.html
+share/gtk-doc/html/gdk/gdk-Pixbufs.html
+share/gtk-doc/html/gdk/gdk-Points-Rectangles-and-Regions.html
+share/gtk-doc/html/gdk/gdk-Properties-and-Atoms.html
+share/gtk-doc/html/gdk/gdk-Selections.html
+share/gtk-doc/html/gdk/gdk-Threads.html
+share/gtk-doc/html/gdk/gdk-Visuals.html
+share/gtk-doc/html/gdk/gdk-Windows.html
+share/gtk-doc/html/gdk/gdk-X-Window-System-Interaction.html
+share/gtk-doc/html/gdk/gdk.devhelp
 share/gtk-doc/html/gdk/gobbler.png
 share/gtk-doc/html/gdk/gumby.png
 share/gtk-doc/html/gdk/hand1.png
 share/gtk-doc/html/gdk/hand2.png
 share/gtk-doc/html/gdk/heart.png
+share/gtk-doc/html/gdk/home.png
 share/gtk-doc/html/gdk/icon.png
 share/gtk-doc/html/gdk/index.html
 share/gtk-doc/html/gdk/index.sgml
 share/gtk-doc/html/gdk/iron_cross.png
+share/gtk-doc/html/gdk/left.png
 share/gtk-doc/html/gdk/left_ptr.png
 share/gtk-doc/html/gdk/left_side.png
 share/gtk-doc/html/gdk/left_tee.png
@@ -399,11 +421,13 @@ share/gtk-doc/html/gdk/lr_angle.png
 share/gtk-doc/html/gdk/man.png
 share/gtk-doc/html/gdk/middlebutton.png
 share/gtk-doc/html/gdk/mouse.png
+share/gtk-doc/html/gdk/multihead.html
 share/gtk-doc/html/gdk/pencil.png
 share/gtk-doc/html/gdk/pirate.png
 share/gtk-doc/html/gdk/plus.png
 share/gtk-doc/html/gdk/question_arrow.png
 share/gtk-doc/html/gdk/reference.html
+share/gtk-doc/html/gdk/right.png
 share/gtk-doc/html/gdk/right_ptr.png
 share/gtk-doc/html/gdk/right_side.png
 share/gtk-doc/html/gdk/right_tee.png
@@ -431,176 +455,186 @@ share/gtk-doc/html/gdk/top_tee.png
 share/gtk-doc/html/gdk/trek.png
 share/gtk-doc/html/gdk/ul_angle.png
 share/gtk-doc/html/gdk/umbrella.png
+share/gtk-doc/html/gdk/up.png
 share/gtk-doc/html/gdk/ur_angle.png
 share/gtk-doc/html/gdk/watch.png
 share/gtk-doc/html/gdk/xterm.png
-share/gtk-doc/html/gtk/abstractobjects.html
-share/gtk-doc/html/gtk/buttonwidgets.html
-share/gtk-doc/html/gtk/c17328.html
-share/gtk-doc/html/gtk/deprecatedobjects.html
-share/gtk-doc/html/gtk/displaywidgets.html
-share/gtk-doc/html/gtk/gtk-accelerator-maps.html
-share/gtk-doc/html/gtk/gtk-bindings.html
+share/gtk-doc/html/gtk/AbstractObjects.html
+share/gtk-doc/html/gtk/ButtonWidgets.html
+share/gtk-doc/html/gtk/DeprecatedObjects.html
+share/gtk-doc/html/gtk/DisplayWidgets.html
+share/gtk-doc/html/gtk/GtkAccelLabel.html
+share/gtk-doc/html/gtk/GtkAccessible.html
+share/gtk-doc/html/gtk/GtkAdjustment.html
+share/gtk-doc/html/gtk/GtkAlignment.html
+share/gtk-doc/html/gtk/GtkArrow.html
+share/gtk-doc/html/gtk/GtkAspectFrame.html
+share/gtk-doc/html/gtk/GtkBin.html
+share/gtk-doc/html/gtk/GtkBox.html
+share/gtk-doc/html/gtk/GtkButton.html
+share/gtk-doc/html/gtk/GtkButtonBox.html
+share/gtk-doc/html/gtk/GtkCList.html
+share/gtk-doc/html/gtk/GtkCTree.html
+share/gtk-doc/html/gtk/GtkCalendar.html
+share/gtk-doc/html/gtk/GtkCellEditable.html
+share/gtk-doc/html/gtk/GtkCellRenderer.html
+share/gtk-doc/html/gtk/GtkCellRendererPixbuf.html
+share/gtk-doc/html/gtk/GtkCellRendererText.html
+share/gtk-doc/html/gtk/GtkCellRendererToggle.html
+share/gtk-doc/html/gtk/GtkCheckButton.html
+share/gtk-doc/html/gtk/GtkCheckMenuItem.html
+share/gtk-doc/html/gtk/GtkColorSelection.html
+share/gtk-doc/html/gtk/GtkColorSelectionDialog.html
+share/gtk-doc/html/gtk/GtkCombo.html
+share/gtk-doc/html/gtk/GtkContainer.html
+share/gtk-doc/html/gtk/GtkCurve.html
+share/gtk-doc/html/gtk/GtkDialog.html
+share/gtk-doc/html/gtk/GtkDrawingArea.html
+share/gtk-doc/html/gtk/GtkEditable.html
+share/gtk-doc/html/gtk/GtkEntry.html
+share/gtk-doc/html/gtk/GtkEventBox.html
+share/gtk-doc/html/gtk/GtkFileSelection.html
+share/gtk-doc/html/gtk/GtkFixed.html
+share/gtk-doc/html/gtk/GtkFontSelection.html
+share/gtk-doc/html/gtk/GtkFontSelectionDialog.html
+share/gtk-doc/html/gtk/GtkFrame.html
+share/gtk-doc/html/gtk/GtkGammaCurve.html
+share/gtk-doc/html/gtk/GtkHBox.html
+share/gtk-doc/html/gtk/GtkHButtonBox.html
+share/gtk-doc/html/gtk/GtkHPaned.html
+share/gtk-doc/html/gtk/GtkHRuler.html
+share/gtk-doc/html/gtk/GtkHScale.html
+share/gtk-doc/html/gtk/GtkHScrollbar.html
+share/gtk-doc/html/gtk/GtkHSeparator.html
+share/gtk-doc/html/gtk/GtkHandleBox.html
+share/gtk-doc/html/gtk/GtkIMContext.html
+share/gtk-doc/html/gtk/GtkIMContextSimple.html
+share/gtk-doc/html/gtk/GtkIMMulticontext.html
+share/gtk-doc/html/gtk/GtkImage.html
+share/gtk-doc/html/gtk/GtkImageMenuItem.html
+share/gtk-doc/html/gtk/GtkInputDialog.html
+share/gtk-doc/html/gtk/GtkInvisible.html
+share/gtk-doc/html/gtk/GtkItem.html
+share/gtk-doc/html/gtk/GtkItemFactory.html
+share/gtk-doc/html/gtk/GtkLabel.html
+share/gtk-doc/html/gtk/GtkLayout.html
+share/gtk-doc/html/gtk/GtkList.html
+share/gtk-doc/html/gtk/GtkListItem.html
+share/gtk-doc/html/gtk/GtkListStore.html
+share/gtk-doc/html/gtk/GtkMenu.html
+share/gtk-doc/html/gtk/GtkMenuBar.html
+share/gtk-doc/html/gtk/GtkMenuItem.html
+share/gtk-doc/html/gtk/GtkMenuShell.html
+share/gtk-doc/html/gtk/GtkMessageDialog.html
+share/gtk-doc/html/gtk/GtkMisc.html
+share/gtk-doc/html/gtk/GtkNotebook.html
+share/gtk-doc/html/gtk/GtkObject.html
+share/gtk-doc/html/gtk/GtkOldEditable.html
+share/gtk-doc/html/gtk/GtkOptionMenu.html
+share/gtk-doc/html/gtk/GtkPaned.html
+share/gtk-doc/html/gtk/GtkPixmap.html
+share/gtk-doc/html/gtk/GtkPlug.html
+share/gtk-doc/html/gtk/GtkPreview.html
+share/gtk-doc/html/gtk/GtkProgress.html
+share/gtk-doc/html/gtk/GtkProgressBar.html
+share/gtk-doc/html/gtk/GtkRadioButton.html
+share/gtk-doc/html/gtk/GtkRadioMenuItem.html
+share/gtk-doc/html/gtk/GtkRange.html
+share/gtk-doc/html/gtk/GtkRuler.html
+share/gtk-doc/html/gtk/GtkScale.html
+share/gtk-doc/html/gtk/GtkScrollbar.html
+share/gtk-doc/html/gtk/GtkScrolledWindow.html
+share/gtk-doc/html/gtk/GtkSeparator.html
+share/gtk-doc/html/gtk/GtkSeparatorMenuItem.html
+share/gtk-doc/html/gtk/GtkSettings.html
+share/gtk-doc/html/gtk/GtkSizeGroup.html
+share/gtk-doc/html/gtk/GtkSocket.html
+share/gtk-doc/html/gtk/GtkSpinButton.html
+share/gtk-doc/html/gtk/GtkStatusbar.html
+share/gtk-doc/html/gtk/GtkStyle.html
+share/gtk-doc/html/gtk/GtkTable.html
+share/gtk-doc/html/gtk/GtkTearoffMenuItem.html
+share/gtk-doc/html/gtk/GtkText.html
+share/gtk-doc/html/gtk/GtkTextBuffer.html
+share/gtk-doc/html/gtk/GtkTextMark.html
+share/gtk-doc/html/gtk/GtkTextTag.html
+share/gtk-doc/html/gtk/GtkTextTagTable.html
+share/gtk-doc/html/gtk/GtkTextView.html
+share/gtk-doc/html/gtk/GtkTipsQuery.html
+share/gtk-doc/html/gtk/GtkToggleButton.html
+share/gtk-doc/html/gtk/GtkToolbar.html
+share/gtk-doc/html/gtk/GtkTooltips.html
+share/gtk-doc/html/gtk/GtkTree.html
+share/gtk-doc/html/gtk/GtkTreeItem.html
+share/gtk-doc/html/gtk/GtkTreeModel.html
+share/gtk-doc/html/gtk/GtkTreeModelSort.html
+share/gtk-doc/html/gtk/GtkTreeSelection.html
+share/gtk-doc/html/gtk/GtkTreeSortable.html
+share/gtk-doc/html/gtk/GtkTreeStore.html
+share/gtk-doc/html/gtk/GtkTreeView.html
+share/gtk-doc/html/gtk/GtkTreeViewColumn.html
+share/gtk-doc/html/gtk/GtkVBox.html
+share/gtk-doc/html/gtk/GtkVButtonBox.html
+share/gtk-doc/html/gtk/GtkVPaned.html
+share/gtk-doc/html/gtk/GtkVRuler.html
+share/gtk-doc/html/gtk/GtkVScale.html
+share/gtk-doc/html/gtk/GtkVScrollbar.html
+share/gtk-doc/html/gtk/GtkVSeparator.html
+share/gtk-doc/html/gtk/GtkViewport.html
+share/gtk-doc/html/gtk/GtkWidget.html
+share/gtk-doc/html/gtk/GtkWindow.html
+share/gtk-doc/html/gtk/GtkWindowGroup.html
+share/gtk-doc/html/gtk/LayoutContainers.html
+share/gtk-doc/html/gtk/MenusAndCombos.html
+share/gtk-doc/html/gtk/MiscObjects.html
+share/gtk-doc/html/gtk/NumericEntry.html
+share/gtk-doc/html/gtk/Ornaments.html
+share/gtk-doc/html/gtk/PlugSocket.html
+share/gtk-doc/html/gtk/ScrollingWidgets.html
+share/gtk-doc/html/gtk/SelectorWidgets.html
+share/gtk-doc/html/gtk/SpecialObjects.html
+share/gtk-doc/html/gtk/TextWidget.html
+share/gtk-doc/html/gtk/TextWidgetObjects.html
+share/gtk-doc/html/gtk/TreeWidget.html
+share/gtk-doc/html/gtk/TreeWidgetObjects.html
+share/gtk-doc/html/gtk/WindowWidgets.html
+share/gtk-doc/html/gtk/ch01.html
+share/gtk-doc/html/gtk/gtk-Accelerator-Maps.html
+share/gtk-doc/html/gtk/gtk-Bindings.html
+share/gtk-doc/html/gtk/gtk-Clipboards.html
+share/gtk-doc/html/gtk/gtk-Drag-and-Drop.html
+share/gtk-doc/html/gtk/gtk-Feature-Test-Macros.html
+share/gtk-doc/html/gtk/gtk-General.html
+share/gtk-doc/html/gtk/gtk-Graphics-Contexts.html
+share/gtk-doc/html/gtk/gtk-GtkTextIter.html
+share/gtk-doc/html/gtk/gtk-GtkTreeView-drag-and-drop.html
+share/gtk-doc/html/gtk/gtk-Keyboard-Accelerators.html
+share/gtk-doc/html/gtk/gtk-Resource-Files.html
+share/gtk-doc/html/gtk/gtk-Selections.html
+share/gtk-doc/html/gtk/gtk-Signals.html
+share/gtk-doc/html/gtk/gtk-Standard-Enumerations.html
+share/gtk-doc/html/gtk/gtk-Stock-Items.html
+share/gtk-doc/html/gtk/gtk-Themeable-Stock-Images.html
+share/gtk-doc/html/gtk/gtk-Types.html
 share/gtk-doc/html/gtk/gtk-building.html
 share/gtk-doc/html/gtk/gtk-changes-1-2.html
 share/gtk-doc/html/gtk/gtk-changes-2-0.html
-share/gtk-doc/html/gtk/gtk-clipboards.html
 share/gtk-doc/html/gtk/gtk-compiling.html
-share/gtk-doc/html/gtk/gtk-drag-and-drop.html
-share/gtk-doc/html/gtk/gtk-feature-test-macros.html
 share/gtk-doc/html/gtk/gtk-framebuffer.html
-share/gtk-doc/html/gtk/gtk-general.html
-share/gtk-doc/html/gtk/gtk-graphics-contexts.html
-share/gtk-doc/html/gtk/gtk-gtkcelleditable.html
-share/gtk-doc/html/gtk/gtk-gtkeditable.html
-share/gtk-doc/html/gtk/gtk-gtktextiter.html
-share/gtk-doc/html/gtk/gtk-gtktreemodel.html
-share/gtk-doc/html/gtk/gtk-gtktreesortable.html
-share/gtk-doc/html/gtk/gtk-gtktreeview-drag-and-drop.html
-share/gtk-doc/html/gtk/gtk-keyboard-accelerators.html
 share/gtk-doc/html/gtk/gtk-question-index.html
-share/gtk-doc/html/gtk/gtk-resource-files.html
 share/gtk-doc/html/gtk/gtk-resources.html
 share/gtk-doc/html/gtk/gtk-running.html
-share/gtk-doc/html/gtk/gtk-selections.html
-share/gtk-doc/html/gtk/gtk-signals.html
-share/gtk-doc/html/gtk/gtk-standard-enumerations.html
-share/gtk-doc/html/gtk/gtk-stock-items.html
-share/gtk-doc/html/gtk/gtk-themeable-stock-images.html
-share/gtk-doc/html/gtk/gtk-types.html
 share/gtk-doc/html/gtk/gtk-windows.html
 share/gtk-doc/html/gtk/gtk-x11.html
+share/gtk-doc/html/gtk/gtk.devhelp
 share/gtk-doc/html/gtk/gtk.html
-share/gtk-doc/html/gtk/gtkaccellabel.html
-share/gtk-doc/html/gtk/gtkaccessible.html
-share/gtk-doc/html/gtk/gtkadjustment.html
-share/gtk-doc/html/gtk/gtkalignment.html
-share/gtk-doc/html/gtk/gtkarrow.html
-share/gtk-doc/html/gtk/gtkaspectframe.html
 share/gtk-doc/html/gtk/gtkbase.html
-share/gtk-doc/html/gtk/gtkbin.html
-share/gtk-doc/html/gtk/gtkbox.html
-share/gtk-doc/html/gtk/gtkbutton.html
-share/gtk-doc/html/gtk/gtkbuttonbox.html
-share/gtk-doc/html/gtk/gtkcalendar.html
-share/gtk-doc/html/gtk/gtkcellrenderer.html
-share/gtk-doc/html/gtk/gtkcellrendererpixbuf.html
-share/gtk-doc/html/gtk/gtkcellrenderertext.html
-share/gtk-doc/html/gtk/gtkcellrenderertoggle.html
-share/gtk-doc/html/gtk/gtkcheckbutton.html
-share/gtk-doc/html/gtk/gtkcheckmenuitem.html
-share/gtk-doc/html/gtk/gtkclist.html
-share/gtk-doc/html/gtk/gtkcolorselection.html
-share/gtk-doc/html/gtk/gtkcolorselectiondialog.html
-share/gtk-doc/html/gtk/gtkcombo.html
-share/gtk-doc/html/gtk/gtkcontainer.html
-share/gtk-doc/html/gtk/gtkctree.html
-share/gtk-doc/html/gtk/gtkcurve.html
-share/gtk-doc/html/gtk/gtkdialog.html
-share/gtk-doc/html/gtk/gtkdrawingarea.html
-share/gtk-doc/html/gtk/gtkentry.html
-share/gtk-doc/html/gtk/gtkeventbox.html
-share/gtk-doc/html/gtk/gtkfileselection.html
-share/gtk-doc/html/gtk/gtkfixed.html
-share/gtk-doc/html/gtk/gtkfontselection.html
-share/gtk-doc/html/gtk/gtkfontselectiondialog.html
-share/gtk-doc/html/gtk/gtkframe.html
-share/gtk-doc/html/gtk/gtkgammacurve.html
-share/gtk-doc/html/gtk/gtkhandlebox.html
-share/gtk-doc/html/gtk/gtkhbox.html
-share/gtk-doc/html/gtk/gtkhbuttonbox.html
-share/gtk-doc/html/gtk/gtkhpaned.html
-share/gtk-doc/html/gtk/gtkhruler.html
-share/gtk-doc/html/gtk/gtkhscale.html
-share/gtk-doc/html/gtk/gtkhscrollbar.html
-share/gtk-doc/html/gtk/gtkhseparator.html
-share/gtk-doc/html/gtk/gtkimage.html
-share/gtk-doc/html/gtk/gtkimagemenuitem.html
-share/gtk-doc/html/gtk/gtkimcontext.html
-share/gtk-doc/html/gtk/gtkimcontextsimple.html
-share/gtk-doc/html/gtk/gtkimmulticontext.html
-share/gtk-doc/html/gtk/gtkinputdialog.html
-share/gtk-doc/html/gtk/gtkinvisible.html
-share/gtk-doc/html/gtk/gtkitem.html
-share/gtk-doc/html/gtk/gtkitemfactory.html
-share/gtk-doc/html/gtk/gtklabel.html
-share/gtk-doc/html/gtk/gtklayout.html
-share/gtk-doc/html/gtk/gtklist.html
-share/gtk-doc/html/gtk/gtklistitem.html
-share/gtk-doc/html/gtk/gtkliststore.html
-share/gtk-doc/html/gtk/gtkmenu.html
-share/gtk-doc/html/gtk/gtkmenubar.html
-share/gtk-doc/html/gtk/gtkmenuitem.html
-share/gtk-doc/html/gtk/gtkmenushell.html
-share/gtk-doc/html/gtk/gtkmessagedialog.html
-share/gtk-doc/html/gtk/gtkmisc.html
-share/gtk-doc/html/gtk/gtknotebook.html
-share/gtk-doc/html/gtk/gtkobject.html
 share/gtk-doc/html/gtk/gtkobjects.html
-share/gtk-doc/html/gtk/gtkoldeditable.html
-share/gtk-doc/html/gtk/gtkoptionmenu.html
-share/gtk-doc/html/gtk/gtkpaned.html
-share/gtk-doc/html/gtk/gtkpixmap.html
-share/gtk-doc/html/gtk/gtkplug.html
-share/gtk-doc/html/gtk/gtkpreview.html
-share/gtk-doc/html/gtk/gtkprogress.html
-share/gtk-doc/html/gtk/gtkprogressbar.html
-share/gtk-doc/html/gtk/gtkradiobutton.html
-share/gtk-doc/html/gtk/gtkradiomenuitem.html
-share/gtk-doc/html/gtk/gtkrange.html
-share/gtk-doc/html/gtk/gtkruler.html
-share/gtk-doc/html/gtk/gtkscale.html
-share/gtk-doc/html/gtk/gtkscrollbar.html
-share/gtk-doc/html/gtk/gtkscrolledwindow.html
-share/gtk-doc/html/gtk/gtkseparator.html
-share/gtk-doc/html/gtk/gtkseparatormenuitem.html
-share/gtk-doc/html/gtk/gtksettings.html
-share/gtk-doc/html/gtk/gtksizegroup.html
-share/gtk-doc/html/gtk/gtksocket.html
-share/gtk-doc/html/gtk/gtkspinbutton.html
-share/gtk-doc/html/gtk/gtkstatusbar.html
-share/gtk-doc/html/gtk/gtkstyle.html
-share/gtk-doc/html/gtk/gtktable.html
-share/gtk-doc/html/gtk/gtktearoffmenuitem.html
-share/gtk-doc/html/gtk/gtktext.html
-share/gtk-doc/html/gtk/gtktextbuffer.html
-share/gtk-doc/html/gtk/gtktextmark.html
-share/gtk-doc/html/gtk/gtktexttag.html
-share/gtk-doc/html/gtk/gtktexttagtable.html
-share/gtk-doc/html/gtk/gtktextview.html
-share/gtk-doc/html/gtk/gtktipsquery.html
-share/gtk-doc/html/gtk/gtktogglebutton.html
-share/gtk-doc/html/gtk/gtktoolbar.html
-share/gtk-doc/html/gtk/gtktooltips.html
-share/gtk-doc/html/gtk/gtktree.html
-share/gtk-doc/html/gtk/gtktreeitem.html
-share/gtk-doc/html/gtk/gtktreemodelsort.html
-share/gtk-doc/html/gtk/gtktreeselection.html
-share/gtk-doc/html/gtk/gtktreestore.html
-share/gtk-doc/html/gtk/gtktreeview.html
-share/gtk-doc/html/gtk/gtktreeviewcolumn.html
-share/gtk-doc/html/gtk/gtkvbox.html
-share/gtk-doc/html/gtk/gtkvbuttonbox.html
-share/gtk-doc/html/gtk/gtkviewport.html
-share/gtk-doc/html/gtk/gtkvpaned.html
-share/gtk-doc/html/gtk/gtkvruler.html
-share/gtk-doc/html/gtk/gtkvscale.html
-share/gtk-doc/html/gtk/gtkvscrollbar.html
-share/gtk-doc/html/gtk/gtkvseparator.html
-share/gtk-doc/html/gtk/gtkwidget.html
-share/gtk-doc/html/gtk/gtkwindow.html
-share/gtk-doc/html/gtk/gtkwindowgroup.html
+share/gtk-doc/html/gtk/home.png
 share/gtk-doc/html/gtk/index.html
 share/gtk-doc/html/gtk/index.sgml
-share/gtk-doc/html/gtk/layoutcontainers.html
-share/gtk-doc/html/gtk/menusandcombos.html
-share/gtk-doc/html/gtk/miscobjects.html
-share/gtk-doc/html/gtk/numericentry.html
-share/gtk-doc/html/gtk/ornaments.html
-share/gtk-doc/html/gtk/plugsocket.html
-share/gtk-doc/html/gtk/scrollingwidgets.html
-share/gtk-doc/html/gtk/selectorwidgets.html
-share/gtk-doc/html/gtk/specialobjects.html
+share/gtk-doc/html/gtk/left.png
+share/gtk-doc/html/gtk/right.png
 share/gtk-doc/html/gtk/stock_add_24.png
 share/gtk-doc/html/gtk/stock_align_center_24.png
 share/gtk-doc/html/gtk/stock_align_justify_24.png
@@ -608,6 +642,7 @@ share/gtk-doc/html/gtk/stock_align_left_24.png
 share/gtk-doc/html/gtk/stock_align_right_24.png
 share/gtk-doc/html/gtk/stock_apply_20.png
 share/gtk-doc/html/gtk/stock_bottom_24.png
+share/gtk-doc/html/gtk/stock_broken_image_24.png
 share/gtk-doc/html/gtk/stock_cancel_20.png
 share/gtk-doc/html/gtk/stock_cdrom_24.png
 share/gtk-doc/html/gtk/stock_clear_24.png
@@ -669,13 +704,7 @@ share/gtk-doc/html/gtk/stock_zoom_1_24.png
 share/gtk-doc/html/gtk/stock_zoom_fit_24.png
 share/gtk-doc/html/gtk/stock_zoom_in_24.png
 share/gtk-doc/html/gtk/stock_zoom_out_24.png
-share/gtk-doc/html/gtk/textwidget.html
-share/gtk-doc/html/gtk/textwidgetobjects.html
-share/gtk-doc/html/gtk/treewidget.html
-share/gtk-doc/html/gtk/treewidgetobjects.html
-share/gtk-doc/html/gtk/windowwidgets.html
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gtk20.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gtk20.mo
+share/gtk-doc/html/gtk/up.png
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gtk20.mo
@@ -745,9 +774,9 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @exec ${MKDIR} %D/lib/gtk-2.0/modules 2>/dev/null || ${TRUE}
 @dirrm lib/gtk-2.0/modules
 @dirrm lib/gtk-2.0/include
-@dirrm lib/gtk-2.0/2.0.0/loaders
-@dirrm lib/gtk-2.0/2.0.0/immodules
-@dirrm lib/gtk-2.0/2.0.0
+@dirrm lib/gtk-2.0/2.2.0/loaders
+@dirrm lib/gtk-2.0/2.2.0/immodules
+@dirrm lib/gtk-2.0/2.2.0
 @dirrm lib/gtk-2.0
 @dirrm include/gtk-2.0/gtk
 @dirrm include/gtk-2.0/gdk-pixbuf-xlib
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index c1a07407ab1..a1863a889a6 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.12 2002/12/19 12:59:29 grant Exp $
+$NetBSD: distinfo,v 1.13 2002/12/24 04:07:32 wiz Exp $
 
-SHA1 (gtk+-2.0.9.tar.bz2) = 87217c90b10d7abe079525c56df8ff7841ff7657
-Size (gtk+-2.0.9.tar.bz2) = 6310530 bytes
-SHA1 (patch-aa) = 3b5f08aca671cb965d3f9cdd078ca0ad9c2c644e
-SHA1 (patch-ab) = d9c84c3d896a999746e7750ead9791309e99e93d
-SHA1 (patch-ac) = 73793591a49fc5d600617240c92cb7369568cef8
-SHA1 (patch-ad) = fd82d510c7d3a761e5218fda9abe61e73ca7299b
-SHA1 (patch-ae) = bb68fd2552b080f98c90c562de94780ff14bf4f2
-SHA1 (patch-ag) = 55165f8a8d8f0aa1324dcc1c2fbce567e8380c07
-SHA1 (patch-ah) = 144e4931bdb6c28f38191b201227249f125512fb
-SHA1 (patch-am) = 80bcc1a0eff0b4be3e3f9375a5541954cea48266
-SHA1 (patch-aq) = 1e5330847d80f3e39b6949a79a48a7e94b64bb4f
+SHA1 (gtk+-2.2.0.tar.bz2) = b89f54142ef97a4f6fbd85ae19824b41574788f3
+Size (gtk+-2.2.0.tar.bz2) = 6448407 bytes
+SHA1 (patch-aa) = 1552e92d97d93a403b908bfe8436e131be9f562e
+SHA1 (patch-ab) = 1734c8ff78460891a2c0bda4ddf0d798c99a31d3
+SHA1 (patch-ac) = 68b0d7da55de5209bed53f3daea1881a634a216f
+SHA1 (patch-ad) = f514ec4f261a148bde25a9618694df71d7586f6a
+SHA1 (patch-ae) = a678a466ccf60adb284f017b08bd1d59388c9669
+SHA1 (patch-ag) = d01d38f2920730e0516edcb447be37960c122aca
+SHA1 (patch-ah) = 47ca3efbf8d2541dd87bfb9845a35f2c5cbf1061
+SHA1 (patch-aq) = 815a362bdc60f2b645b7b5e9381a1925d1a6df8e
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 18b6ad8498e..04229a1e29f 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2002/10/08 00:02:18 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2002/12/24 04:07:33 wiz Exp $
 
---- configure.orig	Wed Jul 31 14:12:14 2002
+--- configure.orig	Fri Dec 20 21:55:05 2002
 +++ configure
-@@ -10391,7 +10391,7 @@ LIBS="$LIBS $INTLLIBS"
- 
- # AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
- # this is the directory where the *.{mo,gmo} files are installed
--gtklocaledir='${prefix}/${DATADIRNAME}/locale'
-+gtklocaledir='${prefix}/${PKGLOCALEDIR}/locale'
- 
- 
- echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5
-@@ -14347,11 +14347,11 @@ echo "$as_me: error: Could not find a gd
+@@ -12939,11 +12939,11 @@ echo "$as_me: error: Could not find a gd
    fi
  fi
  
@@ -25,7 +16,7 @@ $NetBSD: patch-aa,v 1.6 2002/10/08 00:02:18 jlam Exp $
  
  
  
-@@ -16861,7 +16861,7 @@ fi
+@@ -15635,7 +15635,7 @@ fi
  
  GDK_PIXBUF_XLIB_PACKAGES=
  GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
@@ -34,7 +25,7 @@ $NetBSD: patch-aa,v 1.6 2002/10/08 00:02:18 jlam Exp $
  
  
  
-@@ -17077,7 +17077,7 @@ LDFLAGS="$saved_ldflags"
+@@ -15831,7 +15831,7 @@ LDFLAGS="$saved_ldflags"
  
  GDK_PACKAGES=$PANGO_PACKAGES
  GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
@@ -43,7 +34,7 @@ $NetBSD: patch-aa,v 1.6 2002/10/08 00:02:18 jlam Exp $
  
  #
  # If we aren't writing explicit dependencies, then don't put the extra libraries we need
-@@ -17195,7 +17195,7 @@ GTK_PACKAGES=atk
+@@ -15929,7 +15929,7 @@ GTK_PACKAGES=atk
  GTK_EXTRA_LIBS=
  GTK_EXTRA_CFLAGS=
  GTK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
index db6857b8cdd..84b6b0500c2 100644
--- a/x11/gtk2/patches/patch-ab
+++ b/x11/gtk2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2002/10/08 00:02:18 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2002/12/24 04:07:33 wiz Exp $
 
---- demos/Makefile.am.orig	Mon Jul 29 20:09:49 2002
+--- demos/Makefile.am.orig	Sat Nov  9 01:07:21 2002
 +++ demos/Makefile.am
 @@ -19,6 +19,7 @@ DEPS = \
  	$(top_builddir)/gtk/@gtktargetlib@
@@ -10,12 +10,3 @@ $NetBSD: patch-ab,v 1.5 2002/10/08 00:02:18 jlam Exp $
  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
  	$(top_builddir)/gdk/@gdktargetlib@        			\
  	$(top_builddir)/gtk/@gtktargetlib@ 				\
-@@ -35,7 +36,7 @@ noinst_PROGRAMS = 		\
- if CROSS_COMPILING
- pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
- else
--pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource
-+pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf $$topdir/gdk-pixbuf/gdk-pixbuf-csource
- endif
- 
- test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
index 5ea3ef295d6..d4b38eb8c80 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2002/10/08 00:02:18 jlam Exp $
+$NetBSD: patch-ac,v 1.8 2002/12/24 04:07:34 wiz Exp $
 
---- demos/Makefile.in.orig	Wed Jul 31 15:10:15 2002
+--- demos/Makefile.in.orig	Sat Dec 21 02:35:04 2002
 +++ demos/Makefile.in
-@@ -195,6 +195,7 @@ DEPS = \
+@@ -188,6 +188,7 @@ DEPS = \
  
  
  LDADDS = @STRIP_BEGIN@ 							\
@@ -10,12 +10,3 @@ $NetBSD: patch-ac,v 1.7 2002/10/08 00:02:18 jlam Exp $
  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
  	$(top_builddir)/gdk/@gdktargetlib@        			\
  	$(top_builddir)/gtk/@gtktargetlib@ 				\
-@@ -210,7 +211,7 @@ noinst_PROGRAMS = \
- 	pixbuf-demo
- 
- @CROSS_COMPILING_TRUE@pixbuf_csource = @CROSS_COMPILING_TRUE@$(GDK_PIXBUF_CSOURCE)
--@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource
-+@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf $$topdir/gdk-pixbuf/gdk-pixbuf-csource
- 
- testpixbuf_DEPENDENCIES = $(DEPS)
- testpixbuf_drawable_DEPENDENCIES = $(DEPS)
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
index 40bef60588a..122a163c753 100644
--- a/x11/gtk2/patches/patch-ad
+++ b/x11/gtk2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.5 2002/12/24 04:07:34 wiz Exp $
 
---- demos/gtk-demo/Makefile.am.orig	Fri Mar  8 01:36:21 2002
+--- demos/gtk-demo/Makefile.am.orig	Sun Sep 29 23:43:06 2002
 +++ demos/gtk-demo/Makefile.am
-@@ -41,6 +41,7 @@
+@@ -42,6 +42,7 @@ DEPS = \
  	$(top_builddir)/gtk/@gtktargetlib@
  
  LDADDS = @STRIP_BEGIN@ 							\
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index afa7a0b00fa..97390d88bd4 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2002/08/25 19:23:32 jlam Exp $
+$NetBSD: patch-ae,v 1.6 2002/12/24 04:07:34 wiz Exp $
 
---- demos/gtk-demo/Makefile.in.orig	Sun Jun 16 01:16:32 2002
+--- demos/gtk-demo/Makefile.in.orig	Sat Dec 21 02:35:05 2002
 +++ demos/gtk-demo/Makefile.in
-@@ -216,6 +216,7 @@
+@@ -210,6 +210,7 @@ DEPS = \
  
  
  LDADDS = @STRIP_BEGIN@ 							\
diff --git a/x11/gtk2/patches/patch-ag b/x11/gtk2/patches/patch-ag
index 99bb92ecd64..b56b81a32fd 100644
--- a/x11/gtk2/patches/patch-ag
+++ b/x11/gtk2/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.4 2002/12/24 04:07:34 wiz Exp $
 
---- gdk-pixbuf/Makefile.am.orig	Fri Mar  8 01:36:26 2002
+--- gdk-pixbuf/Makefile.am.orig	Sat Dec  7 16:13:58 2002
 +++ gdk-pixbuf/Makefile.am
-@@ -227,7 +227,7 @@
+@@ -255,7 +255,7 @@ INCLUDES = @STRIP_BEGIN@ 			\
  @STRIP_END@
  
  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
 -LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
 +LDADDS = @LDFLAGS@ libgdk_pixbuf-$(GTK_API_VERSION).la
  
- noinst_PROGRAMS = test-gdk-pixbuf test-loaders
+ noinst_PROGRAMS = test-gdk-pixbuf
  test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
index c1aa38a8921..6619bc00a50 100644
--- a/x11/gtk2/patches/patch-ah
+++ b/x11/gtk2/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.4 2002/12/24 04:07:34 wiz Exp $
 
---- gdk-pixbuf/Makefile.in.orig	Tue Apr  2 06:50:29 2002
+--- gdk-pixbuf/Makefile.in.orig	Sat Dec 21 02:34:56 2002
 +++ gdk-pixbuf/Makefile.in
-@@ -324,7 +324,7 @@
+@@ -383,7 +383,7 @@ INCLUDES = @STRIP_BEGIN@ 			\
  
  
  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
 -LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
 +LDADDS = @LDFLAGS@ libgdk_pixbuf-$(GTK_API_VERSION).la
  
- noinst_PROGRAMS = test-gdk-pixbuf test-loaders
+ noinst_PROGRAMS = test-gdk-pixbuf
  test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11/gtk2/patches/patch-am b/x11/gtk2/patches/patch-am
deleted file mode 100644
index 0aaa95e9dc4..00000000000
--- a/x11/gtk2/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.3 2002/04/06 15:48:56 dmcmahill Exp $
-
---- po/Makefile.in.in.orig	Thu Sep 27 06:07:57 2001
-+++ po/Makefile.in.in
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/${PKGLOCALEDIR}/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/x11/gtk2/patches/patch-aq b/x11/gtk2/patches/patch-aq
index d389fffd515..6f291edfc6a 100644
--- a/x11/gtk2/patches/patch-aq
+++ b/x11/gtk2/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1 2002/10/08 00:02:19 jlam Exp $
+$NetBSD: patch-aq,v 1.2 2002/12/24 04:07:35 wiz Exp $
 
---- Makefile.in.orig	Mon Oct  7 15:50:30 2002
+--- Makefile.in.orig	Sat Dec 21 02:34:37 2002
 +++ Makefile.in
-@@ -174,7 +174,7 @@ l = @l@
+@@ -167,7 +167,7 @@ gtktargetlib = @gtktargetlib@
  ms_librarian = @ms_librarian@
  xinput_progs = @xinput_progs@