Add padding and alignment tests to testadjustsize.c

Add margin and alignment properties to GtkWidget
h-align = START,END,CENTER,FILL v-align = START,END,CENTER,FILL margin-left,right,top,bottom margin These should obsolete all such similar properties on layout containers, GtkMisc, GtkAlignment, GtkContainer::border-width Margin is outside the size request. If margin were not outside the set_size_request() it would not work the same way as container-supplied (child property) padding. Conceptually set_size_request() forces the value from the subclass (the original unadjusted request) and then we go on to adjust the request further by adding the margin.
2010-09-12 13:12:17 -04:00 · 2010-09-12 13:12:17 -04:00 · 2010-09-12 13:12:17 -04:00 · 2010-09-12 13:12:16 -04:00 · 2010-09-12 13:12:16 -04:00 · 2010-09-12 13:12:16 -04:00
1905 changed files with 367202 additions and 582397 deletions
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -3,22 +3,12 @@ Prerequisites

 GTK+ requires the following packages:

- - The GLib, Pango, ATK and cairo libraries, available at the same
-   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.23.6,
-   Pango 1.20, ATK 1.29.2 and cairo 1.6.0.
+ - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
+   the same location as GTK+. GTK+ @GTK_VERSION@ requires at least
+   GLib 2.23.6, Pango 1.20, GdkPixbuf 2.21.0 ATK 1.29.2 and cairo 1.6.0.

 - gobject-introspection 0.6.7 or newer.

- - The TIFF, PNG, and JPEG image loading libraries. You most
-   likely have these installed on your system already. If not
-   these libraries are available from:
-
-    http://www.libtiff.org/
-    http://www.libpng.org/
-    http://www.ijg.org/
-
-    libtiff must be version 3.6.0 or higher.
-
 Simple install procedure
 ========================

--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,10 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl

-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+SRC_SUBDIRS = gdk gtk modules demos tests perf
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build

-# require automake 1.4
-AUTOMAKE_OPTIONS = 1.7
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

 EXTRA_DIST +=			\
 	HACKING			\
@@ -50,14 +48,10 @@ EXTRA_DIST +=			\
 	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  \
@@ -68,11 +62,8 @@ EXTRA_DIST +=			\
 	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  \
@@ -102,14 +93,10 @@ EXTRA_DIST +=			\
 	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  \
@@ -143,37 +130,37 @@ MAINTAINERCLEANFILES = \
 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
+gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc
+	rm -f gtk+-$(GDKTARGET)-3.0.pc && \
+	cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.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
+gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc
+	rm -f gdk-$(GDKTARGET)-3.0.pc && \
+	cp gdk-3.0.pc gdk-$(GDKTARGET)-3.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
+gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
+	rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \
+	cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.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
+gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
+	rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \
+	cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc

 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
+pkgconfig_DATA = gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc

 if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-2.0.pc
+pkgconfig_DATA += gtk+-unix-print-3.0.pc
 endif

 DISTCLEANFILES =				\
-	gtk+-unix-print-2.0.pc			\
-	gtk+-$(GDKTARGET)-2.0.pc		\
-	gdk-$(GDKTARGET)-2.0.pc			\
-	gail.pc					\
-	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gail-uninstalled.pc 			\
+	gtk+-unix-print-3.0.pc			\
+	gtk+-$(GDKTARGET)-3.0.pc		\
+	gdk-$(GDKTARGET)-3.0.pc			\
+	gail-3.0.pc				\
+	gtk+-$(GDKTARGET)-3.0-uninstalled.pc	\
+	gdk-$(GDKTARGET)-3.0-uninstalled.pc	\
+	gail-3.0-uninstalled.pc			\
 	config.lt

 distclean-local:
@@ -195,21 +182,21 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi

-## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
+## copy the default target for this platform to gdk-3.0.pc and gtk+-3.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) || \
+	 test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \
+	 test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \
+	 rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \
+	 rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.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)
+	 rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \
+	 rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc)

 uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc
-	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc

 dist-hook:
 	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
@@ -243,7 +230,11 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`

-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds --enable-introspection
+DISTCHECK_CONFIGURE_FLAGS =		\
+		--enable-gtk-doc 	\
+		--enable-man 		\
+		--disable-rebuilds 	\
+		--enable-introspection

 GITIGNOREFILES = \
 	po-properties/Makefile.in.in \
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -30,13 +30,17 @@ XVFB_START = \
 # call as: $(XVFB_START) && someprogram

 # test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
+test: test-cwd test-recurse
+# test-cwd: run tests in cwd
+test-cwd: ${TEST_PROGS}
 	@$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-	  $(XVFB_START) && { set -e; ${GTESTER} --verbose ${TEST_PROGS}; }; \
+	  $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) ${GTESTER} --verbose ${TEST_PROGS}; }; \
 	}
+# test-recurse: run tests in subdirs
+test-recurse:
 	@ for subdir in $(SUBDIRS) ; do \
 	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) test ) || exit $? ; \
 	  done
 # test-report: run tests in subdirs and generate report
 # perf-report: run tests in subdirs with -m perf and generate report
@@ -77,6 +81,6 @@ test-report perf-report full-report:	${TEST_PROGS}
 	    rm -rf "$$GTESTER_LOGDIR"/ ; \
 	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
 	  }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
-check-local: test
+.PHONY: test test-cwd test-recurse test-report perf-report full-report
+# run make test-cwd as part of make check
+check-local: test-cwd
--- a/528
+++ b/528
@@ -1,3 +1,531 @@
+Overview of Changes from GTK+ 2.90.6 to 2.90.7
+==============================================
+
+* Various deprecated APIs have been removed:
+ - the GtkWidget::draw-border style property
+ - the GtkEntry::state-hint style property
+ - the GtkTreeView::row-ending-details style property
+ - the GtkRange::trough-side-details style property
+ - the GtkRange::stepper-position-details style property
+ - the GtkRange::activate-slider style property
+ - the GTK_CALENDAR_WEEK_START_MONDAY option
+ - the GtkFrame::shadow and GtkHandleBox::shadow properties
+ - the GtkTextView::page-horizontally signal
+ - the GDK_WINDOW_DIALOG window type
+ - the GTK_SELECTION_EXTENDED selection mode
+ - the GtkProgressBarOrientation, GtkAnchorType and GtkVisibility
+   enumerations
+ - GtkDialog separators, including the GtkDialog::has-separator
+   property, including setter/getter, the GTK_DIALOG_NO_SEPARATOR
+   flag and the GtkMessageDialog::use-separator style property
+ - gtk_status_icon_set/get_blinking
+ - gdk_window_et_deskrelative_origin
+ - The GtkItem class has been removed. Its functionality has
+   been merged into is sole subclass, GtkMenuItem
+
+* The GtkIconView::orientation property has been renamed
+  to 'item-orientation'
+
+* GtkProgressBar and GtkCellRendererProgress implement GtkOrientable
+  now, and their 'orientation' property have been split into
+  a 'orientation' property of type GtkOrientation and a boolean
+  'inverted' property
+
+* GDK no longer exports variables: gdk_threads_lock, gdk_threads_unlock,
+  gdk_threads_mutex and gdk_display are no longer available
+
+* GTK no longer exports variables: gtk_major_version, gtk_minor_version,
+  gtk_micro_version, gtk_binary_age, gtk_interface_age have been
+  converted to functions. gtk_debug_flags has a getter and a setter.
+  Misc. variables that had been exported by the semi-private text
+  API have been removed.
+
+* All GDK keysym names have been changed from GDK_keysym to GDK_KEY_keysym;
+  the previous names are still available in gdkkeysyms-compat.h.
+
+* GtkWrapBox is a new container, which distributes its children
+  over multiple rows/columns
+
+* GTK+ now uses standard icon names when looking up stock icons
+
+* More widgets and cell renderers have been converted to support
+  width-for-height: GtkCellRendererText, GtkAccelLabel, GtkCellView,
+  GtkComboBox, GtkMenu, GtkMenuItem
+
+* Button boxes are now semi-homogeneous.
+
+* The directfb backend has been removed
+
+* Bugs fixed:
+  77669 GtkWrapBox for gtk itself, not gimp?
+  84188 "Dialogue" button widths should not be homogenous
+ 414712 gtk_container_set_focus_child leaks widget
+ 527499 FileFilter combo becames too wide
+ 528257 File selector and stock string problems
+ 605186 Use G_DEFINE_INTERFACE macro
+ 614006 File chooser crashes when creating a new folder...
+ 616401 Noneffective gdk_keymap_map_virtual_modifiers in early use
+ 626710 GailScaleButton calculates wrong value for minimum increment
+ 627028 Marked state of calendar day is not accessible
+ 627139 gtkfilechooserentry shows completion progress tooltip on first show
+ 627445 Removal of GtkWidget::draw-border breaks gtk_widget_queue_draw()
+ 627580 GtkFontSelection: don't notify the non-existent "font" property
+ 627643 gtkaboutdialog gettext problem
+ 627828 Drag and drop between treeviews in different window groups broken...
+ 627843 set_active_iter doc: remove restriction on path length
+ 627867 tests/testsocket is broken
+ 627912 misprint in the desc. of "hover-expand" and "hover-selection"...
+ 628160 introspection: Update to new scanner API
+ 628308 docs referencing non existing icons
+ 628656 _gdk_windowing_get_startup_notify_id memory leak
+ 628807 Add more "reserved for expansion" fields to GtkWidgetClass
+ 628808 Warn if a widget requests minimum size > natural size
+ 628884 Use a bitfield for Widget::private_flags, ::state, ::saved_state
+ 628935 add gtk_radio_button_join_group method for bindings
+ 629110 gtk_spinner_accessible_get_type always returns null
+
+* Translation updates
+ Arabic
+ Armenian
+ Brazilian Portuguese
+ British English
+ Bulgarian
+ Danish
+ Estonian
+ French
+ Galician
+ Hebrew
+ Hungarian
+ Indonesian
+ Kazakh
+ Norwegian bokmål
+ Norwegian Nynorsk
+ Portuguese
+ Serbian
+ Slovenian
+ Spanish
+ Telugu
+ Traditional Chinese
+
+
+Overview of Changes from GTK+ 2.90.5 to 2.90.6
+==============================================
+
+* All drawing done by GTK+ itself has been ported from
+  GDK drawing APIs to cairo
+
+* GtkExpander and GtkFrame now implement GtkSizeRequest
+
+* GtkExpander gained a ::label-fill property to make the label
+  fill the entire horizontal space
+
+* Allow windows to be dragged by clicking on empty
+  areas in menubars and toolbars
+
+* GtkAboutDialog can now refer to licenses using a ::license-type
+  enumeration instead of embedding the license text
+
+* Deprecations and cleanups:
+ - Remove GtkNotebookPage
+ - Remove public struct members in many classes
+ - Remove the GtkRecentManager::limit property
+ - Remove all GDK drawing functions, ie gdk_draw_*. Use cairo instead
+ - Remove all GdkGC functions. Use cairo instead
+ - Remove all of GdkImage. Use cairo instead
+ - Remove all of GdkRGB. Use cairo instead
+ - Remove gdk_{bit,pix}map_create_from_data
+ - GDK no longer depends on the render X extension
+
+* New accessors:
+ - gdk_cursor_get_cursor_type
+ - gdk_device_get_n_axes
+ - gdk_display_is_closed
+ - gtk_notebook_get_tab_[hv]border
+
+* New cairo-related APIs:
+ - gdk_window_create_similar_surface
+ - gdk_window_get_background_pattern
+
+* Bugs fixed:
+  90935 GtkIMContextClass inheritance ...
+  97414 gtkaccellabel: s/seperator/separator/
+ 336225 Support for common licenses in about dialog
+ 554926 gtk_init_with_args: not setting translation domain...
+ 557263 Notebooks return 1 selection even if they have no pages
+ 579583 GtkStatusIcon's scroll-event documentation missing "Since: ..."
+ 580291 Gail does not work with custom treemodels
+ 596125 Property string fixes
+ 604391 Gtk-CRITICAL when switching between tab
+ 605190 Should delete the description of xim related options...
+ 609264 gtk_(tree/list)_store_set documentation unclear about ownership
+ 611313 Window dragging from menubars/toolbars
+ 612919 crash in System Monitor: I was moving up-down wit...
+ 614049 Allow packing options for GtkExpander label widgets
+ 614443 Doxygen 'forgets' #define documentation under certain conditions
+ 615474 gtk_widget_set_has_window() documentation is not correct
+ 618327 GtkNotebookPage should be deprecated
+ 621571 Fix damage events on offscreen windows
+ 622658 GTK_STOCK_FILE Stock Label
+ 623603 meld built with pygtk-2.16.0 giving warnings
+ 623865 gtkdnd: pointer grab may never finish (ungrab before grab)
+ 624087 Missing accessor for GdkCursor.type
+ 624224 Missing accessor for GdkDisplay.closed
+ 624270 crash in gtk_entry_completion_default_completion_func
+ 624333 Deprecate GtkRecentManager:limit
+ 624362 access an invalid ActionGroup
+ 624367 GtkButtonBox is broken
+ 624397 Move GtkBoxChild from public .h to gtkbox.c
+ 624432 GtkRadioMenuItem is broken
+ 624540 GtkRadionAction loop in its activate handler
+ 624687 switch-page bug when activated from menu
+ 624707 warnings when showing gnome-terminal menus on gtk master
+ 624779 GtkCalendar padding/margin/spacing/border/whatever is hard-coded
+ 625104 Don't try and use the child of a GtkSeparatorMenuItem
+ 625235 Tooltips cause warnings
+ 625300 Buttons order in dialogs broken in gtk+3
+ 625416 gtk_file_chooser_default_map should not reload directory
+ 625650 Add annotations to gtk_tree_model_iter_next() and...
+ 625655 win32 compile failure due to G_SEAL
+ 625715 comment string in GtkAboutDialog is not centered
+ 625953 GailAdjustment does not implement get_minimum_increment...
+ 626052 Activating a file in GtkFileChooserDialog activates action...
+ 626276 gtk_tree_selection_set_select_function() should allow...
+ 626514 License dialog doesn't take into account long copyrights
+
+* Translation updates:
+ Asturian
+ Galician
+ German
+ Hebrew
+ Indonesian
+ Norwegian bokmål
+ Punjabi
+ Romanian
+ Simplified Chinese
+ Slovenian
+ Spanish
+ Swedish
+ Traditional Chinese
+
+
+Overview of Changes from GTK+ 2.90.4 to 2.90.5
+==============================================
+
+* Support NOCONFIGURE in autogen.sh to avoid running configure
+
+* The cairo dependency has been bumped to 1.9.10
+
+* Drop aliasing hacks instead use -Bsymbolic-funtions.
+
+* Bugs:
+ 589904 Certain drawing in some widgets does not pass on...
+ 610346 Confusion between GtkWindow:allow-grow and GtkWindow:resizable
+ 613284 Replace GdkRegion with cairo_region_t
+ 617386 Migrate API docs from templates to source files (GtkButton)
+ 617389 Migrate API docs from templates to source files (GtkCalendar)
+ 617392 Migrate API docs from templates to source files (GtkCellEditable)
+ 621414 Can't select file on file browser popup after choosing to sort...
+ 622677 Remove GdkWindowObject public structure
+ 623239 also show num-lock warning
+ 623307 Annotate gdk_display_manager_list_displays return value
+ 623389 [iconview] Fix segfault when using rubberband selection
+ 623476 [windows] gdk fails to compile
+ 623520 gtk+ 3 fails to build from outside git source tree
+ 623845 Use -Bsymbolic
+ 461618 use GSlice for gtkrequisition
+
+* Deprecations and cleanups:
+ - GdkRegion has been removed, and region-using code has been ported
+   to cairo_region_t and cairo_rectangle_int_t.
+ - The deprecated GdkFont has been removed, together with vestigial
+   uses in GTK+, including the GdkFontSel::font property and a GdkFont
+   member in GtkStyle.
+ - The GdkWindowObject structure has been removed from public headers.
+ - The GdkWindow::allow-grow and ::allow-shrink properties have been removed.
+
+* Quartz:
+ - Misc fixed to clipping and color handling
+ - Update the DND code for GdkDevice changes
+
+* Translation updates:
+ Breton
+ Czech
+ Estonian
+ Galician
+ Hebrew
+ Kazakh
+ Norwegian bokmål
+ Slovenian
+ Simplified Chinese
+ Spanish
+
+
+Overview of Changes from GTK+ 2.90.3 to 2.90.4
+==============================================
+
+* GSEAL is now enabled by default
+
+* gdk-pixbuf has been moved into a separate module
+
+* The GtkExtendedLayout interface has been renamed to
+  GtkSizeRequest
+
+* gtk_init warns if it detects GTK2.x and GTK3 being used
+  in the same process
+
+* Misc new API:
+ gtk_accessible_set_widget
+ gtk_message_dialog_get_message_area
+ gtk_font_selection_dialog_get_font_selection
+ gtk_window_group_get_current_grab
+ gtk_table_get_size
+ gtk_button_get_event_window
+ gdk_device_manager_get_client_pointer
+ gdk_image_get_pixels
+
+* Bugs fixed:
+ 522756 gnome-appearance-properties crashed with SIGSEGV...
+ 620832 make _gtk_window_group_get_current_grab() public
+ 621250 Missing accessors for GtkRange has_stepper_X
+ 621685 Add gdk_device_manager_get_client_pointer() ...
+ 621690 Enable per-device events on gtk_widget_realize()
+ 621927 Bug in gtk/Makefile.in: affects gtktypefuncs.c
+ 622011 Don't handle "connecting-to-device" state reason
+ 622581 [GSEAL] GtkButton has no accessor for event_window
+ 622765 Duplicate symbols in Gdk on OSX
+ 622827 test/testapplication.c doesn't build in quartz
+
+* Translation updates:
+ Arabic
+ Armenian
+ Galician
+ Slovenian
+ Spanish
+
+
+Overview of Changes from GTK+ 2.90.2 to 2.90.3
+==============================================
+
+* GtkProgress has been removed. It was entirely deprecated for
+  a long time
+
+* GtkApplication has been updated to match the GApplication API
+  as of GLib 2.25.9
+
+* XI2:
+ - Device grabs now take precedence over GTK+ grabs
+ - Various other bug fixes
+
+* Extended Layout:
+ - Prevent negative allocations (as seen in emacs and gedit)
+
+* Win32: XP theming is back !
+
+* Misc new API:
+ - Add an accessor for GtkViewport->view_window
+ - Add an accessor for GdkDragContext->source_window
+ - gtk_icon_theme_load_symbolic_for_style a variant of
+   gtk_icon_theme_load_symbolic taking a GtkStyle
+
+* Introspection:
+ - Misc annotation fixes
+
+* Cleanups:
+ - GTK_OBJECT_FLAGS and GtkObjectFlags have been depreated
+
+* Bugs fixed:
+ 620618 get rid of GtkProgress
+ 615666 GTK_OBJECT_FLAGS() should be deprecated
+ 617444 GNU emacs warnings with extended layout GTK+
+ 621631 Non-consistent style in GtkUIManager docs
+ 621136 GtkCalendar: Some functions always return TRUE
+ 621003 GtkApplication] Update for GApplication API changes
+ 621683 gtk_menu_attach_to_widget() should emit an "attach-widget"...
+ 621479 typo in GTK docs on library.gnome.org
+ 621081 GtkViewport missing accessor for view_window.
+ 620440 Combo-boxes loose focus
+ 621775 Space symbol missed in Resources chapter
+ 621578 Symbolic color cut-and-paste mess
+ 621111 gtk_init_with_args()'s GOptionEntry argument should be const
+ 602289 gdk_spawn_on_screen(_with_pipes) uses gint for pid
+
+* Updated translations:
+ Galician
+ Norwegian bokmål
+ Spanish
+
+
+Overview of Changes from GTK+ 2.90.1 to 2.90.2
+==============================================
+
+* GtkApplication: an application class, based on GApplication. Currently,
+  this is fairly minimal, but it is good enough already to replace libunique.
+  Future work:
+  - Add a way to say "This is my application menubar", which gets
+    put into all toplevel windows on non-OS-X, and into the top
+    on OS X
+  - Support session management
+  - Maybe support application settings
+
+* Misc new api:
+ - gtk_window_has_group: determines if a window is part of a window group
+ - gtk_status_bar_remove_all: removes all messages from a statusbar
+
+* DND on offscreen windows works now
+
+* GtkIconView:
+ - arrow keynav can now be connected over adjacent icon views
+
+* GtkAssistant:
+ - gtk_assistant_commits: prevents going back beyond a certain
+   point in the page sequence, adjust shown buttons appropriately
+ - It is now officially supported to have a progress page at the
+   end of the page sequence
+
+* Introspection:
+ - Many annotation fixes
+ - gdkx.h api is exported in a separate typelib, GdkX11-3.0
+
+* Cleanups:
+ - the draw_string function has been removed from GtkStyle
+ - gdk_get/set_use_xshm have been removed
+ - Deprecated gdk_color api has been removed
+
+* Documentation related to GTK+ 1.2, etc has been removed. Instead
+  there is an initial GTK+ 3 porting guide now.
+
+* Bugs fixed:
+ 620509 Progress bar rendering is broken
+ 607628 DnD operation doesn't work when using offscreen.
+ 619838 kill off references to gtk 1.2 in docs/comments
+ 608218 GtkOffscreenWindow causes bad window with GtkEntry
+ 619649 Remove deprecated code from GdkColor
+ 619080 text-inserted events should not be emitted unless text...
+ 620511 Use g_source_set_name for all custom GSources in GTK+
+ 603637 gtk printer dialog does not show remote printer
+ 618271 Add gtk_window_has_group()
+ 617863 Actually expose the X11 funcs through introspection
+ 620244 misprint in the description of the function gtk_widget_list_...
+ 549127 Print error dialog not shown
+ 611709 gseal hides GtkStatusBar->messages but doesn't give anything...
+ 596428 GtkAssistant: Support ending with a progress page
+
+* Translation updates:
+Esperanto
+Hebrew
+Irish
+
+
+Overview of Changes from GTK+ 2.90.0 to 2.90.1
+==============================================
+
+* Printing: The list of locales using US Letter papersize has
+  been updated to match the CLDR 1.8.1
+
+* The default location for the 'module cache' files (ie the files
+  produced by gdk-pixbuf-query-loaders and gtk-query-immodules) has
+  been changed to $libdir/gtk-3.0/3.0.0/{loaders,immodules}.cache.
+  This should avoid multilib problems with the previous location.
+
+  Additionally, the query utilities accept an --update-cache argument
+  to update the cache file directly, instead of writing to stdout
+
+* gtk_radio_action_join_group: A binding-friendly way to manage
+  radio actions.
+
+* GtkAdjustment enforces values to the range [lower, upper - page_size]
+
+* GDK has been GSEALed, with the addition of suitable accessors
+
+* The XI2 branch with better support for multiple input devices has
+  been merged, together with backends for XInput, XInput2, win32 and
+  Quartz, and corresponding updates to input-device handling code
+  in GTK.
+
+* A number of orientable widgets are no longer abstract: GtkBox,
+  GtkButtonBox, GtkPaned, GtkRuler, GtkScale, GtkScrollbar, GtkSeparator.
+  All of these can now be instantiated and flipped between horizontal
+  and vertical orientation at runtime. Their H/V subclasses are still
+  available, as convenience API.
+
+* More deprecated API has been removed
+
+* Bugs fixes:
+ 613132 GtkBoxChild should probably be deprecated
+ 592580 GDK needs sealing
+ 618870 GTK+ uses wrong pkg-config to reveal the CAIRO_PREFIX
+ 616817 Remove code to support deprecated GtkToolbar api
+ 619114 undefined reference to `XkbBell'
+ 617863 Actually expose the X11 funcs through introspection
+ 613302 GtkWidget not emitting the unmap signal
+ 565559 Incorrect leave-notify signals for treeview
+ 533946 GtkHScale does not update correctly
+ 618000 Sync paper size fallbacks with CLDR 1.8.1
+ 614581 Gtk print dialog freezes on start up
+ 551322 configure does not use -lm in jasper (JPEG2000) testing
+ 619474 Fixes for GtkAdjustment for GTK+ 3
+ 555087 Shouldn't the return type of gtk_entry_completion_get_model...
+ 619385 Fix compilation warning: Do not break strict-aliasing rules
+ 596725 Add XInput2 support
+
+* Updated translations
+ Arabic
+ Estonian
+ Galician
+ Italian
+ Indonesian
+ Oriya
+ Shavian
+
+
+Overview of Changes from GTK+ 2.20.x to 2.90.0
+==============================================
+
+* GtkExtendedLayout: Width-for-height geometry management.
+  This change is known to currently cause minor problems in
+  some applications, see
+  617444 GNU emacs warnings with extended layout GTK+
+  617556 inkscape toolbars broken with extended layout
+
+* gtk_icon_theme_load_symbolic: Support for 'symbolic' icons
+
+* Applications can indicate their preference for a dark theme
+  variant by setting GtkSettings::gtk-application-prefer-dark-theme
+
+* GtkTreeModelFilter can be more usefully subclassed
+
+* Tooltip positioning has been changed to make it less likely
+  that the tooltip covers up the widget that it relates to
+
+* Deprecated functions have been removed (though some more work
+  remains to be done in GDK)
+
+* This release is parallel installable with GTK+ <= 2.22, by renaming
+  .pc files, libraries, include paths, module paths, gtkrc files, etc
+  to include a '3.0' in its name.
+
+* Updated translations:
+ Basque
+ Bengali
+ Bengali India
+ Catalan
+ Catalan (Valencian)
+ Crimean Tatar
+ Danish
+ Dutch
+ Galician
+ Greek
+ Indonesian
+ Kannada
+ Kazakh
+ Latvian
+ Marathi
+ Norwegian bokmål
+ Spanish
+ Thai
+ Ukrainian
+
+
 Overview of Changes from GTK+ 2.19.7 to 2.20.0
 ==============================================

--- a/README.in
+++ b/README.in
@@ -111,15 +111,11 @@ Release notes for 2.14
  to GTK_SENSITIVITY_ON, so that the button is always sensitive or
  GTK_SENSITIVITY_OFF to make it insensitive respectively.

-* In the early 2.14.x releases, GtkAdjustment was changed to enforce
-  that values are restricted to the range [lower, upper - page_size].
-  This has always been the documented behaviour, and the recommended
-  practice is to set page_size to 0 when using adjustments for simple
-  scalar values, like in a slider or spin button.
-  Due to the large number of applications that are affected by this
-  change, the behaviour has been reverted to the old behaviour in
-  2.14.3, with an explicit warning that this change will be
-  reintroduced in 2.90.
+* GtkAdjustment now enforces that values are restricted to the
+  range [lower, upper - page_size]. This has always been the documented
+  behaviour, and the recommended practice is to set page_size to 0
+  when using adjustments for simple scalar values, like in a slider
+  or spin button.

 * gdk-pixbuf will use GIO for mime type detection if possible. For
  this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,14 +19,14 @@ if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
 			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
 			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	case $libtool_version in
-	    1.4*|1.5*|2.2*)
+	    2.2*)
 		have_libtool=true
 		;;
 	esac
 fi
 if $have_libtool ; then : ; else
 	echo
-	echo "You must have libtool 1.4 installed to compile $PROJECT."
+	echo "You must have libtool 2.2 installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
 	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
 	DIE=1
@@ -54,18 +54,14 @@ if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
 else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
    AUTOMAKE=automake-1.10
    ACLOCAL=aclocal-1.10
-else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.7
-    ACLOCAL=aclocal-1.7
 else
 	echo
-	echo "You must have automake 1.7.x, 1,10.x or 1.11.x installed to compile $PROJECT."
+	echo "You must have automake 1,10.x or 1.11.x installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
 	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
 	DIE=1
 fi
 fi
-fi

 if test "$DIE" -eq 1; then
 	exit 1
@@ -76,7 +72,12 @@ test $TEST_TYPE $FILE || {
 	exit 1
 }

-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+# NOCONFIGURE is used by gnome-common; support both
+if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
+    NOCONFIGURE=1
+fi
+
+if test -z "$NOCONFIGURE"; 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."
@@ -120,7 +121,7 @@ $AUTOMAKE --add-missing || exit $?
 autoconf || exit $?
 cd $ORIGDIR || exit $?

-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+if test -z "$NOCONFIGURE"; then
        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?

        echo 
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl

-EXTRA_DIST = \
+EXTRA_DIST += \
 	README.txt \
 	gtk+.sln \
 	gtk+.vsprops \
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -134,7 +134,6 @@
 			<File RelativePath="..\..\..\gdk\win32\gdkgeometry-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkglobals-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkim-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkimage-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkinput-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkinput.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkkeys-win32.c" />
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk+.vsprops
@@ -31,7 +31,7 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 	/>
 	<UserMacro
 		Name="GtkApiVersion"
-		Value="2.0"
+		Value="3.0"
 	/>
 	<UserMacro
 		Name="GtkBinaryVersion"
@@ -108,7 +108,6 @@ copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#
 copy ..\..\..\gdk\gdkfont.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdki18n.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkinput.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
--- a/configure.ac
+++ b/configure.ac
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,8 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS =
-if USE_X11
-SUBDIRS += gdk-pixbuf-xlib
-endif
-
-include $(top_srcdir)/git.mk
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,354 +0,0 @@
-=== ChangeLog discontinued ===
-
-	With the move to git, GTK+ is switching from a ChangeLog file
-	to relying on commit messages to provide change history. Please
-	see README.commits for guidance on the expected message format.
-
-2009-03-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.16.0 ===
-
-2009-03-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.5 ===
-
-2009-02-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.4 ===
-
-2009-02-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.3 ===
-
-2009-01-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.2 ===
-
-2009-01-23  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.1 ===
-
-2009-01-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.15.0 ===
-
-2008-09-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.14.2 ===
-
-2008-09-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.14.1 ===
-
-2008-09-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.14.0 ===
-
-2008-08-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* ==== Released 2.13.7 ===
-
-2008-08-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.6 ===
-
-2008-07-21  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.5 ===
-
-2008-07-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.4 ===
-
-2008-06-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.3 ===
-
-2008-06-03  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.2 ===
-
-2008-05-29  Matthias Clasen <mclasen@redhat.com>
-
-	* === Released 2.13.1 ===
-
-2008-05-26  Michael Natterer  <mitch@imendio.com>
-
-	* gdk-pixbuf-xlib.h
-	* gdk-pixbuf-xlibrgb.h: use G_BEGIN/END_DECLS.
-
-2008-02-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.13.0 ===
-
-2007-10-16  Matthias Clasen <mclasen@redhat.com>
-
-	* === Released 2.12.1 ===
-
-2007-09-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.12.0 ===
-
-2007-07-21  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.6 ===
-
-2007-07-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.5 ===
-
-2007-06-19  Matthias Clasen <mclasen@redhat.com>
-
-	* === Released 2.11.4 ===
-
-2007-06-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.3 ===
-
-2007-06-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.2 ===
-
-2007-06-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.1 ===
-
-2007-05-24   Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.0 ===
-
-2006-10-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf-xlib.c: Apply a cleanup patch by
-	Kjartan	Maraas  (#341812)
-
-2006-08-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.10.2 ===
-
-2006-07-23  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.10.1 ===
-
-2006-07-02  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.10.0 ===
-
-2006-06-21  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.9.4 ===
-
-2006-06-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.3 ===
-
-2006-06-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.2 ===
-
-2006-05-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.1 ====
-
-2006-05-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.0 ===
-
-2005-11-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf-xlib-drawable.c: 
-	* gdk-pixbuf-xlibrgb.c: const correctness fixes
-	found by Arjan van de Ven and gcc.
-
-2005-10-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf-xlib-2.0.pc.in (Requires): Require
-	gmodule-no-export-2.0 instead of gmodule-2.0
-
-2005-08-24  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.8.2 ===
-
-	* === Released 2.8.1 ===
-
-2005-08-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.8.0 ===
-
-2005-08-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.5 ===
-
-2005-07-22  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.4 === 
-
-2005-07-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.3 ===
-	
-2005-07-08  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.7.2 ===
-
-2005-07-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.1 ===
-	
-2005-06-20  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.0 ===
-
-2005-01-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.6.1 ===
-	
-2004-12-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.6.0 ===
-
-2004-12-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.6 ===
-
-2004-11-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.5 ===
-
-2004-10-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.4 ===
-
-2004-09-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.3 ===
-
-2004-08-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.2 ===
-
-2004-08-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.1 ===
-
-Tue Jul 20 23:26:10 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf-xlibrgb.c:  Include config.h first.  (#148034)
-
-Sun Jul 18 20:17:41 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
-
-	* === released 2.5.0 ==
-
-Tue Mar  9 09:33:54 2004  Owen Taylor  <otaylor@redhat.com>
-
-	* === Released 2.3.6 ===
-
-Wed Mar  3 15:50:28 2004  Owen Taylor  <otaylor@redhat.com>
-
-	* Makefile.am (libgdk_pixbuf_xlib_2_0_la_LIBADD): Add 
-	a shared library dependency on libgdk-pixbuf (#124687)
-
-Tue Feb 24 14:45:03 2004  Owen Taylor  <otaylor@redhat.com>
-
-	* === Released 2.3.3 ===
-
-Fri Feb 13 10:32:09 2004  Owen Taylor  <otaylor@redhat.com>
-
-	* gdk-pixbuf-xlibrgb.h: Remove a couple of unneeded
-	#includes. Isn't unsupported code fun?
-	(133833, Gregory Merchan)
-
-Tue Oct  7 23:30:00 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf-xlib.h: Add C++ guards. (123955, Harring Figueiredo)
-
-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
@@ -1,42 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
-lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
-
-INCLUDES = \
-	-I$(top_srcdir) -I$(top_builddir) 	\
-	-I$(top_srcdir)/gdk-pixbuf 		\
-	-I$(top_srcdir)/contrib 		\
-	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)
-
-libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
-	-export-dynamic						\
-	$(no_undefined)						\
-	-version-info $(LT_VERSION_INFO)
-
-libgdk_pixbuf_xlib_2_0_la_LIBADD = \
-        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
-	$(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
-
-include $(top_srcdir)/git.mk
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
@@ -1,11 +0,0 @@
-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-no-export-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
@@ -1,30 +0,0 @@
-/* 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
@@ -1,398 +0,0 @@
-/* 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
@@ -1,63 +0,0 @@
-/* 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
@@ -1,87 +0,0 @@
-/* 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>
-
-G_BEGIN_DECLS
-
-#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);
-
-G_END_DECLS
-
-#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
@@ -1,188 +0,0 @@
-/* -*- 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__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.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);
-
-G_END_DECLS
-
-#endif /* __XLIB_RGB_H__ */
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -12,64 +12,34 @@ INCLUDES = 				\
 	$(GTK_DEP_CFLAGS)

 DEPS = 									\
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib) 				\
 	$(top_builddir)/gtk/$(gtktargetlib)

 LDADDS = 								\
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
 	$(top_builddir)/gtk/$(gtktargetlib)				\
 	$(GTK_DEP_LIBS)							\
 	$(MATH_LIB)

 noinst_PROGRAMS = 		\
-	testpixbuf-drawable 	\
 	testanimation 		\
 	testpixbuf-color	\
 	testpixbuf-save		\
 	testpixbuf-scale 	\
 	pixbuf-demo

-# Need to build test-inline-pixbufs.h for testpixbuf
-if HAVE_PNG
-noinst_PROGRAMS += testpixbuf
-BUILT_SOURCES = test-inline-pixbufs.h
-endif
-
-if CROSS_COMPILING
-pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
-pixbuf_csource_deps=
-else
-pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
-pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders 
-endif
-
-test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
-	$(pixbuf_csource) --raw --build-list		\
-	        apple_red  $(srcdir)/apple-red.png	\
-                gnome_foot $(srcdir)/gnome-foot.png	\
-        > test-inline-pixbufs.h				\
-	|| (rm -f test-inline-pixbufs.h && false)
-
-testpixbuf_DEPENDENCIES = $(DEPS)
-testpixbuf_drawable_DEPENDENCIES = $(DEPS)
 testpixbuf_save_DEPENDENCIES = $(DEPS)
 testpixbuf_color_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_color_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
 testanimation_LDADD = $(LDADDS)
 pixbuf_demo_LDADD = $(LDADDS)

-testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
-testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
 testpixbuf_save_SOURCES = testpixbuf-save.c
 testpixbuf_color_SOURCES = testpixbuf-color.c
 testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
@@ -87,6 +57,4 @@ EXTRA_DIST +=			\
 	gnome-gsame.png		\
 	gnu-keys.png

-DISTCLEANFILES = test-inline-pixbufs.h
-
 -include $(top_srcdir)/git.mk
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl

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

 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
@@ -55,17 +55,16 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)

 DEPS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib) 				\
 	$(top_builddir)/gtk/$(gtktargetlib)

 LDADDS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
 	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)
+	$(GTK_DEP_LIBS)							\
+	-lm

-bin_PROGRAMS = gtk-demo
+bin_PROGRAMS = gtk3-demo

 BUILT_SOURCES = demos.h

@@ -76,15 +75,15 @@ EXTRA_DIST += 		\
 demos.h: @REBUILD@ $(demos) geninclude.pl
 	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h

-gtk_demo_SOURCES = 		\
+gtk3_demo_SOURCES = 		\
 	$(demos)		\
 	demo-common.h		\
 	main.c			\
 	demos.h

-gtk_demo_DEPENDENCIES = $(DEPS)
-gtk_demo_LDADD = $(LDADDS)
-gtk_demo_LDFLAGS = -export-dynamic
+gtk3_demo_DEPENDENCIES = $(DEPS)
+gtk3_demo_LDADD = $(LDADDS)
+gtk3_demo_LDFLAGS = -export-dynamic

 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -99,7 +98,7 @@ IMAGEFILES=	alphatest.png		\
 		gnome-gmush.png		\
 		gnome-gsame.png		\
 		gnu-keys.png		\
-		gtk-logo-rgb.gif		
+		gtk-logo-rgb.gif

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

--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -19,6 +19,16 @@ activate_action (GtkAction *action)

  GtkWidget *dialog;

+  if (g_str_equal (name, "DarkTheme"))
+    {
+      gboolean value = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+      GtkSettings *settings = gtk_settings_get_default ();
+
+      g_object_set (G_OBJECT (settings),
+		    "gtk-application-prefer-dark-theme", value,
+		    NULL);
+      return;
+    }
  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_INFO,
@@ -99,22 +109,6 @@ about_cb (GtkAction *action,
    NULL
  };

-  const gchar *license =
-    "This library is free software; you can redistribute it and/or\n"
-    "modify it under the terms of the GNU Library General Public License as\n"
-    "published by the Free Software Foundation; either version 2 of the\n"
-    "License, or (at your option) any later version.\n"
-    "\n"
-    "This library is distributed in the hope that it will be useful,\n"
-    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
-    "Library General Public License for more details.\n"
-    "\n"
-    "You should have received a copy of the GNU Library General Public\n"
-    "License along with the Gnome Library; see the file COPYING.LIB.  If not,\n"
-    "write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
-    "Boston, MA 02111-1307, USA.\n";
-
  pixbuf = NULL;
  transparent = NULL;
  filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
@@ -130,9 +124,13 @@ about_cb (GtkAction *action,
  gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
  gtk_show_about_dialog (GTK_WINDOW (window),
 			 "program-name", "GTK+ Code Demos",
-			 "version", PACKAGE_VERSION,
+			 "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-2009 The GTK+ Team",
-			 "license", license,
+			 "license-type", GTK_LICENSE_LGPL_2_1,
 			 "website", "http://www.gtk.org",
 			 "comments", "Program to demonstrate GTK+ functions.",
 			 "authors", authors,
@@ -212,6 +210,11 @@ static GtkToggleActionEntry toggle_entries[] = {
    "Bold",                                    /* tooltip */
    G_CALLBACK (activate_action),
    TRUE },                                    /* is_active */
+  { "DarkTheme", NULL,                         /* name, stock id */
+     "_Prefer Dark Theme", NULL,               /* label, accelerator */
+    "Prefer Dark Theme",                       /* tooltip */
+    G_CALLBACK (activate_action),
+    FALSE },                                   /* is_active */
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);

@@ -265,6 +268,7 @@ static const gchar *ui_info =
 "      <menuitem action='Quit'/>"
 "    </menu>"
 "    <menu action='PreferencesMenu'>"
+"      <menuitem action='DarkTheme'/>"
 "      <menu action='ColorMenu'>"
 "	<menuitem action='Red'/>"
 "	<menuitem action='Green'/>"
@@ -443,7 +447,7 @@ do_appwindow (GtkWidget *do_widget)
      gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Application Window");
-      gtk_window_set_icon_name (GTK_WINDOW (window), "gtk-open");
+      gtk_window_set_icon_name (GTK_WINDOW (window), "document-open");

      /* NULL window variable when window is closed */
      g_signal_connect (window, "destroy",
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -9,12 +9,35 @@
 #include "demo-common.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 TRUE;
+    }
+  else
+    {
+      /* Close automatically once changes are fully applied. */
+      gtk_widget_destroy (assistant);
+      return FALSE;
+    }
+}

 static void
 on_assistant_apply (GtkWidget *widget, gpointer data)
 {
-  /* Apply here changes, this is a fictional
-     example, so we just do nothing here */
+  /* Start a timer to simulate changes taking a few seconds to apply. */
+  g_timeout_add (100, apply_changes_gradually, NULL);
 }

 static void
@@ -38,6 +61,13 @@ on_assistant_prepare (GtkWidget *widget, GtkWidget *page, gpointer data)
  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
@@ -127,6 +157,26 @@ create_page3 (GtkWidget *assistant)
  g_object_unref (pixbuf);
 }

+static void
+create_page4 (GtkWidget *assistant)
+{
+  GtkWidget *page;
+
+  page = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
+
+  progress_bar = gtk_progress_bar_new ();
+  gtk_container_add (GTK_CONTAINER (page), progress_bar);
+
+  gtk_widget_show_all (page);
+  gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
+  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_PROGRESS);
+  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Applying changes");
+
+  /* This prevents the assistant window from being
+   * closed while we're "busy" applying changes. */
+  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, FALSE);
+}
+
 GtkWidget*
 do_assistant (GtkWidget *do_widget)
 {
@@ -142,6 +192,7 @@ do_assistant (GtkWidget *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);
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -128,7 +128,7 @@ query_for_toplevel (GdkScreen  *screen,
  gtk_widget_show_all (popup);
  cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);

-  if (gdk_pointer_grab (popup->window, FALSE,
+  if (gdk_pointer_grab (gtk_widget_get_window (popup), FALSE,
 			GDK_BUTTON_RELEASE_MASK,
 			NULL,
 			cursor,
@@ -229,6 +229,7 @@ static void
 open_display_cb (GtkWidget         *button,
 		 ChangeDisplayInfo *info)
 {
+  GtkWidget *content_area;
  GtkWidget *dialog;
  GtkWidget *display_entry;
  GtkWidget *dialog_label;
@@ -248,11 +249,13 @@ open_display_cb (GtkWidget         *button,
  dialog_label =
    gtk_label_new ("Please enter the name of\nthe new display\n");

-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog_label);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), display_entry);
+  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_widget_grab_focus (display_entry);
-  gtk_widget_show_all (GTK_BIN (dialog)->child);
+  gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (dialog)));

  while (!result)
    {
@@ -599,6 +602,7 @@ do_changedisplay (GtkWidget *do_widget)

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

@@ -606,7 +610,7 @@ do_changedisplay (GtkWidget *do_widget)

      info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
 					    GTK_WINDOW (do_widget),
-					    GTK_DIALOG_NO_SEPARATOR,
+					    0,
 					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
 					    "Change",         GTK_RESPONSE_OK,
 					    NULL);
@@ -618,11 +622,11 @@ do_changedisplay (GtkWidget *do_widget)
      g_signal_connect (info->window, "destroy",
 			G_CALLBACK (destroy_cb), &info);

+      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
+
      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);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);

      frame = create_display_frame (info);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -19,17 +19,23 @@ expose_event_callback (GtkWidget      *widget,
                       GdkEventExpose *event, 
                       gpointer        data)
 {
-  if (widget->window)
+  GdkWindow *window;
+
+  window = gtk_widget_get_window (widget);
+  if (window)
    {
      GtkStyle *style;
+      cairo_t *cr;

      style = gtk_widget_get_style (widget);

-      gdk_draw_rectangle (widget->window,
-                          style->bg_gc[GTK_STATE_NORMAL],
-                          TRUE,
-                          event->area.x, event->area.y,
-                          event->area.width, event->area.height);
+      cr = gdk_cairo_create (window);
+
+      gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+      gdk_cairo_rectangle (cr, &event->area);
+      cairo_fill (cr);
+
+      cairo_destroy (cr);
    }

  return TRUE;
@@ -41,13 +47,15 @@ change_color_callback (GtkWidget *button,
 {
  GtkWidget *dialog;
  GtkColorSelection *colorsel;
+  GtkColorSelectionDialog *selection_dialog;
  gint response;
  
  dialog = gtk_color_selection_dialog_new ("Changing color");

  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
-  
-  colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel);
+
+  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
+  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));

  gtk_color_selection_set_previous_color (colorsel, &color);
  gtk_color_selection_set_current_color (colorsel, &color);
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -435,7 +435,7 @@ do_combobox (GtkWidget *do_widget)
    entry = g_object_new (TYPE_MASK_ENTRY, NULL);
    MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
     
-    gtk_container_remove (GTK_CONTAINER (combo), GTK_BIN (combo)->child);
+    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
    gtk_container_add (GTK_CONTAINER (combo), entry);
  
  }
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -33,6 +33,7 @@ static void
 interactive_dialog_clicked (GtkButton *button,
 			    gpointer   user_data)
 {
+  GtkWidget *content_area;
  GtkWidget *dialog;
  GtkWidget *hbox;
  GtkWidget *stock;
@@ -51,9 +52,11 @@ interactive_dialog_clicked (GtkButton *button,
                                        GTK_RESPONSE_CANCEL,
 					NULL);

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

  stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
  gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -17,52 +17,53 @@

 static GtkWidget *window = NULL;
 /* Pixmap for scribble area, to store current scribbles */
-static GdkPixmap *pixmap = NULL;
+static cairo_surface_t *surface = NULL;

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

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

-  /* Initialize the pixmap to white */
-  gdk_draw_rectangle (pixmap,
-                      widget->style->white_gc,
-                      TRUE,
-                      0, 0,
-                      widget->allocation.width,
-                      widget->allocation.height);
+  gtk_widget_get_allocation (widget, &allocation);
+  surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
+                                               CAIRO_CONTENT_COLOR,
+                                               allocation.width,
+                                               allocation.height);
+
+  /* Initialize the surface to white */
+  cr = cairo_create (surface);
+
+  cairo_set_source_rgb (cr, 1, 1, 1);
+  cairo_paint (cr);
+
+  cairo_destroy (cr);

  /* We've handled the configure event, no need for further processing. */
  return TRUE;
 }

-/* Redraw the screen from the pixmap */
+/* Redraw the screen from the surface */
 static gboolean
 scribble_expose_event (GtkWidget      *widget,
                       GdkEventExpose *event,
                       gpointer        data)
 {
-  /* We use the "foreground GC" for the widget since it already exists,
-   * but honestly any GC would work. The only thing to worry about
-   * is whether the GC has an inappropriate clip region set.
-   */
+  cairo_t *cr;

-  gdk_draw_drawable (widget->window,
-                     widget->style->fg_gc[gtk_widget_get_state (widget)],
-                     pixmap,
-                     /* Only copy the area that was exposed. */
-                     event->area.x, event->area.y,
-                     event->area.x, event->area.y,
-                     event->area.width, event->area.height);
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+  
+  cairo_set_source_surface (cr, surface, 0, 0);
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_fill (cr);
+
+  cairo_destroy (cr);

  return FALSE;
 }
@@ -74,21 +75,23 @@ draw_brush (GtkWidget *widget,
            gdouble    y)
 {
  GdkRectangle update_rect;
+  cairo_t *cr;

  update_rect.x = x - 3;
  update_rect.y = y - 3;
  update_rect.width = 6;
  update_rect.height = 6;

-  /* Paint to the pixmap, where we store our state */
-  gdk_draw_rectangle (pixmap,
-                      widget->style->black_gc,
-                      TRUE,
-                      update_rect.x, update_rect.y,
-                      update_rect.width, update_rect.height);
+  /* Paint to the surface, where we store our state */
+  cr = cairo_create (surface);
+
+  gdk_cairo_rectangle (cr, &update_rect);
+  cairo_fill (cr);
+
+  cairo_destroy (cr);

  /* Now invalidate the affected region of the drawing area. */
-  gdk_window_invalidate_rect (widget->window,
+  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
                              &update_rect,
                              FALSE);
 }
@@ -98,7 +101,7 @@ scribble_button_press_event (GtkWidget      *widget,
                             GdkEventButton *event,
                             gpointer        data)
 {
-  if (pixmap == NULL)
+  if (surface == NULL)
    return FALSE; /* paranoia check, in case we haven't gotten a configure event */

  if (event->button == 1)
@@ -116,7 +119,7 @@ scribble_motion_notify_event (GtkWidget      *widget,
  int x, y;
  GdkModifierType state;

-  if (pixmap == NULL)
+  if (surface == NULL)
    return FALSE; /* paranoia check, in case we haven't gotten a configure event */

  /* This call is very important; it requests the next motion event.
@@ -145,9 +148,9 @@ checkerboard_expose (GtkWidget      *da,
                     GdkEventExpose *event,
                     gpointer        data)
 {
+  GtkAllocation allocation;
  gint i, j, xcount, ycount;
-  GdkGC *gc1, *gc2;
-  GdkColor color;
+  cairo_t *cr;

 #define CHECK_SIZE 10
 #define SPACING 2
@@ -159,47 +162,30 @@ checkerboard_expose (GtkWidget      *da,
   * works.
   */

-  /* It would be a bit more efficient to keep these
-   * GC's around instead of recreating on each expose, but
-   * this is the lazy/slow way.
-   */
-  gc1 = gdk_gc_new (da->window);
-  color.red = 30000;
-  color.green = 0;
-  color.blue = 30000;
-  gdk_gc_set_rgb_fg_color (gc1, &color);
-
-  gc2 = gdk_gc_new (da->window);
-  color.red = 65535;
-  color.green = 65535;
-  color.blue = 65535;
-  gdk_gc_set_rgb_fg_color (gc2, &color);
+  cr = gdk_cairo_create (gtk_widget_get_window (da));
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_clip (cr);

+  gtk_widget_get_allocation (da, &allocation);
  xcount = 0;
  i = SPACING;
-  while (i < da->allocation.width)
+  while (i < allocation.width)
    {
      j = SPACING;
      ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < da->allocation.height)
+      while (j < allocation.height)
        {
-          GdkGC *gc;
-
          if (ycount % 2)
-            gc = gc1;
+            cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
          else
-            gc = gc2;
+            cairo_set_source_rgb (cr, 1, 1, 1);

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

          j += CHECK_SIZE + SPACING;
          ++ycount;
@@ -209,8 +195,7 @@ checkerboard_expose (GtkWidget      *da,
      ++xcount;
    }

-  g_object_unref (gc1);
-  g_object_unref (gc2);
+  cairo_destroy (cr);

  /* return TRUE because we've handled this event, so no
   * further processing is required.
@@ -223,9 +208,9 @@ close_window (void)
 {
  window = NULL;

-  if (pixmap)
-    g_object_unref (pixmap);
-  pixmap = NULL;
+  if (surface)
+    g_object_unref (surface);
+  surface = NULL;
 }

 GtkWidget *
@@ -292,7 +277,7 @@ do_drawingarea (GtkWidget *do_widget)

      gtk_container_add (GTK_CONTAINER (frame), da);

-      /* Signals used to handle backing pixmap */
+      /* Signals used to handle backing surface */

      g_signal_connect (da, "expose-event",
                        G_CALLBACK (scribble_expose_event), NULL);
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -11,6 +11,7 @@ static GtkWidget *window = NULL;
 GtkWidget *
 do_entry_buffer (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
  GtkWidget *vbox;
  GtkWidget *label;
  GtkWidget *entry;
@@ -31,8 +32,10 @@ do_entry_buffer (GtkWidget *do_widget)
    g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);

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

    label = gtk_label_new (NULL);
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -37,6 +37,7 @@ create_completion_model (void)
 GtkWidget *
 do_entry_completion (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
  GtkWidget *vbox;
  GtkWidget *label;
  GtkWidget *entry;
@@ -58,8 +59,10 @@ do_entry_completion (GtkWidget *do_widget)
    g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);

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

    label = gtk_label_new (NULL);
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -13,6 +13,7 @@ static GtkWidget *window = NULL;
 GtkWidget *
 do_expander (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
  GtkWidget *vbox;
  GtkWidget *label;
  GtkWidget *expander;
@@ -32,8 +33,10 @@ do_expander (GtkWidget *do_widget)
    g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);

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

    label = gtk_label_new ("Expander demo. Click on the triangle for details.");
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -113,8 +113,8 @@ key_press_event (GtkWidget *text_view,

  switch (event->keyval)
    {
-      case GDK_Return: 
-      case GDK_KP_Enter:
+      case GDK_KEY_Return: 
+      case GDK_KEY_KP_Enter:
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
        gtk_text_buffer_get_iter_at_mark (buffer, &iter, 
                                          gtk_text_buffer_get_insert (buffer));
@@ -225,7 +225,8 @@ motion_notify_event (GtkWidget      *text_view,

  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);

-  gdk_window_get_pointer (text_view->window, NULL, NULL, NULL);
+  gdk_window_get_pointer (gtk_widget_get_window (text_view),
+                          NULL, NULL, NULL);
  return FALSE;
 }

@@ -237,9 +238,10 @@ visibility_notify_event (GtkWidget          *text_view,
                         GdkEventVisibility *event)
 {
  gint wx, wy, bx, by;
-  
-  gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);
-  
+
+  gdk_window_get_pointer (gtk_widget_get_window (text_view),
+                          &wx, &wy, NULL);
+
  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
                                         GTK_TEXT_WINDOW_WIDGET,
                                         wx, wy, &bx, &by);
--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -120,8 +120,8 @@ do_iconview_edit (GtkWidget *do_widget)

      gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
 					GTK_SELECTION_SINGLE);
-      gtk_icon_view_set_orientation (GTK_ICON_VIEW (icon_view),
-				     GTK_ORIENTATION_HORIZONTAL);
+      gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (icon_view),
+				          GTK_ORIENTATION_HORIZONTAL);
      gtk_icon_view_set_columns (GTK_ICON_VIEW (icon_view), 2);
      gtk_icon_view_set_reorderable (GTK_ICON_VIEW (icon_view), TRUE);

--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -317,6 +317,7 @@ do_images (GtkWidget *do_widget)
  GtkWidget *align;
  GtkWidget *button;
  GdkPixbuf *pixbuf;
+  GIcon     *gicon;
  GError *error = NULL;
  char *filename;

@@ -415,6 +416,26 @@ do_images (GtkWidget *do_widget)

      gtk_container_add (GTK_CONTAINER (frame), image);

+      /* Symbolic icon */
+
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+			    "<u>Symbolic themed icon</u>");
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+
+      gicon = g_themed_icon_new_with_default_fallbacks ("battery-critical-charging-symbolic");
+      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
+
+      gtk_container_add (GTK_CONTAINER (frame), image);

      /* Progressive */

--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -29,7 +29,9 @@ enum
  COLUMN_SEVERITY,
  COLUMN_DESCRIPTION,
  COLUMN_PULSE,
+  COLUMN_ICON,
  COLUMN_ACTIVE,
+  COLUMN_SENSITIVE,
  NUM_COLUMNS
 };

@@ -92,11 +94,24 @@ create_model (void)
                              G_TYPE_STRING,
                              G_TYPE_STRING,
                              G_TYPE_UINT,
+                              G_TYPE_STRING,
+                              G_TYPE_BOOLEAN,
                              G_TYPE_BOOLEAN);

  /* add data to the list store */
  for (i = 0; i < G_N_ELEMENTS (data); i++)
    {
+      gchar *icon_name;
+      gboolean sensitive;
+
+      if (i == 1 || i == 3)
+        icon_name = "battery-critical-charging-symbolic";
+      else
+        icon_name = NULL;
+      if (i == 3)
+        sensitive = FALSE;
+      else
+        sensitive = TRUE;
      gtk_list_store_append (store, &iter);
      gtk_list_store_set (store, &iter,
                          COLUMN_FIXED, data[i].fixed,
@@ -104,7 +119,9 @@ create_model (void)
                          COLUMN_SEVERITY, data[i].severity,
                          COLUMN_DESCRIPTION, data[i].description,
                          COLUMN_PULSE, 0,
+                          COLUMN_ICON, icon_name,
                          COLUMN_ACTIVE, FALSE,
+                          COLUMN_SENSITIVE, sensitive,
                          -1);
    }

@@ -199,6 +216,19 @@ add_columns (GtkTreeView *treeview)
                                                     NULL);
  gtk_tree_view_column_set_sort_column_id (column, COLUMN_PULSE);
  gtk_tree_view_append_column (treeview, column);
+
+  /* column for symbolic icon */
+  renderer = gtk_cell_renderer_pixbuf_new ();
+  g_object_set (G_OBJECT (renderer), "follow-state", TRUE, NULL);
+  column = gtk_tree_view_column_new_with_attributes ("Symbolic icon",
+                                                     renderer,
+                                                     "icon-name",
+                                                     COLUMN_ICON,
+                                                     "sensitive",
+                                                     COLUMN_SENSITIVE,
+                                                     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, COLUMN_ICON);
+  gtk_tree_view_append_column (treeview, column);
 }

 static gboolean
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -941,8 +941,8 @@ main (int argc, char **argv)
  if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
                   G_FILE_TEST_EXISTS))
    {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/gtk.immodules", TRUE);
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
    }
  /* -- End of hack -- */
  
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -74,7 +74,7 @@ to_child (GtkRotatedBin *bin,

  s = sin (bin->angle);
  c = cos (bin->angle);
-  child_area = bin->child->allocation;
+  gtk_widget_get_allocation (bin->child, &child_area);

  w = c * child_area.width + s * child_area.height;
  h = s * child_area.width + c * child_area.height;
@@ -114,7 +114,7 @@ to_parent (GtkRotatedBin *bin,

  s = sin (bin->angle);
  c = cos (bin->angle);
-  child_area = bin->child->allocation;
+  gtk_widget_get_allocation (bin->child, &child_area);

  w = c * child_area.width + s * child_area.height;
  h = s * child_area.width + c * child_area.height;
@@ -188,7 +188,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
    {
      to_child (bin, widget_x, widget_y, &x, &y);

-      child_area = bin->child->allocation;
+      gtk_widget_get_allocation (bin->child, &child_area);

      if (x >= 0 && x < child_area.width &&
          y >= 0 && y < child_area.height)
@@ -224,19 +224,23 @@ static void
 gtk_rotated_bin_realize (GtkWidget *widget)
 {
  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
+  GtkAllocation allocation;
+  GtkStyle *style;
+  GdkWindow *window;
  GdkWindowAttr attributes;
  gint attributes_mask;
-  gint border_width;
+  guint border_width;
  GtkRequisition child_requisition;

  gtk_widget_set_realized (widget, TRUE);

-  border_width = GTK_CONTAINER (widget)->border_width;
+  gtk_widget_get_allocation (widget, &allocation);
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));

-  attributes.x = widget->allocation.x + border_width;
-  attributes.y = widget->allocation.y + border_width;
-  attributes.width = widget->allocation.width - 2 * border_width;
-  attributes.height = widget->allocation.height - 2 * border_width;
+  attributes.x = allocation.x + border_width;
+  attributes.y = allocation.y + border_width;
+  attributes.width = allocation.width - 2 * border_width;
+  attributes.height = allocation.height - 2 * border_width;
  attributes.window_type = GDK_WINDOW_CHILD;
  attributes.event_mask = gtk_widget_get_events (widget)
                        | GDK_EXPOSURE_MASK
@@ -253,10 +257,11 @@ gtk_rotated_bin_realize (GtkWidget *widget)

  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;

-  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                                   &attributes, attributes_mask);
-  gdk_window_set_user_data (widget->window, widget);
-  g_signal_connect (widget->window, "pick-embedded-child",
+  window = gdk_window_new (gtk_widget_get_parent_window (widget),
+                           &attributes, attributes_mask);
+  gtk_widget_set_window (widget, window);
+  gdk_window_set_user_data (window, widget);
+  g_signal_connect (window, "pick-embedded-child",
                    G_CALLBACK (pick_offscreen_child), bin);

  attributes.window_type = GDK_WINDOW_OFFSCREEN;
@@ -264,24 +269,27 @@ gtk_rotated_bin_realize (GtkWidget *widget)
  child_requisition.width = child_requisition.height = 0;
  if (bin->child && gtk_widget_get_visible (bin->child))
    {
-      attributes.width = bin->child->allocation.width;
-      attributes.height = bin->child->allocation.height;
+      GtkAllocation child_allocation;
+
+      gtk_widget_get_allocation (bin->child, &child_allocation);
+      attributes.width = child_allocation.width;
+      attributes.height = child_allocation.height;
    }
  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
                                          &attributes, attributes_mask);
  gdk_window_set_user_data (bin->offscreen_window, widget);
  if (bin->child)
    gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, widget->window);
+  gdk_offscreen_window_set_embedder (bin->offscreen_window, window);
  g_signal_connect (bin->offscreen_window, "to-embedder",
                    G_CALLBACK (offscreen_window_to_parent), bin);
  g_signal_connect (bin->offscreen_window, "from-embedder",
                    G_CALLBACK (offscreen_window_from_parent), bin);

-  widget->style = gtk_style_attach (widget->style, widget->window);
-
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-  gtk_style_set_background (widget->style, bin->offscreen_window, GTK_STATE_NORMAL);
+  gtk_widget_style_attach (widget);
+  style = gtk_widget_get_style (widget);
+  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
+  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
  gdk_window_show (bin->offscreen_window);
 }

@@ -378,6 +386,7 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
  GtkRequisition child_requisition;
  double s, c;
  double w, h;
+  guint border_width;

  child_requisition.width = 0;
  child_requisition.height = 0;
@@ -390,8 +399,9 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
  w = c * child_requisition.width + s * child_requisition.height;
  h = s * child_requisition.width + c * child_requisition.height;

-  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + w;
-  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + h;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  requisition->width = border_width * 2 + w;
+  requisition->height = border_width * 2 + h;
 }

 static void
@@ -399,19 +409,19 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
                               GtkAllocation *allocation)
 {
  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  gint border_width;
+  guint border_width;
  gint w, h;
  gdouble s, c;

-  widget->allocation = *allocation;
+  gtk_widget_set_allocation (widget, allocation);

-  border_width = GTK_CONTAINER (widget)->border_width;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));

  w = allocation->width - border_width * 2;
  h = allocation->height - border_width * 2;

  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (widget->window,
+    gdk_window_move_resize (gtk_widget_get_window (widget),
                            allocation->x + border_width,
                            allocation->y + border_width,
                            w, h);
@@ -452,7 +462,8 @@ static gboolean
 gtk_rotated_bin_damage (GtkWidget      *widget,
                        GdkEventExpose *event)
 {
-  gdk_window_invalidate_rect (widget->window, NULL, FALSE);
+  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
+                              NULL, FALSE);

  return TRUE;
 }
@@ -462,13 +473,15 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
                        GdkEventExpose *event)
 {
  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
+  GdkWindow *window;
  gint width, height;
  gdouble s, c;
  gdouble w, h;

  if (gtk_widget_is_drawable (widget))
    {
-      if (event->window == widget->window)
+      window = gtk_widget_get_window (widget);
+      if (event->window == window)
        {
          GdkPixmap *pixmap;
          GtkAllocation child_area;
@@ -477,9 +490,9 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
          if (bin->child && gtk_widget_get_visible (bin->child))
            {
              pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              child_area = bin->child->allocation;
+              gtk_widget_get_allocation (bin->child, &child_area);

-              cr = gdk_cairo_create (widget->window);
+              cr = gdk_cairo_create (window);

              /* transform */
              s = sin (bin->angle);
@@ -505,7 +518,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
        }
      else if (event->window == bin->offscreen_window)
        {
-          gtk_paint_flat_box (widget->style, event->window,
+          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
                              GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                              &event->area, widget, "blah",
                              0, 0, -1, -1);
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -126,7 +126,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
    {
      to_child (bin, widget_x, widget_y, &x, &y);

-      child_area = bin->child->allocation;
+      gtk_widget_get_allocation (bin->child, &child_area);

      if (x >= 0 && x < child_area.width &&
          y >= 0 && y < child_area.height)
@@ -162,19 +162,23 @@ static void
 gtk_mirror_bin_realize (GtkWidget *widget)
 {
  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
+  GtkAllocation allocation;
+  GtkStyle *style;
+  GdkWindow *window;
  GdkWindowAttr attributes;
  gint attributes_mask;
-  gint border_width;
+  guint border_width;
  GtkRequisition child_requisition;

  gtk_widget_set_realized (widget, TRUE);

-  border_width = GTK_CONTAINER (widget)->border_width;
+  gtk_widget_get_allocation (widget, &allocation);
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));

-  attributes.x = widget->allocation.x + border_width;
-  attributes.y = widget->allocation.y + border_width;
-  attributes.width = widget->allocation.width - 2 * border_width;
-  attributes.height = widget->allocation.height - 2 * border_width;
+  attributes.x = allocation.x + border_width;
+  attributes.y = allocation.y + border_width;
+  attributes.width = allocation.width - 2 * border_width;
+  attributes.height = allocation.height - 2 * border_width;
  attributes.window_type = GDK_WINDOW_CHILD;
  attributes.event_mask = gtk_widget_get_events (widget)
                        | GDK_EXPOSURE_MASK
@@ -191,10 +195,11 @@ gtk_mirror_bin_realize (GtkWidget *widget)

  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;

-  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                                   &attributes, attributes_mask);
-  gdk_window_set_user_data (widget->window, widget);
-  g_signal_connect (widget->window, "pick-embedded-child",
+  window = gdk_window_new (gtk_widget_get_parent_window (widget),
+                           &attributes, attributes_mask);
+  gtk_widget_set_window (widget, window);
+  gdk_window_set_user_data (window, widget);
+  g_signal_connect (window, "pick-embedded-child",
                    G_CALLBACK (pick_offscreen_child), bin);

  attributes.window_type = GDK_WINDOW_OFFSCREEN;
@@ -202,24 +207,27 @@ gtk_mirror_bin_realize (GtkWidget *widget)
  child_requisition.width = child_requisition.height = 0;
  if (bin->child && gtk_widget_get_visible (bin->child))
    {
-      attributes.width = bin->child->allocation.width;
-      attributes.height = bin->child->allocation.height;
+      GtkAllocation child_allocation;
+
+      gtk_widget_get_allocation (bin->child, &child_allocation);
+      attributes.width = child_allocation.width;
+      attributes.height = child_allocation.height;
    }
  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
                                          &attributes, attributes_mask);
  gdk_window_set_user_data (bin->offscreen_window, widget);
  if (bin->child)
    gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, widget->window);
+  gdk_offscreen_window_set_embedder (bin->offscreen_window, window);
  g_signal_connect (bin->offscreen_window, "to-embedder",
                    G_CALLBACK (offscreen_window_to_parent), bin);
  g_signal_connect (bin->offscreen_window, "from-embedder",
                    G_CALLBACK (offscreen_window_from_parent), bin);

-  widget->style = gtk_style_attach (widget->style, widget->window);
-
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-  gtk_style_set_background (widget->style, bin->offscreen_window, GTK_STATE_NORMAL);
+  gtk_widget_style_attach (widget);
+  style = gtk_widget_get_style (widget);
+  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
+  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
  gdk_window_show (bin->offscreen_window);
 }

@@ -302,6 +310,7 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
 {
  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
  GtkRequisition child_requisition;
+  guint border_width;

  child_requisition.width = 0;
  child_requisition.height = 0;
@@ -309,8 +318,9 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
  if (bin->child && gtk_widget_get_visible (bin->child))
    gtk_widget_size_request (bin->child, &child_requisition);

-  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.width + 10;
-  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.height * 2 + 10;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  requisition->width = border_width * 2 + child_requisition.width + 10;
+  requisition->height = border_width * 2 + child_requisition.height * 2 + 10;
 }

 static void
@@ -318,17 +328,18 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
                               GtkAllocation *allocation)
 {
  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  gint border_width;
  gint w, h;
-  widget->allocation = *allocation;
+  guint border_width;

-  border_width = GTK_CONTAINER (widget)->border_width;
+  gtk_widget_set_allocation (widget, allocation);
+
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));

  w = allocation->width - border_width * 2;
  h = allocation->height - border_width * 2;

  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (widget->window,
+    gdk_window_move_resize (gtk_widget_get_window (widget),
                            allocation->x + border_width,
                            allocation->y + border_width,
                            w, h);
@@ -357,7 +368,8 @@ static gboolean
 gtk_mirror_bin_damage (GtkWidget      *widget,
                        GdkEventExpose *event)
 {
-  gdk_window_invalidate_rect (widget->window, NULL, FALSE);
+  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
+                              NULL, FALSE);

  return TRUE;
 }
@@ -367,11 +379,13 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
                        GdkEventExpose *event)
 {
  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
+  GdkWindow *window;
  gint width, height;

  if (gtk_widget_is_drawable (widget))
    {
-      if (event->window == widget->window)
+      window = gtk_widget_get_window (widget);
+      if (event->window == window)
        {
          GdkPixmap *pixmap;
          cairo_t *cr;
@@ -383,7 +397,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
              pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
              gdk_drawable_get_size (pixmap, &width, &height);

-              cr = gdk_cairo_create (widget->window);
+              cr = gdk_cairo_create (window);

              cairo_save (cr);

@@ -423,7 +437,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
        }
      else if (event->window == bin->offscreen_window)
        {
-          gtk_paint_flat_box (widget->style, event->window,
+          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
                              GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                              &event->area, widget, "blah",
                              0, 0, -1, -1);
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -17,15 +17,23 @@ void
 toggle_resize (GtkWidget *widget,
 	       GtkWidget *child)
 {
-  GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
+  GtkWidget *parent;
+  GtkPaned *paned;
+  gboolean is_child1;
  gboolean resize, shrink;

-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
+  parent = gtk_widget_get_parent (child);
+  paned = GTK_PANED (parent);
+
+  is_child1 = (child == gtk_paned_get_child1 (paned));
+
+  gtk_container_child_get (GTK_CONTAINER (paned), child,
+                           "resize", &resize,
+                           "shrink", &shrink,
+                           NULL);

  g_object_ref (child);
-  gtk_container_remove (GTK_CONTAINER (child->parent), child);
+  gtk_container_remove (GTK_CONTAINER (parent), child);
  if (is_child1)
    gtk_paned_pack1 (paned, child, !resize, shrink);
  else
@@ -37,15 +45,23 @@ void
 toggle_shrink (GtkWidget *widget,
 	       GtkWidget *child)
 {
-  GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
+  GtkWidget *parent;
+  GtkPaned *paned;
+  gboolean is_child1;
  gboolean resize, shrink;

-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
+  parent = gtk_widget_get_parent (child);
+  paned = GTK_PANED (parent);
+
+  is_child1 = (child == gtk_paned_get_child1 (paned));
+
+  gtk_container_child_get (GTK_CONTAINER (paned), child,
+                           "resize", &resize,
+                           "shrink", &shrink,
+                           NULL);

  g_object_ref (child);
-  gtk_container_remove (GTK_CONTAINER (child->parent), child);
+  gtk_container_remove (GTK_CONTAINER (parent), child);
  if (is_child1)
    gtk_paned_pack1 (paned, child, resize, !shrink);
  else
@@ -59,11 +75,15 @@ create_pane_options (GtkPaned	 *paned,
 		     const gchar *label1,
 		     const gchar *label2)
 {
+  GtkWidget *child1, *child2;
  GtkWidget *frame;
  GtkWidget *table;
  GtkWidget *label;
  GtkWidget *check_button;
-  
+
+  child1 = gtk_paned_get_child1 (paned);
+  child2 = gtk_paned_get_child2 (paned);
+
  frame = gtk_frame_new (frame_label);
  gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
  
@@ -78,16 +98,16 @@ create_pane_options (GtkPaned	 *paned,
  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     0, 1, 1, 2);
  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child1);
-  
+		    G_CALLBACK (toggle_resize), child1);
+
  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     0, 1, 2, 3);
  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child1);
-  
+		    G_CALLBACK (toggle_shrink), child1);
+
  label = gtk_label_new (label2);
  gtk_table_attach_defaults (GTK_TABLE (table), label,
 			     1, 2, 0, 1);
@@ -98,15 +118,15 @@ create_pane_options (GtkPaned	 *paned,
  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child2);
-  
+		    G_CALLBACK (toggle_resize), child2);
+
  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     1, 2, 2, 3);
  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child2);
+		    G_CALLBACK (toggle_shrink), child2);

  return frame;
 }
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -100,20 +100,15 @@ expose_cb (GtkWidget      *widget,
           GdkEventExpose *event,
           gpointer        data)
 {
-  guchar *pixels;
-  int rowstride;
+  cairo_t *cr;

-  rowstride = gdk_pixbuf_get_rowstride (frame);
+  cr = gdk_cairo_create (event->window);

-  pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
+  gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_fill (cr);

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

  return TRUE;
 }
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -99,6 +99,8 @@ rotated_text_expose_event (GtkWidget      *widget,
 #define N_WORDS 5
 #define FONT "Serif 18"

+  GtkAllocation allocation;
+
  PangoContext *context;
  PangoLayout *layout;
  PangoFontDescription *desc;
@@ -108,16 +110,20 @@ rotated_text_expose_event (GtkWidget      *widget,

  PangoAttrList *attrs;

-  int width = widget->allocation.width;
-  int height = widget->allocation.height;
+  int width;
+  int height;
  double device_radius;
  int i;

+  gtk_widget_get_allocation (widget, &allocation);
+  width = allocation.width;
+  height = allocation.height;
+
  /* Create a cairo context and set up a transformation matrix so that the user
   * space coordinates for the centered square where we draw are [-RADIUS, RADIUS],
   * [-RADIUS, RADIUS].
   * We first center, then change the scale. */
-  cr = gdk_cairo_create (widget->window);
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
  device_radius = MIN (width, height) / 2.;
  cairo_translate (cr,
 		   device_radius + (width - 2 * device_radius) / 2,
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -241,6 +241,7 @@ entry_populate_popup (GtkEntry *entry,
 GtkWidget *
 do_search_entry (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
  GtkWidget *vbox;
  GtkWidget *hbox;
  GtkWidget *label;
@@ -263,8 +264,10 @@ do_search_entry (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
                        G_CALLBACK (search_entry_destroyed), &window);

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

      label = gtk_label_new (NULL);
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -82,6 +82,7 @@ toggle_grouping (GtkToggleButton *check_button,
 GtkWidget *
 do_sizegroup (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
  GtkWidget *table;
  GtkWidget *frame;
  GtkWidget *vbox;
@@ -115,8 +116,10 @@ do_sizegroup (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);

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

      size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -27,6 +27,7 @@ on_stop_clicked (GtkButton *button, gpointer user_data)
 GtkWidget *
 do_spinner (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
  GtkWidget *vbox;
  GtkWidget *hbox;
  GtkWidget *button;
@@ -47,8 +48,10 @@ do_spinner (GtkWidget *do_widget)
    g_signal_connect (window, "destroy",
                      G_CALLBACK (gtk_widget_destroyed), &window);

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

    /* Sensitive */
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -58,18 +58,10 @@ stock_item_info_copy (StockItemInfo *src)
  return info;
 }

-static GType
-stock_item_info_get_type (void)
-{
-  static GType our_type = 0;
-  
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static ("StockItemInfo",
-                                             (GBoxedCopyFunc) stock_item_info_copy,
-                                             (GBoxedFreeFunc) stock_item_info_free);
-
-  return our_type;
-}
+static
+G_DEFINE_BOXED_TYPE (StockItemInfo, stock_item_info,
+                     stock_item_info_copy,
+                     stock_item_info_free)

 typedef struct _StockItemDisplay StockItemDisplay;
 struct _StockItemDisplay
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -14,17 +14,9 @@

 static void easter_egg_callback (GtkWidget *button, gpointer data);

-#define gray50_width 2
-#define gray50_height 2
-static char gray50_bits[] = {
-  0x02, 0x01
-};
-
 static void
 create_tags (GtkTextBuffer *buffer)
 {
-  GdkBitmap *stipple;
-
  /* Create a bunch of tags. Note that it's also possible to
   * create tags with gtk_text_tag_new() then add them to the
   * tag table for the buffer, gtk_text_buffer_create_tag() is
@@ -74,18 +66,6 @@ create_tags (GtkTextBuffer *buffer)
  gtk_text_buffer_create_tag (buffer, "red_background",
 			      "background", "red", NULL);

-  stipple = gdk_bitmap_create_from_data (NULL,
-					 gray50_bits, gray50_width,
-					 gray50_height);
-  
-  gtk_text_buffer_create_tag (buffer, "background_stipple",
-			      "background_stipple", stipple, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "foreground_stipple",
-			      "foreground_stipple", stipple, NULL);
-
-  g_object_unref (stipple);
-
  gtk_text_buffer_create_tag (buffer, "big_gap_before_line",
 			      "pixels_above_lines", 30, NULL);

@@ -227,17 +207,9 @@ insert_text (GtkTextBuffer *buffer)
 					    "red_background", NULL);
  gtk_text_buffer_insert (buffer, &iter, " or even ", -1);  
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a stippled red background", -1,
-					    "red_background",
-					    "background_stipple",
-					    NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, " or ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a stippled blue foreground on solid red background", -1,
+					    "a blue foreground on red background", -1,
 					    "blue_foreground",
 					    "red_background",
-					    "foreground_stipple",
 					    NULL);
  gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n\n", -1);  

--- a/demos/gtk-demo/toolpalette.c
+++ b/demos/gtk-demo/toolpalette.c
@@ -84,15 +84,18 @@ static gboolean
 canvas_expose_event (GtkWidget      *widget,
                     GdkEventExpose *event)
 {
+  GtkAllocation allocation;
  cairo_t *cr;
  GList *iter;

-  cr = gdk_cairo_create (widget->window);
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
  gdk_cairo_region (cr, event->region);
  cairo_clip (cr);

+  gtk_widget_get_allocation (widget, &allocation);
+
  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_rectangle (cr, 0, 0, widget->allocation.width, widget->allocation.height);
+  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
  cairo_fill (cr);

  for (iter = canvas_items; iter; iter = iter->next)
@@ -173,6 +176,7 @@ palette_drag_data_received (GtkWidget        *widget,
                            guint             time,
                            gpointer          data)
 {
+  GtkAllocation     allocation;
  GtkToolItemGroup *drop_group = NULL;
  GtkWidget        *drag_palette = gtk_drag_get_source_widget (context);
  GtkWidget        *drag_item = NULL;
@@ -193,10 +197,13 @@ palette_drag_data_received (GtkWidget        *widget,
                        GTK_TOOL_ITEM_GROUP (drag_item),
                        drop_group);
  else if (GTK_IS_TOOL_ITEM (drag_item) && drop_group)
-    palette_drop_item (GTK_TOOL_ITEM (drag_item),
-                       drop_group,
-                       x - GTK_WIDGET (drop_group)->allocation.x,
-                       y - GTK_WIDGET (drop_group)->allocation.y);
+    {
+      gtk_widget_get_allocation (GTK_WIDGET (drop_group), &allocation);
+      palette_drop_item (GTK_TOOL_ITEM (drag_item),
+                         drop_group,
+                         x - allocation.x,
+                         y - allocation.y);
+    }
 }

 /********************************/
@@ -372,11 +379,13 @@ on_combo_orientation_changed (GtkComboBox *combo_box,
                              gpointer     user_data)
 {
  GtkToolPalette *palette = GTK_TOOL_PALETTE (user_data);
-  GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW (GTK_WIDGET (palette)->parent);
+  GtkScrolledWindow *sw;
  GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
  GtkTreeIter iter;
  gint val = 0;

+  sw = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (GTK_WIDGET (palette)));
+
  if (!gtk_combo_box_get_active_iter (combo_box, &iter))
    return;

--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -89,20 +89,14 @@ load_pixbufs (void)
 static gint
 expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-	guchar *pixels;
-	int rowstride;
+        cairo_t *cr;
+         
+        cr = gdk_cairo_create (event->window);
+        gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
+        gdk_cairo_rectangle (cr, &event->area);
+        cairo_fill (cr);

-	rowstride = gdk_pixbuf_get_rowstride (frame);
-
-	pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
-		  
-	gdk_draw_rgb_image_dithalign (widget->window,
-				      widget->style->black_gc,
-				      event->area.x, event->area.y,
-				      event->area.width, event->area.height,
-				      GDK_RGB_DITHER_NORMAL,
-				      pixels, rowstride,
-				      event->area.x, event->area.y);
+        cairo_destroy (cr);

 	return TRUE;
 }
--- a/demos/pixbuf-init.c
+++ b/demos/pixbuf-init.c
@@ -16,5 +16,5 @@ void
 pixbuf_init (void)
 {
  if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
-    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
+    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
 }
--- a/demos/testgtk/main.c
+++ b/demos/testgtk/main.c
@@ -369,16 +369,16 @@ main (int argc, char **argv)
 			    gtk_label_new ("Source"));

  tag = gtk_text_buffer_create_tag (info_buffer, "title");
-  gtk_object_set (GTK_OBJECT (tag),
-		 "font", "Sans 18",
-		 NULL);
+  g_object_set (tag,
+                "font", "Sans 18",
+                NULL);

  tag = gtk_text_buffer_create_tag (info_buffer, "source");
-  gtk_object_set (GTK_OBJECT (tag),
-		  "font", "Courier 10",
-		  "pixels_above_lines", 0,
-		  "pixels_below_lines", 0,
-		 NULL);
+  g_object_set (tag,
+                "font", "Courier 10",
+                "pixels_above_lines", 0,
+                "pixels_below_lines", 0,
+                NULL);

  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
  gtk_widget_show_all (window);
--- a/demos/testpixbuf-color.c
+++ b/demos/testpixbuf-color.c
@@ -111,8 +111,6 @@ main (int argc, char **argv)

 	gtk_init (&argc, &argv);

-	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
 	root = gdk_get_default_root_window ();
 	pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
 					       0, 0, 0, 0, 150, 160);
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,115 +0,0 @@
-#include "config.h"
-#include <gtk/gtk.h>
-
-int
-close_app (GtkWidget *widget, gpointer data)
-{
-   gtk_main_quit ();
-   return TRUE;
-}
-
-int
-expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
-{
-   GdkPixbuf *pixbuf;
-         
-   pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-   if (gdk_pixbuf_get_has_alpha (pixbuf))
-   {
-      gdk_draw_rgb_32_image (drawing_area->window,
-			     drawing_area->style->black_gc,
-			     evt->area.x, evt->area.y,
-			     evt->area.width,
-			     evt->area.height,
-			     GDK_RGB_DITHER_MAX,
-			     gdk_pixbuf_get_pixels (pixbuf) +
-			     (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-			     (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-			     gdk_pixbuf_get_rowstride (pixbuf));
-   }
-   else
-   {
-      gdk_draw_rgb_image (drawing_area->window, 
-			  drawing_area->style->black_gc, 
-			  evt->area.x, evt->area.y,
-			  evt->area.width,
-			  evt->area.height,  
-			  GDK_RGB_DITHER_NORMAL,
-			  gdk_pixbuf_get_pixels (pixbuf) +
-			  (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-			  (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-			  gdk_pixbuf_get_rowstride (pixbuf));
-   }
-   return FALSE;
-}
-
-int
-configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
-{
-   GdkPixbuf *pixbuf;
-                           
-   pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-    
-   g_print ("X:%d Y:%d\n", evt->width, evt->height);
-   if (evt->width != gdk_pixbuf_get_width (pixbuf) || evt->height != gdk_pixbuf_get_height (pixbuf))
-   {
-      GdkWindow *root;
-      GdkPixbuf *new_pixbuf;
-
-      root = gdk_get_default_root_window ();
-      new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-						 0, 0, 0, 0, evt->width, evt->height);
-      g_object_set_data (G_OBJECT (drawing_area), "pixbuf", new_pixbuf);
-      g_object_unref (pixbuf);
-   }
-
-   return FALSE;
-}
-
-extern void pixbuf_init (void);
-
-int
-main (int argc, char **argv)
-{   
-   GdkWindow     *root;
-   GtkWidget     *window;
-   GtkWidget     *vbox;
-   GtkWidget     *drawing_area;
-   GdkPixbuf     *pixbuf;    
-   
-   pixbuf_init ();
-
-   gtk_init (&argc, &argv);   
-   gdk_rgb_set_verbose (TRUE);
-
-   gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
-   root = gdk_get_default_root_window ();
-   pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-					  0, 0, 0, 0, 150, 160);
-   
-   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   g_signal_connect (window, "delete_event",
-		     G_CALLBACK (close_app), NULL);
-   g_signal_connect (window, "destroy",   
-		     G_CALLBACK (close_app), NULL);
-   
-   vbox = gtk_vbox_new (FALSE, 0);
-   gtk_container_add (GTK_CONTAINER (window), vbox);  
-   
-   drawing_area = gtk_drawing_area_new ();
-   gtk_widget_set_size_request (GTK_WIDGET (drawing_area),
-                                gdk_pixbuf_get_width (pixbuf),
-                                gdk_pixbuf_get_height (pixbuf));
-   g_signal_connect (drawing_area, "expose_event",
-		     G_CALLBACK (expose_cb), NULL);
-
-   g_signal_connect (drawing_area, "configure_event",
-		     G_CALLBACK (configure_cb), NULL);
-   g_object_set_data (G_OBJECT (drawing_area), "pixbuf", pixbuf);
-   gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
-   
-   gtk_widget_show_all (window);
-   gtk_main ();
-   return 0;
-}
--- a/demos/testpixbuf-save.c
+++ b/demos/testpixbuf-save.c
@@ -311,32 +311,18 @@ static int
 expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
 {
        GdkPixbuf *pixbuf;
+        cairo_t *cr;
         
        pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area),
 						  "pixbuf");
-        if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-                gdk_draw_rgb_32_image (drawing_area->window,
-                                       drawing_area->style->black_gc,
-                                       evt->area.x, evt->area.y,
-                                       evt->area.width,
-                                       evt->area.height,
-                                       GDK_RGB_DITHER_MAX,
-                                       gdk_pixbuf_get_pixels (pixbuf) +
-                                       (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                                       (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                                       gdk_pixbuf_get_rowstride (pixbuf));
-        } else {
-                gdk_draw_rgb_image (drawing_area->window, 
-                                    drawing_area->style->black_gc, 
-                                    evt->area.x, evt->area.y,
-                                    evt->area.width,
-                                    evt->area.height,  
-                                    GDK_RGB_DITHER_NORMAL,
-                                    gdk_pixbuf_get_pixels (pixbuf) +
-                                    (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                                    (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                                    gdk_pixbuf_get_rowstride (pixbuf));
-        }
+
+        cr = gdk_cairo_create (evt->window);
+        gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+        gdk_cairo_rectangle (cr, &evt->area);
+        cairo_fill (cr);
+
+        cairo_destroy (cr);
+
        return FALSE;
 }

@@ -374,8 +360,6 @@ main (int argc, char **argv)
   
        gtk_init (&argc, &argv);   

-        gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
        root = gdk_get_default_root_window ();
        pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
                                               0, 0, 0, 0, 150, 160);
--- a/demos/testpixbuf-scale.c
+++ b/demos/testpixbuf-scale.c
@@ -34,25 +34,31 @@ overall_changed_cb (GtkAdjustment *adjustment, gpointer data)
 gboolean
 expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
+  GtkAllocation allocation;
  GdkPixbuf *dest;
+  cairo_t *cr;
+
+  gdk_window_set_back_pixmap (gtk_widget_get_window (widget),
+                              NULL, FALSE);

-  gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
-  
  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);

+  gtk_widget_get_allocation (widget, &allocation);
  gdk_pixbuf_composite_color (pixbuf, dest,
 			      0, 0, event->area.width, event->area.height,
 			      -event->area.x, -event->area.y,
-			      (double) widget->allocation.width / gdk_pixbuf_get_width (pixbuf),
-			      (double) widget->allocation.height / gdk_pixbuf_get_height (pixbuf),
+                              (double) allocation.width / gdk_pixbuf_get_width (pixbuf),
+                              (double) allocation.height / gdk_pixbuf_get_height (pixbuf),
 			      interp_type, overall_alpha,
 			      event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);

-  gdk_draw_pixbuf (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL], dest,
-		   0, 0, event->area.x, event->area.y,
-		   event->area.width, event->area.height,
-		   GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
-  
+  cr = gdk_cairo_create (event->window);
+
+  gdk_cairo_set_source_pixbuf (cr, dest, 0, 0);
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_fill (cr);
+
+  cairo_destroy (cr);
  g_object_unref (dest);
  
  return TRUE;
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -1,640 +0,0 @@
-/* testpixbuf -- test program for gdk-pixbuf code
- * Copyright (C) 1999 Mark Crichton, Larry Ewing
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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 <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "test-inline-pixbufs.h"
-
-typedef struct {
-	FILE             *imagefile;
-	GdkPixbufLoader  *loader;
-	GtkWidget        **rgbwin;
-	guchar           *buf;
-	guint            timeout;
-	guint            readlen;
-} ProgressFileStatus;
-
-
-#define DEFAULT_WIDTH  24
-#define DEFAULT_HEIGHT 24
-
-static const unsigned char default_image[] = {
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xae, 0xb3, 0xb3, 0xc6, 0xc9, 0xcd, 0xd7, 0xd4, 0xdf,
-	0xec, 0xde, 0xf3, 0xe7, 0xcb, 0xe9, 0xd9, 0xb5, 0xd3, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xb1, 0xb7, 0xa5,
-	0xb0, 0xb8, 0xad, 0xb3, 0xb9, 0xb6, 0xc1, 0xc6, 0xc8, 0xd5, 0xd3, 0xdc,
-	0xec, 0xde, 0xf3, 0xe5, 0xca, 0xe6, 0xe0, 0xbb, 0xd7, 0xe1, 0xad, 0xc2,
-	0xe3, 0xac, 0xa3, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xca, 0xc1, 0xa4, 0xc5, 0xc7, 0xac,
-	0xb7, 0xbe, 0xaf, 0xad, 0xb4, 0xaf, 0xbd, 0xc2, 0xc3, 0xd1, 0xd0, 0xd8,
-	0xec, 0xde, 0xf3, 0xe5, 0xc7, 0xe4, 0xe0, 0xb6, 0xd1, 0xe7, 0xa9, 0xb4,
-	0xed, 0xcd, 0xb6, 0xd6, 0xcf, 0xae, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0x00, 0x00, 0x00, 0xdf, 0xa7, 0x9f, 0xdd, 0xbf, 0xaa, 0xcf, 0xc5, 0xa9,
-	0xc1, 0xc4, 0xac, 0xb2, 0xba, 0xaf, 0xb6, 0xbb, 0xbb, 0xcd, 0xce, 0xd4,
-	0xec, 0xde, 0xf3, 0xe4, 0xc4, 0xe1, 0xe0, 0xaf, 0xc7, 0xea, 0xbc, 0xae,
-	0xe1, 0xd6, 0xb6, 0xc7, 0xcc, 0xae, 0xa2, 0xab, 0x9a, 0x00, 0x00, 0x00,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0x00, 0x00, 0x00, 0xe3, 0xab, 0xc0, 0xe6, 0xa3, 0xa7, 0xdf, 0xba, 0xa8,
-	0xcf, 0xc5, 0xa9, 0xbd, 0xc2, 0xae, 0xad, 0xb4, 0xaf, 0xc6, 0xc9, 0xcd,
-	0xec, 0xde, 0xf3, 0xe2, 0xbf, 0xdc, 0xe7, 0xa9, 0xb4, 0xe7, 0xd6, 0xb8,
-	0xc7, 0xcc, 0xae, 0xac, 0xb6, 0xa6, 0x9d, 0xa8, 0x9f, 0x00, 0x00, 0x00,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xd9, 0xaf, 0xcf, 0xe1, 0xb4, 0xd2, 0xe2, 0xb0, 0xcb, 0xe4, 0xa9, 0xbb,
-	0xe2, 0xb2, 0xa6, 0xcf, 0xc5, 0xa9, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
-	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xed, 0xcd, 0xb6, 0xc7, 0xcc, 0xae,
-	0xa6, 0xb1, 0xa3, 0x98, 0xa2, 0x9c, 0x8f, 0x97, 0x96, 0x7e, 0x84, 0x85,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xe8, 0xc6, 0xe7, 0xe5, 0xc2, 0xe3, 0xe3, 0xbd, 0xdd, 0xe1, 0xb6, 0xd5,
-	0xe2, 0xb0, 0xcb, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0x9d, 0xa8, 0x9f,
-	0x8f, 0x97, 0x96, 0x8b, 0x90, 0x92, 0x97, 0x9e, 0xa2, 0xa0, 0xa7, 0xae,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xe7, 0xd3, 0xed, 0xe8, 0xd1, 0xed, 0xe8, 0xce, 0xec, 0xe9, 0xcc, 0xeb,
-	0xe8, 0xc6, 0xe7, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0x97, 0x9e, 0xa2,
-	0xa7, 0xae, 0xb7, 0xb2, 0xb6, 0xc5, 0xba, 0xbc, 0xce, 0xbf, 0xbe, 0xd3,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0,
-	0xe9, 0xdf, 0xf0, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0xe1, 0xd2, 0xf7,
-	0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xca, 0xc7, 0xd2, 0xc5, 0xc4, 0xcd, 0xbf, 0xbf, 0xc7, 0xb8, 0xb9, 0xc0,
-	0xae, 0xaf, 0xb6, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0xd5, 0xa8, 0xe1,
-	0xd8, 0xb2, 0xe9, 0xd9, 0xb8, 0xed, 0xdb, 0xbd, 0xf0, 0xdc, 0xbf, 0xf1,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xa4, 0xa6, 0xac, 0xa8, 0xaa, 0xaf, 0xa0, 0xa6, 0xa8, 0x98, 0x9e, 0x9c,
-	0xa1, 0xa8, 0x9e, 0xb1, 0xb6, 0xa1, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
-	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xc0, 0x8c, 0xad, 0xcc, 0x90, 0xb5,
-	0xd3, 0x94, 0xca, 0xd6, 0xa2, 0xdb, 0xd5, 0xa8, 0xe1, 0xcf, 0xa7, 0xdf,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0x00, 0x00, 0x00, 0x98, 0x9f, 0x9b, 0xa1, 0xa8, 0x9e, 0xac, 0xb3, 0xa0,
-	0xb9, 0xb9, 0xa4, 0xd0, 0xb8, 0xa8, 0xc5, 0xb5, 0xb8, 0xb6, 0xbb, 0xad,
-	0xe3, 0xd7, 0xb5, 0xdd, 0xb4, 0xa9, 0xcb, 0x89, 0xac, 0xc0, 0x8c, 0xad,
-	0xc8, 0x91, 0xb5, 0xd1, 0x8d, 0xb7, 0xd3, 0x94, 0xca, 0x00, 0x00, 0x00,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0x00, 0x00, 0x00, 0xa1, 0xa7, 0x98, 0xb1, 0xb6, 0xa1, 0xbd, 0xb9, 0xa5,
-	0xd0, 0xb8, 0xa8, 0xca, 0xb5, 0xb7, 0xb8, 0xb1, 0xb1, 0xc2, 0xc8, 0xb2,
-	0xe3, 0xd7, 0xb5, 0xe1, 0xbf, 0xaf, 0xdb, 0x92, 0x9a, 0xbe, 0x82, 0xa6,
-	0xc0, 0x8c, 0xad, 0xc8, 0x91, 0xb4, 0xc7, 0x8b, 0xb0, 0x00, 0x00, 0x00,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xbc, 0xb6, 0xa1, 0xd0, 0xb8, 0xa8,
-	0xcd, 0xb6, 0xb7, 0xc0, 0xb4, 0xb5, 0xb1, 0xb1, 0xaa, 0xca, 0xd1, 0xb4,
-	0xe3, 0xd7, 0xb5, 0xe2, 0xc1, 0xb0, 0xdb, 0xa8, 0xa3, 0xd2, 0x8a, 0xa9,
-	0xb7, 0x7e, 0xa2, 0xbd, 0x89, 0xa9, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xc9, 0xaf, 0xaf,
-	0xc5, 0xb5, 0xb8, 0xb8, 0xb1, 0xb1, 0xb6, 0xbb, 0xad, 0xd0, 0xd6, 0xb5,
-	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xaf, 0xdd, 0xb4, 0xa9, 0xdb, 0x92, 0x9a,
-	0xc6, 0x84, 0xa7, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xac, 0xaa, 0xa6, 0xbd, 0xc3, 0xb0, 0xd2, 0xd7, 0xb5,
-	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xae, 0xdb, 0xb6, 0xa8, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff
-};
-
-
-static const char * book_open_xpm[] = {
-"16 16 4 1",
-"       c None s None",
-".      c black",
-"X      c #808080",
-"o      c white",
-"                ",
-"  ..            ",
-" .Xo.    ...    ",
-" .Xoo. ..oo.    ",
-" .Xooo.Xooo...  ",
-" .Xooo.oooo.X.  ",
-" .Xooo.Xooo.X.  ",
-" .Xooo.oooo.X.  ",
-" .Xooo.Xooo.X.  ",
-" .Xooo.oooo.X.  ",
-"  .Xoo.Xoo..X.  ",
-"   .Xo.o..ooX.  ",
-"    .X..XXXXX.  ",
-"    ..X.......  ",
-"     ..         ",
-"                "};
-
-static const char * book_closed_xpm[] = {
-"16 16 6 1",
-"       c None s None",
-".      c black",
-"X      c red",
-"o      c yellow",
-"O      c #808080",
-"#      c white",
-"                ",
-"       ..       ",
-"     ..XX.      ",
-"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
-".ooXXXXXXXXX.   ",
-"..ooXXXXXXXXX.  ",
-".X.ooXXXXXXXXX. ",
-".XX.ooXXXXXX..  ",
-" .XX.ooXXX..#O  ",
-"  .XX.oo..##OO. ",
-"   .XX..##OO..  ",
-"    .X.#OO..    ",
-"     ..O..      ",
-"      ..        ",
-"                "};
-
-static const char * mini_page_xpm[] = {
-"16 16 4 1",
-"       c None s None",
-".      c black",
-"X      c white",
-"o      c #808080",
-"                ",
-"   .......      ",
-"   .XXXXX..     ",
-"   .XoooX.X.    ",
-"   .XXXXX....   ",
-"   .XooooXoo.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   ..........o  ",
-"    oooooooooo  ",
-"                "};
-
-static const char * gtk_mini_xpm[] = {
-"15 20 17 1",
-"       c None",
-".      c #14121F",
-"+      c #278828",
-"@      c #9B3334",
-"#      c #284C72",
-"$      c #24692A",
-"%      c #69282E",
-"&      c #37C539",
-"*      c #1D2F4D",
-"=      c #6D7076",
-"-      c #7D8482",
-";      c #E24A49",
-">      c #515357",
-",      c #9B9C9B",
-"'      c #2FA232",
-")      c #3CE23D",
-"!      c #3B6CCB",
-"               ",
-"      ***>     ",
-"    >.*!!!*    ",
-"   ***....#*=  ",
-"  *!*.!!!**!!# ",
-" .!!#*!#*!!!!# ",
-" @%#!.##.*!!$& ",
-" @;%*!*.#!#')) ",
-" @;;@%!!*$&)'' ",
-" @%.%@%$'&)$+' ",
-" @;...@$'*'*)+ ",
-" @;%..@$+*.')$ ",
-" @;%%;;$+..$)# ",
-" @;%%;@$$$'.$# ",
-" %;@@;;$$+))&* ",
-"  %;;;@+$&)&*  ",
-"   %;;@'))+>   ",
-"    %;@'&#     ",
-"     >%$$      ",
-"      >=       "};
-
-const gchar ** xpms[] = { 
-  book_open_xpm,
-  book_closed_xpm,
-  mini_page_xpm,
-  gtk_mini_xpm,
-  NULL
-};
-
-static void
-quit_func (GtkWidget *widget, gpointer dummy)
-{
-	gtk_main_quit ();
-}
-
-static void
-expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
-{
-	GdkPixbuf *pixbuf;
-
-	pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-
-	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-		GdkPixbuf *dest;
-	  
-		gdk_window_set_back_pixmap (drawing_area->window, NULL, FALSE);
-	  
-		dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);
-		
-		gdk_pixbuf_composite_color (pixbuf, dest,
-					    0, 0, event->area.width, event->area.height,
-					    -event->area.x, -event->area.y,
-					    (double) drawing_area->allocation.width / gdk_pixbuf_get_width (pixbuf),
-					    (double) drawing_area->allocation.height / gdk_pixbuf_get_height (pixbuf),
-					    GDK_INTERP_BILINEAR, 255,
-					    event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
-		
-		gdk_draw_pixbuf (drawing_area->window, drawing_area->style->fg_gc[GTK_STATE_NORMAL], dest,
-				 0, 0, event->area.x, event->area.y,
-				 event->area.width, event->area.height,
-				 GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
-		
-		g_object_unref (dest);
-	} else {
-		gdk_draw_rgb_image (drawing_area->window,
-				    drawing_area->style->white_gc,
-				    event->area.x, event->area.y, 
-				    event->area.width, 
-				    event->area.height,
-				    GDK_RGB_DITHER_NORMAL,
-				    gdk_pixbuf_get_pixels (pixbuf)
-				    + (event->area.y * gdk_pixbuf_get_rowstride (pixbuf))
-				    + (event->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-				    gdk_pixbuf_get_rowstride (pixbuf));
-	}
-}
-
-static void
-config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
-{
-#if 0
-	GdkPixbuf *pixbuf;
-    
-	pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-
-	if (((event->width) != gdk_pixbuf_get_width (pixbuf)) ||
-	    ((event->height) != gdk_pixbuf_get_height (pixbuf)))
-		gdk_pixbuf_scale (pixbuf, event->width, event->height);
-#endif
-}
-
-static GtkWidget*
-new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *temp_box;
-	GtkWidget *button;
-	GtkWidget *drawing_area;
-	gint w, h;
-
-        g_return_val_if_fail (pixbuf != NULL, NULL);
-	w = gdk_pixbuf_get_width (pixbuf);
-	h = gdk_pixbuf_get_height (pixbuf);
-
-	window = g_object_new (gtk_window_get_type (),
-				 "GtkObject::user_data", NULL,
-				 "GtkWindow::type", GTK_WINDOW_TOPLEVEL,
-				 "GtkWindow::title", title ? title : "testrgb",
-				 "GtkWindow::allow_shrink", TRUE,
-				 NULL);
-	g_signal_connect (window, "destroy",
-			  G_CALLBACK (quit_func), NULL);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-
-	if (title)
-		gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (title),
-				    TRUE, TRUE, 0);
-
-	drawing_area = gtk_drawing_area_new ();
-
-	temp_box = gtk_hbox_new (FALSE, 0);
-	gtk_widget_set_size_request (GTK_WIDGET (drawing_area), w, h);
-	gtk_box_pack_start (GTK_BOX (temp_box), drawing_area, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), temp_box, FALSE, FALSE, 0);
-	
-
-	g_signal_connect (drawing_area, "expose_event",
-			  G_CALLBACK (expose_func), NULL);
-	g_signal_connect (drawing_area, "configure_event",
-			  G_CALLBACK (config_func), NULL);
-
-	g_object_set_data (G_OBJECT (drawing_area), "pixbuf", pixbuf);
-
-	gtk_widget_show (drawing_area);
-
-	button = gtk_button_new_with_label ("Quit");
-	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-	g_signal_connect_swapped (button, "clicked",
-				  G_CALLBACK (gtk_widget_destroy), window);
-
-	gtk_widget_show (button);
-
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-	gtk_widget_show_all (vbox);
-
-	gtk_widget_show (window);
-
-        return drawing_area;
-}
-
-
-static gint
-update_timeout (gpointer data)
-{
-        ProgressFileStatus *status = data;
-	gboolean done;
-        GError *error;
-        
-	done = FALSE;
-        error = NULL;
-
-	if (!feof (status->imagefile)) {
-		gint nbytes;
-                
-		nbytes = fread (status->buf, 1, status->readlen, 
-			       status->imagefile);
-
-
-                if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) {
-                        g_warning ("Error writing to loader: %s",
-                                   error->message);
-                        g_error_free (error);
-                        done = TRUE;
-                }
-                        
-                        
-        } 
-	else 
-                done = TRUE;
-	  
-	if (done) {
-                /* ignoring errors, we should not do that. */
-		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader), NULL);
-		gtk_widget_queue_draw (*status->rgbwin);
-		g_object_unref (status->loader);
-		fclose (status->imagefile);
-		g_free (status->buf);
-	}
-
-	return !done;
-}
-
-
-static void
-progressive_prepared_callback (GdkPixbufLoader* loader, gpointer data)
-{
-        GtkWidget** retloc = data;
-        GdkPixbuf* pixbuf;
-
-        pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-
-        g_assert (pixbuf != NULL);
-
-        g_object_ref (pixbuf); /* for the RGB window */
-
-        *retloc = new_testrgb_window (pixbuf, "Progressive");
-
-        return;
-}
-
-
-static void
-progressive_updated_callback (GdkPixbufLoader* loader, guint x, guint y, guint width, guint height, gpointer data)
-{
-        GtkWidget** window_loc = data;
-
-        if (*window_loc != NULL)
-                gtk_widget_queue_draw_area (*window_loc,
-					   x, y, width, height);
-        return;
-}
-
-static int readlen = 4096;
-
-extern void pixbuf_init (void);
-
-void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
-{
-        gdk_pixbuf_loader_set_size (loader, width*2, height*2);
-}
-
-
-int
-main (int argc, char **argv)
-{
-	int i;
-	int found_valid = FALSE;
-
-	GdkPixbuf *pixbuf;
-	GdkPixbufLoader *pixbuf_loader;
-
-	pixbuf_init ();
-
-	gtk_init (&argc, &argv);
-
-	/*	gdk_rgb_set_verbose (TRUE);*/
-
-	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
-	{
-		char *tbf_readlen = getenv ("TBF_READLEN");
-		if (tbf_readlen) readlen = atoi (tbf_readlen);
-	}
-
-	{
-		char *tbf_bps = getenv ("TBF_KBPS");
-		guint bps;
-
-		if (tbf_bps) {
-			bps = atoi (tbf_bps);
-			g_print ("Simulating %d kBytes/sec\n", bps);
-			readlen = (bps*1024)/10;
-		}
-	}
-
-	i = 1;
-	if (argc == 1) {
-                const gchar*** xpmp;
-                GError *error = NULL;
-		
-		pixbuf = gdk_pixbuf_new_from_data (default_image, GDK_COLORSPACE_RGB, FALSE, 8,
-						   DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_WIDTH * 3,
-						   NULL, NULL);
-		new_testrgb_window (pixbuf, NULL);
-
-                xpmp = xpms;
-                while (*xpmp) {
-                        pixbuf = gdk_pixbuf_new_from_xpm_data (*xpmp);
-                        new_testrgb_window (pixbuf, NULL);
-                        ++xpmp;
-                }
-
-                /* Test loading from inline data. */
-                pixbuf = gdk_pixbuf_new_from_inline (-1, apple_red, FALSE, &error);
-		if (!pixbuf)
-		  {
-		    fprintf (stderr, "failed to construct \"red apple\" pixbuf: %s\n",
-			     error->message);
-		    g_error_free (error);
-		  }
-		else
-		  new_testrgb_window (pixbuf, "Red apple from inlined RLE data");
-
-                pixbuf = gdk_pixbuf_new_from_inline (sizeof (gnome_foot), gnome_foot, TRUE, NULL);
-                new_testrgb_window (pixbuf, "GNOME Foot from inlined RLE data");
-                
-		found_valid = TRUE;
-	} else {
-		for (i = 1; i < argc; i++) {
-                        GError *error;
-
-                        error = NULL;
-			pixbuf = gdk_pixbuf_new_from_file (argv[i], &error);
-
-                        if (pixbuf == NULL) {
-                                g_warning ("Error loading image: %s",
-                                           error->message);
-                                g_error_free (error);
-                        }
-                        
-#if 0
-			pixbuf = gdk_pixbuf_rotate (pixbuf, 10.0);
-#endif
-
-			if (pixbuf) {
-				new_testrgb_window (pixbuf, "File");
-				found_valid = TRUE;
-			}
-		}
-#if 1	
-                {
-                        GtkWidget* rgb_window = NULL;
-			ProgressFileStatus   status;
-
-                        pixbuf_loader = gdk_pixbuf_loader_new ();
-			status.loader = pixbuf_loader;
-
-			status.rgbwin = &rgb_window;
-
-			status.buf = g_malloc (readlen);
-
-#if 0
-			g_signal_connect (pixbuf_loader, "size_prepared", 
-					  G_CALLBACK (size_func), NULL);
-#endif
-
-                        g_signal_connect (pixbuf_loader, "area_prepared",
-					  G_CALLBACK (progressive_prepared_callback),
-					  &rgb_window);
-                        g_signal_connect (pixbuf_loader, "area_updated",
-					  G_CALLBACK (progressive_updated_callback),
-					  &rgb_window);
-			
-                        status.imagefile = fopen (argv[1], "r");
-                        g_assert (status.imagefile != NULL);
-
-			status.readlen = readlen;
-
-                        status.timeout = gdk_threads_add_timeout (100, update_timeout, &status);
-                }
-#endif
-	}
-
-	if (found_valid)
-		gtk_main ();
-
-	return 0;
-}
--- a/docs/RELEASE-HOWTO
+++ b/docs/RELEASE-HOWTO
@@ -26,16 +26,21 @@ Make sure that gtk-doc is the latest released version.
    committers, etc. Anybody who is mentioned in ChangeLog gets
    credits, but only real names, not email addresses or nicknames.

- 3) In particular, if this is a major, stable, release, verify that
+ 3) Update the pot files and commit the changes:
+
+    make -C po gtk30.pot
+    make -C po-properties gtk30-properties.pot
+
+ 4) In particular, if this is a major, stable, release, verify that
    README.in contains the relevant release notes and that the
    required versions of dependencies in INSTALL.in are in sync
-    with configure.in.
+    with configure.ac.

- 4) Verify that the version in configure.in has been bumped after the last
+ 5) Verify that the version in configure.ac has been bumped after the last
    release. (Note that this is critical, a slip-up here will cause the
    soname to change).

- 5) Make sure that make check is happy (If you don't do it here, make distcheck
+ 6) Make sure that make check is happy (If you don't do it here, make distcheck
    will also catch it, but it is kind of disheartening to see make distcheck
    fail due to an extraneous symbol after watching it build the docs for an
    hour...).
@@ -49,7 +54,7 @@ Make sure that gtk-doc is the latest released version.
      using a function from a different library, which is not yet allowed
      by the filter in pltcheck.sh

- 6) If this is a devel release, make sure that the docs for new symbols
+ 7) If this is a devel release, make sure that the docs for new symbols
    are in good shape. Look at the -unused.txt files and add stuff found
    there to the corresponding -sections.txt file. Look at the
    -undocumented.txt files and see if there is anything in there that
@@ -58,12 +63,12 @@ Make sure that gtk-doc is the latest released version.
    Since: tags, and that there is an index in the main -docs.sgml for
    the next stable version.

- 7) make distcheck
+ 8) make distcheck

- 8) Fix broken stuff found by 7), repeat
+ 9) Fix broken stuff found by 8), commit changes: git commit -a, repeat.

- 9) Commit all changes: git commit -a. You will have a bunch of po file
-    changes, NEWS and maybe some doc changes too
+10) Once distcheck succeeds, verify that the tree is clean: git diff should
+    come up empty.

 10) Now you've got the tarball. Check that the tarball size looks
    reasonable compared to previous releases. If the size goes down
@@ -78,7 +83,7 @@ Make sure that gtk-doc is the latest released version.

    git push origin refs/tags/2.12.10

-13) Bump the version number in configure.in and commit and push this change
+13) Bump the version number in configure.ac and commit and push this change

 14) Upload the tarball to master.gnome.org and run install-module to transfer
    it to download.gnome.org. If you don't have an account on master.gnome.org,
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -17,6 +17,8 @@ pdf:
 	  (cd $(srcdir); db2pdf gtk-faq.sgml); \
 	fi

+all-local: html
+
 dist-hook: html
 	cp -Rp $(srcdir)/html $(distdir)
 else
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
@@ -789,7 +789,7 @@ disgrace to the widget set will gladly be included.</para>
 <para>The new widgets that get added to GTK+ are generally either
 replacements for existing widgets that are no longer
 deemed to be adequate, or have been developed externally to GTK+ but
-have been widely tested. 
+have been widely tested.</para>

 <para>Before you spend months of your valuable time implementing your
 revolutionary widget, it is highly recommended that you get some
@@ -996,11 +996,11 @@ relevant packages. These are:</para>
 or on any GNU mirror.</para>

 <para>In order to use the powerful autoconf/automake scheme,
-you must create a configure.in which may look like:</para>
+you must create a configure.ac which may look like:</para>

 <programlisting role="C">
 dnl Process this file with autoconf to produce a configure script.
-dnl configure.in for a GTK+ based program
+dnl configure.ac for a GTK+ based program

 AC_INIT(myprg.c)
 AM_INIT_AUTOMAKE(mypkgname, 0.0.1)
@@ -1137,8 +1137,7 @@ myapp --display=:1
     | | | +GtkCombo
     | | | `GtkStatusbar
     | | `GtkVBox
-     | |   +GtkColorSelection
-     | |   `GtkGammaCurve
+     | |   `GtkColorSelection
     | +GtkButton
     | | +GtkOptionMenu
     | | `GtkToggleButton
@@ -1160,7 +1159,6 @@ myapp --display=:1
     | +GtkToolbar
     | `GtkTree
     +GtkDrawingArea
-     | `GtkCurve
     +GtkEditable
     | +GtkEntry
     | | `GtkSpinButton
@@ -1629,11 +1627,7 @@ int main(int argc, char *argv[])
  g_signal_connect(G_OBJECT (window), "destroy",
 		     G_CALLBACK(destroy), NULL);

-#if (GTK_MAJOR_VERSION == 1) &amp;&amp; (GTK_MINOR_VERSION == 0)
-  gtk_container_border_width(GTK_CONTAINER (window), 10);
-#else  
  gtk_container_set_border_width(GTK_CONTAINER (window), 10);
-#endif

  /* add a button to do something useful */
  button = gtk_button_new_with_label("Fork me!");
@@ -1898,7 +1892,7 @@ not applied you'll have to use the
 function. <literal>gtk_object_class_user_signal_new</literal> allows you
 to add a new signal to a predefined GTK+ widget without any
 modification of the GTK+ source code. The new signal can be
-emited with <literal>gtk_signal_emit</literal> and can be
+emited with <literal>g_signal_emit</literal> and can be
 handled in the same way as other signals.</para>

 <para>Tim Janik posted this code snippet:</para>
@@ -1920,7 +1914,7 @@ gtk_widget_user_action (GtkWidget *widget,
 {
  g_return_if_fail (GTK_IS_WIDGET (widget));

-  gtk_signal_emit (GTK_OBJECT (widget), signal_user_action, act_data);
+  g_signal_emit (widget, signal_user_action, act_data);
 }
 </programlisting>

@@ -2527,15 +2521,15 @@ using the following expression:</para>

 <para>If you don't want the user to be able to modify the
 content of this entry, you can use the
-gtk_entry_set_editable() function:</para>
+gtk_editable_set_editable() function:</para>


 <programlisting role="C">
-      void gtk_entry_set_editable(GtkEntry *entry, 
-                                  gboolean editable);
+void gtk_editable_set_editable (GtkEditable *editable,
+                                gboolean     is_editable);
 </programlisting>

-<para>Set the editable parameter to FALSE to disable typing
+<para>Set the is_editable parameter to FALSE to disable typing
 into the entry.</para>
 </sect1>

@@ -2559,10 +2553,10 @@ into the entry.</para>
 signal handler with</para>

 <programlisting role="C">
-      gtk_signal_connect(GTK_COMBO(cb)->entry,
-                         "changed",
-                         GTK_SIGNAL_FUNC(my_cb_change_handler),
-                         NULL);
+      g_signal_connect(GTK_COMBO(cb)->entry,
+                       "changed",
+                       G_CALLBACK(my_cb_change_handler),
+                       NULL);
 </programlisting>

 </sect1>
@@ -2629,8 +2623,8 @@ underlined, and the relevant accelerators are created.</para>
  gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);

  file1 = gtk_menu_item_new_with_label ("");
-  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (file1)->child),
-                                   _("_File"));
+  gtk_label_set_use_underline (GTK_LABEL (gtk_bin_get_child (GTK_BIN (file1))),
+                               TRUE);
  gtk_widget_add_accelerator (file1, "activate_item", accel_group,
                              tmp_key, GDK_MOD1_MASK, 0);
  gtk_object_set_data (GTK_OBJECT (window1), "file1", file1);
@@ -2643,8 +2637,8 @@ underlined, and the relevant accelerators are created.</para>
  gtk_menu_item_set_submenu (GTK_MENU_ITEM (file1), file1_menu);

  new1 = gtk_menu_item_new_with_label ("");
-  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (new1)->child),
-                                   _("_New"));
+  gtk_label_set_use_underline (GTK_LABEL (gtk_bin_get_child (GTK_BIN (new1))),
+                               TRUE);
  gtk_widget_add_accelerator (new1, "activate_item", file1_menu_accels,
                              tmp_key, 0, 0);
  gtk_object_set_data (GTK_OBJECT (window1), "new1", new1);
@@ -2670,9 +2664,9 @@ GtkMenuItem with:</para>
      /* do stuff with child */
      if (GTK_IS_LABEL (child))
      {
-        gchar *text;
+        const gchar *text;
    
-        gtk_label_get (GTK_LABEL (child), &amp;text);
+        text = gtk_label_get_text (GTK_LABEL (child));
        g_print ("menu item text: %s\n", text);
      }
    }
@@ -2864,9 +2858,9 @@ be:</para>

 <programlisting role="C">
  entry = gtk_entry_new();
-  gtk_signal_connect (GTK_OBJECT(entry), "activate",
-                      GTK_SIGNAL_FUNC(entry_callback),
-                      NULL);
+  g_signal_connect (entry, "activate",
+                    G_CALLBACK(entry_callback),
+                    NULL);
 </programlisting>

 </sect1>
@@ -3044,8 +3038,8 @@ main (int argc, char *argv[])
  gtk_container_add (GTK_CONTAINER (window), text);

  /* connect after everything else */
-  gtk_signal_connect_after (GTK_OBJECT(text), "button_press_event",
-    GTK_SIGNAL_FUNC (insert_bar), NULL);
+  g_signal_connect_after (text, "button_press_event",
+                          G_CALLBACK (insert_bar), NULL);

  gtk_widget_show_all(window);
  gtk_main();
@@ -3108,7 +3102,7 @@ like this:</para>
  gc = gdk_gc_new(widget->window);

  /* find proper dimensions for rectangle */
-  gdk_window_get_size(widget->window, &amp;width, &amp;height);
+  gdk_drawable_get_size(widget->window, &amp;width, &amp;height);

  /* the color we want to use */
  color = (GdkColor *)malloc(sizeof(GdkColor));
@@ -3130,7 +3124,7 @@ like this:</para>
   * displays. Therefore, this call is required so that GDK and X can
   * give us the closest color available in the colormap
   */
-  gdk_color_alloc(gtk_widget_get_colormap(widget), color);
+  gdk_colormap_alloc_color(gtk_widget_get_colormap(widget), color, FALSE, TRUE);

  /* set the foreground to our color */
  gdk_gc_set_foreground(gc, color);
--- a/docs/gtk-config.txt
+++ b/docs/gtk-config.txt
@@ -152,10 +152,10 @@ and the AM_PATH_GTK macro. The program used here is the testinput.c
 You should first read the introductory portions of the automake
 Manual, if you are not already familiar with it.

-Two files are needed, 'configure.in', which is used to build the
+Two files are needed, 'configure.ac', which is used to build the
 configure script:

-==configure.in===
+==configure.ac===
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(testinput.c)

--- a/docs/refcounting.txt
+++ b/docs/refcounting.txt
@@ -197,7 +197,7 @@ GtkOptionMenu looks like this:
  /* menu_item->ref_count == 1 and it is flagged as `floating'.
   */

-  gtk_menu_append (GTK_MENU (menu), menu_item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
  /* menu_item->ref_count still == 1, but it is no longer `floating'.
   */
  
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl

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

 GITIGNOREFILES = */*.1

--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -1,99 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module.
-DOC_MODULE=gdk-pixbuf
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--source-dir=../../../contrib/gdk-pixbuf-xlib --deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk-pixbuf
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.h $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.h
-CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.c
-
-# Header files to ignore when scanning
-IGNORE_HFILES=				\
-	pixops				\
-	gdk-pixbuf-alias.h		\
-	gdk-pixbuf-marshal.h		\
-	gdk-pixbuf-xlib-private.h 	\
-	gdk-pixbuf-i18n.h 		\
-	gdk-pixbuf-private.h		\
-	io-gif-animation.h		\
-	io-ani-animation.h		\
-	xpm-color-table.h		\
-	test-images.h
-
-INCLUDES = 			\
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	-I$(top_builddir)/gdk	\
-	$(GTK_DEBUG_FLAGS)	\
-	$(GTK_DEP_CFLAGS)
-
-GTKDOC_LIBS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib) 				\
-	$(GTK_DEP_LIBS)
-
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml --name-space=gdk_pixbuf
-
-# Extra SGML files that are included by DOC_MAIN_SGML_FILE
-content_files =				\
-	version.xml			\
-	gdk-pixbuf-from-drawables.sgml	\
-	gdk-pixbuf-rendering.sgml	\
-	gdk-pixbuf.sgml			\
-	porting-from-imlib.sgml		\
-	gdk-pixbuf-csource.xml		\
-	gdk-pixbuf-query-loaders.xml
-
-# Images to copy into HTML directory
-HTML_IMAGES = composite.png
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS= --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
-
-
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += version.xml.in \
-	composite.png \
-	composite.dia \
-	apple-red-1a.png \
-	apple-red-2c.png \
-	gnome-gmush-1.png
-
-########################################################################
-
-if ENABLE_MAN
-
-man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 
-
-%.1 : %.xml 
-	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-BUILT_EXTRA_DIST = $(man_MANS)
-
-endif
-
-dist-hook-local: $(BUILT_EXTRA_DIST)
-	files='$(BUILT_EXTRA_DIST)';				\
-	for f in $$files; do					\
-	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
-	  cp $$d/$$f $(distdir) || exit 1; done
-
-include $(top_srcdir)/git.mk
--- a/docs/reference/gdk-pixbuf/apple-red-1a.png
+++ b/docs/reference/gdk-pixbuf/apple-red-1a.png
--- a/docs/reference/gdk-pixbuf/apple-red-2c.png
+++ b/docs/reference/gdk-pixbuf/apple-red-2c.png
--- a/docs/reference/gdk-pixbuf/composite.dia
+++ b/docs/reference/gdk-pixbuf/composite.dia
--- a/docs/reference/gdk-pixbuf/composite.png
+++ b/docs/reference/gdk-pixbuf/composite.png
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gdk-pixbuf-csource">
-
-<refmeta>
-<refentrytitle>gdk-pixbuf-csource</refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>gdk-pixbuf-csource</refname>
-<refpurpose>C code generation utility for GdkPixbuf images</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gdk-pixbuf-csource</command>
-<arg choice="opt">options</arg>
-<arg choice="opt">image</arg>
-</cmdsynopsis>
-<cmdsynopsis>
-<command>gdk-pixbuf-csource</command>
-<arg choice="opt">options</arg>
-<arg choice="plain">--build-list</arg>
-<arg rep="repeat">
-  <arg>name</arg>
-  <arg>image</arg>
-</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gdk-pixbuf-csource</command> is a small utility that generates C code
-containing images, useful for compiling images directly into programs.
-</para>
-</refsect1>
-
-<refsect1><title>Invocation</title>
-<para>
-<command>gdk-pixbuf-csource</command> either takes as input one image file name
-to generate code for, or, using the <option>--build-list</option> option, a 
-list of (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
-pairs to generate code for a list of images into named variables.
-</para>
-<refsect2><title>Options</title>
-<variablelist>
-
-<varlistentry>
-<term><option>--stream</option></term>
-<listitem><para>
-Generate pixbuf data stream (a single string containing a serialized
-<structname>GdkPixdata</structname> structure in network byte order).
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--struct</option></term>
-<listitem><para>
-Generate GdkPixdata structure (needs the <structname>GdkPixdata</structname>
-structure definition from <filename>gdk-pixdata.h</filename>).
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--macros</option></term>
-<listitem><para>
-Generate *_ROWSTRIDE, *_WIDTH, *_HEIGHT, *_BYTES_PER_PIXEL and
-*_RLE_PIXEL_DATA or *_PIXEL_DATA macro definitions for the image.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--rle</option></term>
-<listitem><para>
-Enables run-length encoding for the generated pixel data (default).
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--raw</option></term>
-<listitem><para>
-Disables run-length encoding for the generated pixel data.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--extern</option></term>
-<listitem><para>
-Generate extern symbols.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--static</option></term>
-<listitem><para>
-Generate static symbols (default).
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--decoder</option></term>
-<listitem><para>
-Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition
-to decode run-length encoded image data.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--name=identifier</option></term>
-<listitem><para>
-Specifies the identifier name (prefix) for the generated variables or
-macros (useful only if <option>--build-list</option> was not specified).
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--build-list</option></term>
-<listitem><para>
-Enables (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
-pair parsing mode.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>-h</option>, <option>--help</option></term>
-<listitem><para>
-Print brief help and exit.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>-v</option>, <option>--version</option></term>
-<listitem><para>
-Print version and exit.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--g-fatal-warnings</option></term>
-<listitem><para>
-Make warnings fatal (causes the program to abort).
-</para></listitem>
-</varlistentry>
-
-</variablelist>
-</refsect2>
-</refsect1>
-
-<refsect1><title>See also</title>
-<para>
-The <structname>GdkPixbuf</structname> documentation, shipped with the 
-Gtk+ distribution, available from <ulink url="http://www.gtk.org">www.gtk.org</ulink>.
-</para>
-</refsect1>
-
-<refsect1><title>Bugs</title>
-<para>
-The runlength encoder gets out of sync with the pixel boundaries, since
-it includes the rowstride padding in the encoded stream. Furthermore, it
-generates pixbufs with suboptimal rowstride in some cases.
-</para>
-</refsect1>
-
-<refsect1><title>Author</title>
-<para>
-<command>gdk-pixbuf-csource</command> was written by Tim Janik
-<email>timj@gtk.org</email>. 
-</para>
-<para>
-This manual page was provided by Tim Janik <email>timj@gtk.org</email>. 
-</para>
-</refsect1>
-</refentry>
-
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gdk-pixbuf-gdk-pixbuf-from-drawables">
-<refmeta>
-<refentrytitle>Drawables to Pixbufs</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GDK-PIXBUF Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>Drawables to Pixbufs</refname><refpurpose>Getting parts of a GDK drawable's image data into a pixbuf.</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Description</title>
-  <para>
-    The functions to take the image data from a GDK drawable and dump it 
-    into a pixbuf are contained in GDK, see the 
-    <link linkend="gdk-Pixbufs">Pixbufs</link> section of the GDK 
-    documentation.
-  </para>
-</refsect1>
-
-
-
-
-</refentry>
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gdk-pixbuf-query-loaders">
-
-<refmeta>
-<refentrytitle>gdk-pixbuf-query-loaders</refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>gdk-pixbuf-query-loaders</refname>
-<refpurpose>GdkPixbuf loader registration utility</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gdk-pixbuf-query-loaders</command>
-<arg choice="opt" rep="repeat">module</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gdk-pixbuf-query-loaders</command> collects information about loadable
-modules for <application>gdk-pixbuf</application> and writes it to <filename>stdout</filename>. 
-</para>
-<para>
-If called without arguments, it looks for modules in the
-<application>gdk-pixbuf</application> loader directory.  
-</para>
-<para>
-If called with arguments, it looks for the specified modules. The arguments
-may be absolute or relative paths.
-</para>
-</refsect1>
-
-<refsect1><title>Environment</title>
-<para>
-The environment variable <envar>GDK_PIXBUF_MODULEDIR</envar> can be used
-to specify a different loader directory. The default <application>gdk-pixbuf</application> loader
-directory is <filename><replaceable>libdir</replaceable>/gtk-2.0/<replaceable>version</replaceable>/loaders</filename>.
-</para>
-</refsect1>
-
-<refsect1><title>Bugs</title>
-<para>
-None known yet.
-</para>
-</refsect1>
-
-</refentry>
-
-
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gdk-pixbuf-gdk-pixbuf-rendering">
-<refmeta>
-<refentrytitle>Rendering</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GDK-PIXBUF Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>Rendering</refname><refpurpose>Rendering a pixbuf to a GDK drawable.</refpurpose>
-</refnamediv>
-
-
-<refsect1>
-<title>Description</title>
-  <para>
-    The functions to render pixbufs to GDK drawables are contained in 
-    GDK, see the <link linkend="gdk-Pixbufs">Pixbufs</link> section 
-    of the GDK documentation.
-  </para>
-</refsect1>
-
-
-
-
-</refentry>
-
-
-
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
@@ -1,302 +0,0 @@
-<INCLUDE>gdk-pixbuf/gdk-pixbuf.h</INCLUDE>
-
-<SECTION>
-<TITLE>Versioning</TITLE>
-<FILE>initialization_versions</FILE>
-
-<SUBSECTION>
-gdk_pixbuf_version
-gdk_pixbuf_major_version
-gdk_pixbuf_minor_version
-gdk_pixbuf_micro_version
-GDK_PIXBUF_VERSION
-GDK_PIXBUF_MAJOR
-GDK_PIXBUF_MINOR
-GDK_PIXBUF_MICRO
-
-<SUBSECTION Private>
-GDK_PIXBUF_VAR
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf</FILE>
-GdkPixbufError
-GDK_PIXBUF_ERROR
-GdkColorspace
-GdkPixbufAlphaMode
-GdkPixbuf
-gdk_pixbuf_get_colorspace
-gdk_pixbuf_get_n_channels
-gdk_pixbuf_get_has_alpha
-gdk_pixbuf_get_bits_per_sample
-gdk_pixbuf_get_pixels
-gdk_pixbuf_get_width
-gdk_pixbuf_get_height
-gdk_pixbuf_get_rowstride
-gdk_pixbuf_get_option
-
-<SUBSECTION Standard>
-GDK_TYPE_PIXBUF_ERROR
-GDK_TYPE_COLORSPACE
-GDK_TYPE_PIXBUF_ALPHA_MODE
-GDK_PIXBUF
-GDK_TYPE_PIXBUF
-GDK_IS_PIXBUF
-
-
-<SUBSECTION Private>
-gdk_pixbuf_get_type
-gdk_pixbuf_error_quark
-gdk_colorspace_get_type
-gdk_pixbuf_alpha_mode_get_type
-gdk_pixbuf_error_get_type
-</SECTION>
-
-<SECTION>
-<FILE>refcounting</FILE>
-gdk_pixbuf_ref
-gdk_pixbuf_unref
-GdkPixbufDestroyNotify
-</SECTION>
-
-<SECTION>
-<FILE>file-loading</FILE>
-gdk_pixbuf_new_from_file
-gdk_pixbuf_new_from_file_at_size
-gdk_pixbuf_new_from_file_at_scale
-gdk_pixbuf_get_file_info
-gdk_pixbuf_new_from_stream
-gdk_pixbuf_new_from_stream_at_scale
-</SECTION>
-
-<SECTION>
-<FILE>file-saving</FILE>
-gdk_pixbuf_savev
-gdk_pixbuf_save
-GdkPixbufSaveFunc
-gdk_pixbuf_save_to_callback
-gdk_pixbuf_save_to_callbackv
-gdk_pixbuf_save_to_buffer
-gdk_pixbuf_save_to_bufferv
-gdk_pixbuf_save_to_stream
-</SECTION>
-
-<SECTION>
-<FILE>creating</FILE>
-gdk_pixbuf_new
-gdk_pixbuf_new_from_data
-gdk_pixbuf_new_from_xpm_data
-gdk_pixbuf_new_from_inline
-gdk_pixbuf_new_subpixbuf
-gdk_pixbuf_copy
-</SECTION>
-
-<SECTION>
-<INCLUDE>gdk-pixbuf/gdk-pixdata.h</INCLUDE>
-<FILE>inline</FILE>
-GdkPixdata
-GdkPixdataType
-GdkPixdataDumpType
-GDK_PIXBUF_MAGIC_NUMBER
-GDK_PIXDATA_HEADER_LENGTH
-gdk_pixdata_from_pixbuf
-gdk_pixbuf_from_pixdata
-gdk_pixdata_serialize
-gdk_pixdata_deserialize
-gdk_pixdata_to_csource
-</SECTION>
-
-<SECTION>
-<FILE>util</FILE>
-gdk_pixbuf_add_alpha
-gdk_pixbuf_copy_area
-gdk_pixbuf_saturate_and_pixelate
-gdk_pixbuf_apply_embedded_orientation
-gdk_pixbuf_fill
-</SECTION>
-
-<SECTION>
-<FILE>animation</FILE>
-GdkPixbufAnimation
-GdkPixbufAnimationIter
-gdk_pixbuf_animation_new_from_file
-gdk_pixbuf_animation_ref
-gdk_pixbuf_animation_unref
-gdk_pixbuf_animation_get_width
-gdk_pixbuf_animation_get_height
-gdk_pixbuf_animation_get_iter
-gdk_pixbuf_animation_is_static_image
-gdk_pixbuf_animation_get_static_image
-gdk_pixbuf_animation_iter_advance
-gdk_pixbuf_animation_iter_get_delay_time
-gdk_pixbuf_animation_iter_on_currently_loading_frame
-gdk_pixbuf_animation_iter_get_pixbuf
-
-<SUBSECTION>
-GdkPixbufSimpleAnim
-gdk_pixbuf_simple_anim_new
-gdk_pixbuf_simple_anim_add_frame
-gdk_pixbuf_simple_anim_set_loop
-gdk_pixbuf_simple_anim_get_loop
-
-<SUBSECTION Standard>
-GDK_PIXBUF_ANIMATION
-GDK_TYPE_PIXBUF_ANIMATION
-GDK_IS_PIXBUF_ANIMATION
-GDK_IS_PIXBUF_ANIMATION_ITER
-GDK_PIXBUF_ANIMATION_ITER
-GDK_TYPE_PIXBUF_ANIMATION_ITER
-
-GDK_PIXBUF_SIMPLE_ANIM_GET_CLASS
-GDK_IS_PIXBUF_SIMPLE_ANIM
-GDK_PIXBUF_SIMPLE_ANIM_CLASS
-GDK_IS_PIXBUF_SIMPLE_ANIM_CLASS
-GDK_TYPE_PIXBUF_SIMPLE_ANIM
-GDK_PIXBUF_SIMPLE_ANIM
-GDK_TYPE_PIXBUF_SCALED_ANIM
-GDK_TYPE_PIXBUF_SCALED_ANIM_ITER
-<SUBSECTION Private>
-gdk_pixbuf_non_anim_new
-
-gdk_pixbuf_animation_get_type
-gdk_pixbuf_animation_iter_get_type
-
-gdk_pixbuf_simple_anim_get_type
-gdk_pixbuf_simple_anim_iter_get_type
-GdkPixbufSimpleAnimClass
-gdk_pixbuf_scaled_anim_get_type
-gdk_pixbuf_scaled_anim_iter_get_type
-GdkPixbufScaledAnimClass
-GdkPixbufScaledAnim
-</SECTION>
-
-<SECTION>
-<FILE>scaling</FILE>
-GdkInterpType
-gdk_pixbuf_scale_simple
-gdk_pixbuf_scale
-gdk_pixbuf_composite_color_simple
-gdk_pixbuf_composite
-gdk_pixbuf_composite_color
-GdkPixbufRotation
-gdk_pixbuf_rotate_simple
-gdk_pixbuf_flip
-
-<SUBSECTION Standard>
-GDK_TYPE_INTERP_TYPE
-GDK_TYPE_PIXBUF_ROTATION
-
-<SUBSECTION Private>
-gdk_interp_type_get_type
-gdk_pixbuf_rotation_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-loader</FILE>
-<TITLE>GdkPixbufLoader</TITLE>
-GdkPixbufLoader
-gdk_pixbuf_loader_new
-gdk_pixbuf_loader_new_with_type
-gdk_pixbuf_loader_new_with_mime_type
-gdk_pixbuf_loader_get_format
-gdk_pixbuf_loader_write
-gdk_pixbuf_loader_set_size
-gdk_pixbuf_loader_get_pixbuf
-gdk_pixbuf_loader_get_animation
-gdk_pixbuf_loader_close
-<SUBSECTION Standard>
-GDK_PIXBUF_LOADER
-GDK_PIXBUF_LOADER_GET_CLASS
-GDK_TYPE_PIXBUF_LOADER
-GDK_IS_PIXBUF_LOADER
-GDK_PIXBUF_LOADER_CLASS
-GDK_IS_PIXBUF_LOADER_CLASS
-<SUBSECTION Private>
-GdkPixbufLoaderClass
-gdk_pixbuf_loader_get_type
-</SECTION>
-
-<SECTION>
-<TITLE>Module Interface</TITLE>
-<FILE>module_interface</FILE>
-gdk_pixbuf_set_option
-gdk_pixbuf_get_formats
-gdk_pixbuf_format_get_name
-gdk_pixbuf_format_get_description
-gdk_pixbuf_format_get_mime_types
-gdk_pixbuf_format_get_extensions
-gdk_pixbuf_format_is_writable
-gdk_pixbuf_format_is_scalable
-gdk_pixbuf_format_is_disabled
-gdk_pixbuf_format_set_disabled
-gdk_pixbuf_format_get_license
-GdkPixbufFormat
-GdkPixbufFormatFlags
-GdkPixbufModulePattern
-GdkPixbufModuleFillVtableFunc
-GdkPixbufModuleFillInfoFunc
-GdkPixbufModuleSizeFunc
-GdkPixbufModulePreparedFunc
-GdkPixbufModuleUpdatedFunc
-GdkPixbufModule
-
-<SUBSECTION Animation>
-GdkPixbufAnimationClass
-GdkPixbufAnimationIterClass
-
-<SUBSECTION Standard>
-GDK_PIXBUF_ANIMATION_GET_CLASS
-GDK_IS_PIXBUF_ANIMATION_ITER_CLASS
-GDK_PIXBUF_ANIMATION_ITER_CLASS
-GDK_IS_PIXBUF_ANIMATION_CLASS
-GDK_PIXBUF_ANIMATION_ITER_GET_CLASS
-GDK_PIXBUF_ANIMATION_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-init</FILE>
-gdk_pixbuf_xlib_init
-gdk_pixbuf_xlib_init_with_depth
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-rendering</FILE>
-gdk_pixbuf_xlib_render_threshold_alpha
-gdk_pixbuf_xlib_render_to_drawable
-gdk_pixbuf_xlib_render_to_drawable_alpha
-gdk_pixbuf_xlib_render_pixmap_and_mask
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-from-drawables</FILE>
-gdk_pixbuf_xlib_get_from_drawable
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-rgb</FILE>
-XlibRgbCmap
-XlibRgbDither
-xlib_rgb_init
-xlib_rgb_init_with_depth
-xlib_rgb_xpixel_from_rgb
-xlib_rgb_gc_set_foreground
-xlib_rgb_gc_set_background
-xlib_draw_rgb_image
-xlib_draw_rgb_image_dithalign
-xlib_draw_rgb_32_image
-xlib_draw_gray_image
-xlib_rgb_cmap_new
-xlib_rgb_cmap_free
-xlib_draw_indexed_image
-xlib_rgb_ditherable
-xlib_rgb_set_verbose
-xlib_rgb_set_install
-xlib_rgb_set_min_colors
-xlib_rgb_get_cmap
-xlib_rgb_get_visual
-xlib_rgb_get_visual_info
-xlib_rgb_get_depth
-xlib_rgb_get_display
-xlib_rgb_get_screen
-</SECTION>
-
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
@@ -1,192 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-<!ENTITY version SYSTEM "version.xml">
-
-<!ENTITY gdk-pixbuf "<application>gdk-pixbuf</application>">
-<!ENTITY Imlib "<application>Imlib</application>">
-]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>GDK-PixBuf Reference Manual</title>
-    <releaseinfo>
-      Version &version;
-      The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://library.gnome.org/devel/gdk-pixbuf/unstable/">http://library.gnome.org/devel/gdk-pixbuf/unstable/</ulink>.
-    </releaseinfo>
-    <authorgroup>
-      <author>
-	<firstname>Federico</firstname>
-	<surname>Mena Quintero</surname>
-	<affiliation>
-	  <address>
-	    <email>federico@gimp.org</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>The Free Software Foundation</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the <citetitle>GNU Free
-	Documentation License</citetitle>, Version 1.1 or any later
-	version published by the Free Software Foundation with no
-	Invariant Sections, no Front-Cover Texts, and no Back-Cover
-	Texts. You may obtain a copy of the <citetitle>GNU Free
-	Documentation License</citetitle> from the Free Software
-	Foundation by visiting <ulink type="http"
-	url="http://www.fsf.org">their Web site</ulink> or by writing
-	to:
-
-	<address>
-	  The Free Software Foundation, Inc.,
-	  <street>59 Temple Place</street> - Suite 330,
-	  <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
-	  <country>USA</country>
-	</address>
-      </para>
-
-      <para>
-	Many of the names used by companies to distinguish their
-	products and services are claimed as trademarks. Where those
-	names appear in any GNOME documentation, and those trademarks
-	are made aware to the members of the GNOME Documentation
-	Project, the names have been printed in caps or initial caps.
-      </para>
-    </legalnotice>
-  </bookinfo>
-
-  <reference>
-    <title>API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	&gdk-pixbuf; library.  Classes are described together with
-	their methods; individual functions are grouped by functional
-	group.
-      </para>
-    </partintro>
-
-    <xi:include href="xml/initialization_versions.xml" />
-
-    <xi:include href="xml/gdk-pixbuf.xml" />
-    <xi:include href="xml/refcounting.xml" />
-    <xi:include href="xml/file-loading.xml" />
-    <xi:include href="xml/file-saving.xml" />
-    <xi:include href="xml/creating.xml" />
-    <xi:include href="xml/inline.xml" />
-    <xi:include href="xml/scaling.xml" />
-    <xi:include href="gdk-pixbuf-rendering.sgml" />
-    <xi:include href="gdk-pixbuf-from-drawables.sgml" />
-    <xi:include href="xml/util.xml" />
-    <xi:include href="xml/animation.xml" />
-
-    <xi:include href="xml/gdk-pixbuf-loader.xml" />
-    <xi:include href="xml/module_interface.xml" />
-
-    <xi:include href="xml/gdk-pixbuf-xlib-init.xml" />
-    <xi:include href="xml/gdk-pixbuf-xlib-rendering.xml" />
-    <xi:include href="xml/gdk-pixbuf-xlib-from-drawables.xml" />
-    <xi:include href="xml/gdk-pixbuf-xlib-rgb.xml" />
-  </reference>
-
-  <reference>
-    <title>Tools Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the tools which are shipped with the
-	&gdk-pixbuf; library.  
-      </para>
-    </partintro>
-
-    <xi:include href="gdk-pixbuf-csource.xml" />
-    <xi:include href="gdk-pixbuf-query-loaders.xml" />
-  </reference>
-
-  <index id="api-index-full">
-    <title>Index of all symbols</title>
-    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-deprecated" role="deprecated">
-    <title>Index of deprecated symbols</title>
-    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-2" role="2.2">
-    <title>Index of new symbols in 2.2</title>
-    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-4" role="2.4">
-    <title>Index of new symbols in 2.4</title>
-    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-6" role="2.6">
-    <title>Index of new symbols in 2.6</title>
-    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-8" role="2.8">
-    <title>Index of new symbols in 2.8</title>
-    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-10" role="2.10">
-    <title>Index of new symbols in 2.10</title>
-    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-12" role="2.12">
-    <title>Index of new symbols in 2.12</title>
-    <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-14" role="2.14">
-    <title>Index of new symbols in 2.14</title>
-    <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
-  </index>
-
-   <xi:include href="porting-from-imlib.sgml" />
-
-  <!-- License -->
-
-  <appendix id="license">
-    <title>License</title>
-	
-    <para>
-      This library is free software; you can redistribute it and/or
-      modify it under the terms of the <citetitle>GNU Library General
-      Public License</citetitle> as published by the Free Software
-      Foundation; either version 2 of the License, or (at your option)
-      any later version.
-    </para>
-
-    <para>
-      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
-      <citetitle>GNU Library General Public License</citetitle> for
-      more details.
-    </para>
-
-    <para>
-      You may obtain a copy of the <citetitle>GNU Library General
-      Public License</citetitle> from the Free Software Foundation by
-      visiting <ulink type="http" url="http://www.fsf.org">their Web
-      site</ulink> or by writing to:
-
-      <address>
-	Free Software Foundation, Inc.
-	<street>59 Temple Place</street> - Suite 330
-	<city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>
-	<country>USA</country>
-      </address>
-    </para>
-  </appendix>
-
-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
-
-</book>
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.types
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.types
@@ -1,8 +0,0 @@
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-gdk_pixbuf_get_type
-gdk_pixbuf_loader_get_type
-gdk_pixbuf_animation_get_type
-gdk_pixbuf_animation_iter_get_type
-gdk_pixbuf_simple_anim_get_type
-
--- a/docs/reference/gdk-pixbuf/gnome-gmush-1.png
+++ b/docs/reference/gdk-pixbuf/gnome-gmush-1.png
--- a/docs/reference/gdk-pixbuf/porting-from-imlib.sgml
+++ b/docs/reference/gdk-pixbuf/porting-from-imlib.sgml
@@ -1,358 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-<!ENTITY gdk-pixbuf "<application>gdk-pixbuf</application>">
-<!ENTITY Imlib "<application>Imlib</application>">
-]>
-  <appendix>
-    <title>Porting applications from &Imlib; to &gdk-pixbuf;</title>
-
-    <para>
-      This appendix contains the basic steps needed to port an
-      application that uses the &Imlib; library to use &gdk-pixbuf;
-      instead.
-    </para>
-
-    <note>
-      <para>
-	This appendix refers to version 1 of the &Imlib; library; this
-	discussion is not relevant to Imlib 2.  Also, we discuss the
-	gdk_imlib API instead of the Xlib-based API.
-      </para>
-    </note>
-
-    <!-- Introduction -->
-
-    <sect1>
-      <title>Introduction</title>
-
-      <para>
-	Prior to the GNOME 1.2 platform, the &Imlib; library was the
-	preferred way of loading and rendering images in GNOME
-	applications.  Unfortunately, &Imlib; has important design
-	limitations that make it hard to write efficient and highly
-	modular applications.
-      </para>
-
-      <para>
-	The &gdk-pixbuf; library was designed as a solution to
-	&Imlib;'s shortcomings.  It provides a simple, orthogonal API
-	and convenience functions for the most common operations.  In
-	addition, it supports full transparency information for
-	images, or alpha channel.  More importantly, it has
-	well-defined semantics for memory management through the use
-	of reference counting; &Imlib; has an intractably complex
-	memory management mechanism and cache that will make your head
-	spin.
-      </para>
-    </sect1>
-
-    <!-- Differences between Imlib and gdk-pixbuf -->
-
-    <sect1>
-      <title>Differences between &Imlib; and &gdk-pixbuf;</title>
-
-      <para>
-	Generally, applications that use &Imlib; do not have to be
-	changed extensively to use &gdk-pixbuf;; its simple and
-	flexible API makes things easy.  This section describes the
-	differences between &Imlib; and &gdk-pixbuf;; you should take
-	these into account when modifying your applications to use
-	&gdk-pixbuf;.
-      </para>
-
-      <!-- Initialization -->
-
-      <sect2>
-	<title>Initialization</title>
-
-	<para>
-	  The &gdk-pixbuf; library does not need to be initialized.
-	</para>
-
-	<note>
-	  <para>
-	    In GNOME applications you normally don't need to
-	    initialize &Imlib;, as <function>gnome_init()</function>
-	    calls <function>gdk_imlib_init()</function> automatically.
-	  </para>
-	</note>
-      </sect2>
-
-      <!-- Memory management -->
-
-      <sect2>
-	<title>Memory management</title>
-
-	<para>
-	  The &gdk-pixbuf; library provides a simple, well-defined
-	  memory management mechanism for images in the form of
-	  reference counting.  This makes it very convenient to use
-	  for large-scale applications that need to share images
-	  between different parts of the program.  In stark contrast,
-	  &Imlib; has a terribly complex mechanism of an image and
-	  pixmap cache which makes it very hard for applications to
-	  share image structures between different parts of the
-	  program.  Unfortunately this mechanism makes things very
-	  prone to memory leaks and tricky bugs.
-	</para>
-
-	<para>
-	  The basic principle in &gdk-pixbuf; is that when you obtain
-	  a new <link linkend="GdkPixbuf">GdkPixbuf</link> structure,
-	  it is created with an initial reference count of 1.  When
-	  another part of the program wants to keep a reference to the
-	  pixbuf, it should call <function>g_object_ref()</function>;
-	  this will increase the reference count by 1.  When some part
-	  of the program does not need to keep a reference to a pixbuf
-	  anymore and wants to release the pixbuf, it should call
-	  <function>g_object_unref()</function>; this will decrease
-	  the reference count by 1.  When the reference count drops to
-	  zero, the pixbuf gets destroyed or
-	  <emphasis>finalized</emphasis> and its memory is freed.
-	</para>
-
-	<para>
-	  For applications that need to implement a cache of loaded
-	  images, &gdk-pixbuf; provides a way to hook to the last
-	  unreference operation of a pixbuf; instead of finalizing the
-	  pixbuf, the user-installed hook can decide to keep it around
-	  in a cache instead.
-	</para>
-
-	<para>
-	  Finally, &gdk-pixbuf; does not provide a cache of rendered
-	  pixmaps.  This is unnecessary for most applications, since
-	  the scaling and rendering functions are quite fast and
-	  applications may need to use subtly different values each
-	  time they call these functions, for example, to take into
-	  account dithering and zooming offsets.
-	</para>
-
-	<para>
-	  Most applications will simply need to call
-	  <function>g_object_ref()</function> when they want to keep
-	  an extra reference to a pixbuf, and then
-	  <function>g_object_unref()</function> when they are done
-	  with it.
-	</para>
-      </sect2>
-
-      <!-- The Rendering Process -->
-
-      <sect2>
-	<title>The Rendering Process</title>
-
-	<para>
-	  The &gdk-pixbuf; library has the policy of always rendering
-	  pixbufs to GDK drawables you provide; it will not create
-	  them for you.  This is in general more flexible than
-	  &Imlib;'s policy of always creating a pixmap and making you
-	  use that instead.
-	</para>
-
-	<para>
-	  The disadvantage of always having a pixmap created for you
-	  is that it wastes memory in the X server if you intend to
-	  copy that rendered data onto another drawable, for example,
-	  the final destination window or a temporary pixmap for
-	  drawing.  This is the most common case, unfortunately, so
-	  the &Imlib; policy introduces unnecessary copying.
-	</para>
-
-	<para>
-	  Also, &Imlib; can only render pixmaps that are the whole
-	  size of the source image; you cannot render just a subset
-	  region of the image.  This is inconvenient for applications
-	  that need to render small portions at a time, such as
-	  applications that do scrolling.  Since the whole image must
-	  be rendered at a time, this can lead to performance and
-	  memory usage problems.
-	</para>
-
-	<para>
-	  The &gdk-pixbuf; library lets you render any rectangular
-	  region from an image onto any drawable that you provide.
-	  This lets the application have fine control the way images
-	  are rendered.
-	</para>
-      </sect2>
-    </sect1>
-
-    <!-- Converting Applications to gdk-pixbuf -->
-
-    <sect1>
-      <title>Converting Applications to &gdk-pixbuf;</title>
-
-      <para>
-	This sections describes the actual changes you need to make in
-	an &Imlib; program to make it use &gdk-pixbuf; instead.
-      </para>
-
-      <!-- Image loading and creation -->
-
-      <sect2>
-	<title>Image loading and creation</title>
-
-	<para>
-	  The &gdk-pixbuf; library can load image files synchronously
-	  (i.e. with a single function call), create images from RGB
-	  data in memory, and as a convenience, it can also create
-	  images from inline XPM data.
-	</para>
-
-	<para>
-	  To load an image file in a single function call, simply use
-	  <function>gdk_pixbuf_new_from_file()</function>.  Note that
-	  this will make the program block until the whole file has
-	  been read.  This function effectively replaces
-	  <function>gdk_imlib_load_image()</function>.
-	</para>
-
-	<para>
-	  If you have RGB data in memory, you can use
-	  <function>gdk_pixbuf_new_from_data()</function> to create a
-	  pixbuf out of it; this is a replacement for
-	  <function>gdk_imlib_create_image_from_data()</function>.
-	  &gdk-pixbuf; does not copy the image data; it is up to you
-	  to define the ownership policy by providing a destroy
-	  notification function that will be called when the image
-	  data needs to be freed.  The function you provide can then
-	  free the data or do something else, as appropriate.
-	</para>
-
-	<para>
-	  As a convenience, you can use the
-	  <function>gdk_pixbuf_new_from_xpm_data()</function> function
-	  to create a pixbuf out of inline XPM data that was compiled
-	  into your C program.  This is a replacement for
-	  <function>gdk_imlib_create_image_from_xpm_data()</function>.
-	</para>
-
-	<para>
-	  After you have created a pixbuf, you can manipulate it in
-	  any way you please and then finally call
-	  <function>g_object_unref()</function> when you are done
-	  with it.  This can be thought of as a replacement for
-	  <function>gdk_imlib_destroy_image()</function> but with much
-	  cleaner semantics.
-	</para>
-      </sect2>
-
-      <!-- Rendering Images -->
-
-      <sect2>
-	<title>Rendering Images</title>
-
-	<para>
-	  Applications that use &Imlib; must first call
-	  <function>gdk_imlib_render()</function> to render the whole
-	  image data onto a pixmap that &Imlib; creates.  Then they
-	  must copy that pixmap's data into the final destination for
-	  the image.
-	</para>
-
-	<para>
-	  In contrast, &gdk-pixbuf; provides convenience functions to
-	  render arbitrary rectangular regions of an image onto a
-	  drawable that your application provides.  You can use
-	  <function>gdk_draw_pixbuf()</function> to do this; having
-          your application provide the destination drawable and
-	  specify an arbitrary region means your application has
-          complete control over the way images are rendered.
-	</para>
-
-	<para>
-	  As a convenience, &gdk-pixbuf; also provides the
-	  <function>gdk_pixbuf_render_pixmap_and_mask()</function>
-	  function; this will create new pixmap and mask drawables for
-	  a whole pixbuf and render the image data onto them.  Only
-	  trivially simple applications should find a use for this
-	  function, since usually you want finer control of how things
-	  are rendered.
-	</para>
-      </sect2>
-
-      <!-- Scaling Images -->
-
-      <sect2>
-	<title>Scaling Images</title>
-
-	<para>
-	  &Imlib; lets you render scaled image data at the time you
-	  call <function>gdk_imlib_render()</function>.  Again, this
-	  unfortunately scales and renders the whole image onto a new
-	  pixmap.
-	</para>
-
-	<para>
-	  &gdk-pixbuf; provides a number of functions that do scaling
-	  of arbitrary regions of a source pixbuf onto a destination
-	  one.  These functions can also perform compositing
-	  operations against the data in the destination pixbuf or
-	  against a solid color or a colored checkerboard.
-	  <footnote>
-	    <para>
-	      You can use a colored checkerboard as the background for
-	      compositing when you want to provide a visual indication
-	      that the image has partially opaque areas.  This is
-	      normally used in image editing and viewing programs.
-	    </para>
-
-	    <para>
-	      Compositing against a single solid color is actually a
-	      special case of a checkerboard; it simply uses checks of
-	      the same color.
-	    </para>
-	  </footnote>
-	</para>
-
-	<para>
-	  Very simple applications may find it sufficient to use
-	  <function>gdk_pixbuf_scale_simple()</function> or
-	  <function>gdk_pixbuf_composite_color_simple()</function>.
-	  These functions scale the whole source image at a time and
-	  create a new pixbuf with the result.
-	</para>
-
-	<para>
-	  More sophisticated applications will need to use
-	  <function>gdk_pixbuf_scale()</function>,
-	  <function>gdk_pixbuf_composite()</function>, or
-	  <function>gdk_pixbuf_composite_color()</function> instead.
-	  These functions let you scale and composite an arbitrary
-	  region of the source pixbuf onto a destination pixbuf that
-	  you provide.
-	</para>
-      </sect2>
-
-      <!-- Getting Image Data from a Drawable -->
-
-      <sect2>
-	<title>Getting Image Data from a Drawable</title>
-
-	<para>
-	  &Imlib; lets you create an image by fetching a drawable's
-	  contents from the X server and converting those into RGB
-	  data.  This is done with the
-	  <function>gdk_imlib_create_image_from_drawable()</function>
-	  function.
-	</para>
-
-	<para>
-	  &gdk-pixbuf; provides the
-	  <function>gdk_pixbuf_get_from_drawable()</function> function
-	  instead.  It lets you specify a destination pixbuf instead
-	  of always creating a new one for you.
-	</para>
-      </sect2>
-    </sect1>
-  </appendix>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gdk-pixbuf.sgml" "book" "book" "")
-End:
-->
-
--- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
@@ -1,197 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Animations
-
-<!-- ##### SECTION Short_Description ##### -->
-Animated images.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The &gdk-pixbuf; library provides a simple mechanism to load and represent
-    animations. An animation is conceptually a series of frames to be displayed
-    over time. Each frame is the same size. The animation may not be represented
-    as a series of frames internally; for example, it may be stored as a 
-    sprite and instructions for moving the sprite around a background. To display 
-    an animation you don't need to understand its representation, however; you just
-    ask &gdk-pixbuf; what should be displayed at a given point in time. 
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    #GdkPixbufLoader
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GdkPixbufAnimation ##### -->
-<para>
-An opaque struct representing an animation.
-</para>
-
-
-<!-- ##### STRUCT GdkPixbufAnimationIter ##### -->
-<para>
-An opaque struct representing an iterator which points to a
-certain position in an animation.
-</para>
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_new_from_file ##### -->
-<para>
-
-</para>
-
-@filename: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_ref ##### -->
-<para>
-
-</para>
-
-@animation: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_unref ##### -->
-<para>
-
-</para>
-
-@animation: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_get_width ##### -->
-<para>
-
-</para>
-
-@animation: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_get_height ##### -->
-<para>
-
-</para>
-
-@animation: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_get_iter ##### -->
-<para>
-
-</para>
-
-@animation: 
-@start_time: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_is_static_image ##### -->
-<para>
-
-</para>
-
-@animation: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_get_static_image ##### -->
-<para>
-
-</para>
-
-@animation: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_iter_advance ##### -->
-<para>
-
-</para>
-
-@iter: 
-@current_time: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_iter_get_delay_time ##### -->
-<para>
-
-</para>
-
-@iter: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_iter_on_currently_loading_frame ##### -->
-<para>
-
-</para>
-
-@iter: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_iter_get_pixbuf ##### -->
-<para>
-
-</para>
-
-@iter: 
-@Returns: 
-
-
-<!-- ##### STRUCT GdkPixbufSimpleAnim ##### -->
-<para>
-An opaque struct representing a simple animation.
-</para>
-
-
-<!-- ##### ARG GdkPixbufSimpleAnim:loop ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gdk_pixbuf_simple_anim_new ##### -->
-<para>
-
-</para>
-
-@width: 
-@height: 
-@rate: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_simple_anim_add_frame ##### -->
-<para>
-
-</para>
-
-@animation: 
-@pixbuf: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_simple_anim_set_loop ##### -->
-<para>
-
-</para>
-
-@animation: 
-@loop: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_simple_anim_get_loop ##### -->
-<para>
-
-</para>
-
-@animation: 
-@Returns: 
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
@@ -1,126 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Image Data in Memory
-
-<!-- ##### SECTION Short_Description ##### -->
-Creating a pixbuf from image data that is already in memory.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The most basic way to create a pixbuf is to wrap an existing pixel
-    buffer with a #GdkPixbuf structure.  You can use the
-    gdk_pixbuf_new_from_data() function to do this You need to specify
-    the destroy notification function that will be called when the
-    data buffer needs to be freed; this will happen when a #GdkPixbuf
-    is finalized by the reference counting functions If you have a
-    chunk of static data compiled into your application, you can pass
-    in %NULL as the destroy notification function so that the data
-    will not be freed.
-  </para>
-
-  <para>
-    The gdk_pixbuf_new() function can be used as a convenience to
-    create a pixbuf with an empty buffer.  This is equivalent to
-    allocating a data buffer using <function>malloc()</function> and 
-    then wrapping it with gdk_pixbuf_new_from_data().  The gdk_pixbuf_new() 
-    function will compute an optimal rowstride so that rendering can be 
-    performed with an efficient algorithm.
-  </para>
-
-  <para>
-    As a special case, you can use the gdk_pixbuf_new_from_xpm_data()
-    function to create a pixbuf from inline XPM image data.
-  </para>
-
-  <para>
-    You can also copy an existing pixbuf with the gdk_pixbuf_copy()
-    function.  This is not the same as just doing a g_object_ref()
-    on the old pixbuf; the copy function will actually duplicate the
-    pixel data in memory and create a new #GdkPixbuf structure for it.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    gdk_pixbuf_finalize().
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new ##### -->
-<para>
-
-</para>
-
-@colorspace: 
-@has_alpha: 
-@bits_per_sample: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new_from_data ##### -->
-<para>
-
-</para>
-
-@data: 
-@colorspace: 
-@has_alpha: 
-@bits_per_sample: 
-@width: 
-@height: 
-@rowstride: 
-@destroy_fn: 
-@destroy_fn_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new_from_xpm_data ##### -->
-<para>
-
-</para>
-
-@data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new_from_inline ##### -->
-<para>
-
-</para>
-
-@data_length: 
-@data: 
-@copy_pixels: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new_subpixbuf ##### -->
-<para>
-
-</para>
-
-@src_pixbuf: 
-@src_x: 
-@src_y: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_copy ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
@@ -1,106 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-File Loading
-
-<!-- ##### SECTION Short_Description ##### -->
-Loading a pixbuf from a file.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The &gdk-pixbuf; library provides a simple mechanism for loading
-    an image from a file in synchronous fashion.  This means that the
-    library takes control of the application while the file is being
-    loaded; from the user's point of view, the application will block
-    until the image is done loading.
-  </para>
-
-  <para>
-    This interface can be used by applications in which blocking is
-    acceptable while an image is being loaded.  It can also be used to
-    load small images in general.  Applications that need progressive
-    loading can use the #GdkPixbufLoader functionality instead.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    #GdkPixbufLoader.
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
-<para>
-
-</para>
-
-@filename: 
-@error: 
-@Returns: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new_from_file_at_size ##### -->
-<para>
-
-</para>
-
-@filename: 
-@width: 
-@height: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new_from_file_at_scale ##### -->
-<para>
-
-</para>
-
-@filename: 
-@width: 
-@height: 
-@preserve_aspect_ratio: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_file_info ##### -->
-<para>
-
-</para>
-
-@filename: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new_from_stream ##### -->
-<para>
-
-</para>
-
-@stream: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_new_from_stream_at_scale ##### -->
-<para>
-
-</para>
-
-@stream: 
-@width: 
-@height: 
-@preserve_aspect_ratio: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
@@ -1,140 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-File saving
-
-<!-- ##### SECTION Short_Description ##### -->
-Saving a pixbuf to a file.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-These functions allow to save a #GdkPixbuf in a number of 
-file formats. The formatted data can be written to a file
-or to a memory buffer. &gdk-pixbuf; can also call a user-defined
-callback on the data, which allows to e.g. write the image 
-to a socket or store it in a database.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@filename: 
-@type: 
-@option_keys: 
-@option_values: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_save ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@filename: 
-@type: 
-@error: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION GdkPixbufSaveFunc ##### -->
-<para>
-Specifies the type of the function passed to
-gdk_pixbuf_save_to_callback().  It is called once for each block of
-bytes that is "written" by gdk_pixbuf_save_to_callback().  If
-successful it should return %TRUE.  If an error occurs it should set
-@error and return %FALSE, in which case gdk_pixbuf_save_to_callback()
-will fail with the same error.
-</para>
-
-@buf: bytes to be written.
-@count: number of bytes in @buf.
-@error: A location to return an error.
-@data: user data passed to gdk_pixbuf_save_to_callback().
-@Returns: %TRUE if successful, %FALSE (with @error set) if failed.
-@Since: 2.4
-
-
-<!-- ##### FUNCTION gdk_pixbuf_save_to_callback ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@save_func: 
-@user_data: 
-@type: 
-@error: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_save_to_callbackv ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@save_func: 
-@user_data: 
-@type: 
-@option_keys: 
-@option_values: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_save_to_buffer ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@buffer: 
-@buffer_size: 
-@type: 
-@error: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_save_to_bufferv ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@buffer: 
-@buffer_size: 
-@type: 
-@option_keys: 
-@option_values: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_save_to_stream ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@stream: 
-@type: 
-@cancellable: 
-@error: 
-@Varargs: 
-@Returns: 
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
@@ -1,205 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GdkPixbufLoader
-
-<!-- ##### SECTION Short_Description ##### -->
-Application-driven progressive image loading.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    #GdkPixbufLoader provides a way for applications to drive the
-    process of loading an image, by letting them send the image data
-    directly to the loader instead of having the loader read the data
-    from a file.  Applications can use this functionality instead of
-    gdk_pixbuf_new_from_file() or gdk_pixbuf_animation_new_from_file() 
-    when they need to parse image data in
-    small chunks.  For example, it should be used when reading an
-    image from a (potentially) slow network connection, or when
-    loading an extremely large file.
-  </para>
-
-  <para>
-    To use #GdkPixbufLoader to load an image, just create a new one,
-    and call gdk_pixbuf_loader_write() to send the data to it.  When
-    done, gdk_pixbuf_loader_close() should be called to end the stream
-    and finalize everything.  The loader will emit three important
-    signals throughout the process.  The first, "<link
-    linkend="GdkPixbufLoader-size-prepared">size_prepared</link>",
-    will be called as soon as the image has enough information to
-    determine the size of the image to be used. If you want to scale
-    the image while loading it, you can call gdk_pixbuf_loader_set_size()
-    in response to this signal.
-    </para>
-
-    <para>The second signal, "<link
-    linkend="GdkPixbufLoader-area-prepared">area_prepared</link>",
-    will be called as soon as the pixbuf of the desired has been 
-    allocated.  You can obtain it by calling gdk_pixbuf_loader_get_pixbuf(). 
-    If you want to use it, simply ref it.  
-    In addition, no actual information will be passed in yet, so the
-    pixbuf can be safely filled with any temporary graphics (or an
-    initial color) as needed.  You can also call
-    gdk_pixbuf_loader_get_pixbuf() later and get the same pixbuf.
-  </para>
-
-  <para>
-    The last signal, "<link
-    linkend="GdkPixbufLoader-area-updated">area_updated</link>" gets
-    called every time a region is updated.  This way you can update a
-    partially completed image.  Note that you do not know anything
-    about the completeness of an image from the area updated.  For
-    example, in an interlaced image, you need to make several passes
-    before the image is done loading.
-  </para>
-
-  <refsect2>
-    <title>Loading an animation</title>
-
-    <para>
-      Loading an animation is almost as easy as loading an
-      image.  Once the first "<link
-      linkend="GdkPixbufLoader-area-prepared">area_prepared</link>" signal
-      has been emitted, you can call gdk_pixbuf_loader_get_animation()
-      to get the #GdkPixbufAnimation struct and gdk_pixbuf_animation_get_iter()
-      to get an #GdkPixbufAnimationIter for displaying it. 
-    </para>
-  </refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    gdk_pixbuf_new_from_file(), gdk_pixbuf_animation_new_from_file()
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GdkPixbufLoader ##### -->
-<para>
-The <structname>GdkPixbufLoader</structname> struct contains only private
-fields. 
-</para>
-
-
-<!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### -->
-  <para>
-  </para>
-
-@gdkpixbufloader: 
-
-<!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### -->
-  <para>
-  </para>
-
-@gdkpixbufloader: 
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-
-<!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
-  <para>
-  </para>
-
-@gdkpixbufloader: 
-
-<!-- ##### SIGNAL GdkPixbufLoader::size-prepared ##### -->
-  <para>
-  </para>
-
-@gdkpixbufloader: 
-@arg1: 
-@arg2: 
-
-<!-- ##### FUNCTION gdk_pixbuf_loader_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_loader_new_with_type ##### -->
-<para>
-
-</para>
-
-@image_type: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_loader_new_with_mime_type ##### -->
-<para>
-
-</para>
-
-@mime_type: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_loader_get_format ##### -->
-<para>
-
-</para>
-
-@loader: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_loader_write ##### -->
-<para>
-
-</para>
-
-@loader: 
-@buf: 
-@count: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_loader_set_size ##### -->
-<para>
-
-</para>
-
-@loader: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_loader_get_pixbuf ##### -->
-<para>
-
-</para>
-
-@loader: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_loader_get_animation ##### -->
-<para>
-
-</para>
-
-@loader: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_loader_close ##### -->
-<para>
-
-</para>
-
-@loader: 
-@error: 
-@Returns: 
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
@@ -1,569 +0,0 @@
-<!-- ##### SECTION ./tmpl/from-drawables.sgml:Long_Description ##### -->
-  <para>
-    The functions in this section allow you to take the image data
-    from a GDK drawable and dump it into a #GdkPixbuf.  This can be
-    used for screenshots and other special effects.  Note that these
-    operations can be expensive, since the image data has to be
-    transferred from the X server to the client program and converted.
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/from-drawables.sgml:See_Also ##### -->
-  <para>
-    gdk_image_get().
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/from-drawables.sgml:Short_Description ##### -->
-Getting parts of a drawable's image data into a pixbuf.
-
-
-<!-- ##### SECTION ./tmpl/from-drawables.sgml:Title ##### -->
-Drawables to Pixbufs
-
-
-<!-- ##### SECTION ./tmpl/gnome-canvas-pixbuf.sgml:Long_Description ##### -->
-  <para>
-    This canvas item displays #GdkPixbuf images.  It handles full
-    affine transformations in both GDK and antialiased modes, and also
-    supports the <ulink url="http://www.w3.org">W3C</ulink>'s <ulink
-    url="http://www.w3.org/Graphics/SVG/">SVG</ulink>-like scaling and
-    translation semantics for absolute pixel values.
-  </para>
-
-  <para>
-    #GdkPixbuf structures may be shared among different pixbuf canvas
-    items; the pixbuf item uses #GdkPixbuf's reference counting
-    functions for this.
-  </para>
-
-  <refsect2>
-    <title>Custom Scaling and Translation</title>
-
-    <para>
-      In addition to the normal affine transformations supported by
-      canvas items, the #GnomeCanvasPixbuf item supports independent
-      object arguments for scaling and translation.  This is useful
-      for explicitly setting a size to which the pixbuf's image will
-      be scaled, and for specifying translation offsets that take
-      place in the item's local coordinate system.
-    </para>
-
-    <para>
-      By default, the pixbuf canvas item will attain the size in units
-      of the #GdkPixbuf it contains.  If a #GnomeCanvasPixbuf is
-      configured to use a #GdkPixbuf that has a size of 300 by 200
-      pixels, then the pixbuf item will automatically obtain a size of
-      300 by 200 units in the item's local coordinate system.  If the
-      item is transformed with a scaling transformation of (0.5, 2.0),
-      then the final image size will be of 150 by 400 pixels.
-    </para>
-
-    <para>
-      To set custom width and height values, you must set the <link
-      linkend="GnomeCanvasPixbuf--width-set">width_set</link> or <link
-      linkend="GnomeCanvasPixbuf--height-set">height_set</link>
-      arguments to %TRUE, and then set the <link
-      linkend="GnomeCanvasPixbuf--width">width</link> or <link
-      linkend="GnomeCanvasPixbuf--height">height</link> arguments to
-      the desired values.  The former two arguments control whether
-      the latter two are used when computing the final image's size;
-      they are both %FALSE by default so that the pixbuf item will
-      attain a size in units equal to the size in pixels of the
-      #GdkPixbuf that the item contains.
-    </para>
-
-    <para>
-      The custom translation offsets are controlled by the <link
-      linkend="GnomeCanvasPixbuf--x">x</link> and <link
-      linkend="GnomeCanvasPixbuf--y">y</link> arguments.  The logical
-      upper-left vertex of the image will be translated by the
-      specified distance, aligned with the item's local coordinate
-      system.
-    </para>
-  </refsect2>
-
-  <refsect2>
-    <title>Absolute Pixel Scaling and Translation</title>
-
-    <para>
-      The <ulink url="http://www.w3.org/Graphics/SVG/">Scalable Vector
-      Graphics</ulink> specification (SVG) of the <ulink
-      url="http://www.w3.org">World Wide Web Consortium</ulink> also
-      allows images to be translated and scaled by absolute pixel
-      values that are independent of an item's normal affine
-      transformation.
-    </para>
-
-    <para>
-      Normally, the pixbuf item's translation and scaling arguments
-      are interpreted in units, so they will be modified by the item's
-      affine transformation.  The <link
-      linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>,
-      <link
-      linkend="GnomeCanvasPixbuf--height-in-pixels">height_in_pixels</link>,
-      <link
-      linkend="GnomeCanvasPixbuf--x-in-pixels">x_in_pixels</link>, and
-      <link
-      linkend="GnomeCanvasPixbuf--y-in-pixels">y_in_pixels</link>
-      object arguments can be used to modify this behavior.  If one of
-      these arguments is %TRUE, then the corresponding scaling or
-      translation value will not be affected lengthwise by the pixbuf
-      item's affine transformation.
-    </para>
-
-    <para>
-      For example, consider a pixbuf item whose size is (300, 200).
-      If the item is modified with a scaling transformation of (0.5,
-      2.0) but the <link
-      linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>
-      is set to %TRUE, then the item will appear to be (300, 400)
-      pixels in size.  This means that in this case the item's affine
-      transformation only applies to the height value, while the width
-      value is kept in absolute pixels.
-    </para>
-
-    <para>
-      Likewise, consider a pixbuf item whose (<link
-      linkend="GnomeCanvasPixbuf--x">x</link>, <link
-      linkend="GnomeCanvasPixbuf--y">y</link>) arguments are set to
-      (30, 40).  If the item is then modified by the same scaling
-      transformation of (0.5, 2.0) but the <link
-      linkend="GnomeCanvasPixbuf--y-in-pixels">y_in_pixels</link>
-      argument is set to %TRUE, then the image's upper-left corner
-      will appear to be at position (15, 40).  In this case, the
-      affine transformation is applied only to the x offset, while the
-      y offset is kept in absolute pixels.
-    </para>
-
-    <para>
-      In short, these arguments control whether a particular dimension
-      of a pixbuf item is scaled or not in the normal way by the
-      item's affine transformation.
-    </para>
-  </refsect2>
-
-  <refsect2>
-    <title>Resource Management</title>
-
-    <para>
-      When you set the #GdkPixbuf structure that a #GnomeCanvasPixbuf
-      item will use by setting the <link
-      linkend="GnomeCanvasPixbuf--pixbuf">pixbuf</link> argument, a
-      reference count will be added to that #GdkPixbuf structure.
-      When the pixbuf item no longer needs the #GdkPixbuf structure,
-      such as when the item is destroyed or when a new pixbuf
-      structure is passed to it, then the old #GdkPixbuf structure
-      will be automatically unreferenced.
-    </para>
-
-    <para>
-      This means that if an application just needs to load a pixbuf
-      image and set it into a pixbuf canvas item, it can do the
-      following to &lsquo;forget&rsquo; about the pixbuf structure:
-
-      <programlisting>
-	GdkPixbuf *pixbuf;
-	GnomeCanvasItem *item;
-
-	pixbuf = gdk_pixbuf_new_from_file ("foo.png");
-	g_assert (pixbuf != NULL);
-
-	item = gnome_canvas_item_new (gnome_canvas_root (my_canvas),
-				      gnome_canvas_pixbuf_get_type (),
-				      "pixbuf", pixbuf,
-				      NULL);
-	gdk_pixbuf_unref (pixbuf);
-      </programlisting>
-    </para>
-
-    <para>
-      After this happens, the reference count of the pixbuf structure
-      will be 1:  the gdk_pixbuf_new_from_file() function creates it
-      with a reference count of 1, then setting the <link
-      linkend="GnomeCanvasPixbuf--pixbuf">pixbuf</link> argument of
-      the #GnomeCanvasPixbuf item increases it to 2, and then it is
-      decremented to 1 by the call to gdk_pixbuf_unref().  When the
-      canvas item is destroyed, it will automatically unreference the
-      pixbuf structure again, causing its reference count to drop to
-      zero and thus be freed.
-    </para>
-  </refsect2>
-
-
-<!-- ##### SECTION ./tmpl/gnome-canvas-pixbuf.sgml:See_Also ##### -->
-  <para>
-    #GnomeCanvas, #GdkPixbuf
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/gnome-canvas-pixbuf.sgml:Short_Description ##### -->
-Canvas item to display #GdkPixbuf images.
-
-
-<!-- ##### SECTION ./tmpl/gnome-canvas-pixbuf.sgml:Title ##### -->
-GnomeCanvasPixbuf
-
-
-<!-- ##### SECTION ./tmpl/rendering.sgml:Long_Description ##### -->
-  <para>
-    The &gdk-pixbuf; library provides several convenience functions to
-    render pixbufs to GDK drawables.  It uses the GdkRGB to render the
-    image data.
-  </para>
-
-  <para>
-    At this point there is not a standard alpha channel extension for
-    the X Window System, so it is not possible to use full opacity
-    information when painting images to arbitrary drawables.  The
-    &gdk-pixbuf; convenience functions will threshold the opacity
-    information to create a bi-level clipping mask (black and white),
-    and use that to draw the image onto a drawable.
-  </para>
-
-  <important>
-    <para>
-      Since these functions use GdkRGB for rendering, you must
-      initialize GdkRGB before using any of them.  You can do this by
-      calling gdk_rgb_init() near the beginning of your program.
-    </para>
-  </important>
-
-
-<!-- ##### SECTION ./tmpl/rendering.sgml:See_Also ##### -->
-  <para>
-    GdkRGB
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/rendering.sgml:Short_Description ##### -->
-Rendering a pixbuf to a GDK drawable.
-
-
-<!-- ##### SECTION ./tmpl/rendering.sgml:Title ##### -->
-Rendering
-
-
-<!-- ##### SECTION ./tmpl/xlib-from-drawables.sgml:Long_Description ##### -->
-  <para>
-    The functions in this section allow you to take the image data
-    from an X drawable and dump it into a #GdkPixbuf.  This can be
-    used for screenshots and other special effects.  Note that these
-    operations can be expensive, since the image data has to be
-    transferred from the X server to the client program and converted.
-  </para>
-
-  <para>
-    These functions are analogous to those for the Gdk version of
-    &gdk-pixbuf;.
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/xlib-from-drawables.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/xlib-from-drawables.sgml:Short_Description ##### -->
-Getting parts of an X drawable's image data into a pixbuf.
-
-
-<!-- ##### SECTION ./tmpl/xlib-from-drawables.sgml:Title ##### -->
-X Drawables to Pixbufs
-
-
-<!-- ##### SECTION ./tmpl/xlib-init.sgml:Long_Description ##### -->
-  <para>
-    In addition to the normal Gdk-specific functions, the &gdk-pixbuf;
-    package provides a small library that lets Xlib-only applications
-    use #GdkPixbuf structures and render them to X drawables.  The
-    functions in this section are used to initialize the &gdk-pixbuf;
-    Xlib library.  This library must be initialized near the beginning
-    or the program or before calling any of the other &gdk-pixbuf;
-    Xlib functions; it cannot be initialized automatically since
-    Xlib-only applications do not call gdk_rgb_init() like GNOME
-    applications do.
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/xlib-init.sgml:See_Also ##### -->
-  <para>
-    XlibRGB
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/xlib-init.sgml:Short_Description ##### -->
-Initializing the &gdk-pixbuf; Xlib library.
-
-
-<!-- ##### SECTION ./tmpl/xlib-init.sgml:Title ##### -->
-&gdk-pixbuf; Xlib initialization
-
-
-<!-- ##### SECTION ./tmpl/xlib-rendering.sgml:Long_Description ##### -->
-  <para>
-    The &gdk-pixbuf; Xlib library provides several convenience
-    functions to render pixbufs to X drawables.  It uses XlibRGB to
-    render the image data.
-  </para>
-
-  <para>
-    These functions are analogous to those for the Gdk version of
-    &gdk-pixbuf;.
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/xlib-rendering.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/xlib-rendering.sgml:Short_Description ##### -->
-Rendering a pixbuf to an X drawable.
-
-
-<!-- ##### SECTION ./tmpl/xlib-rendering.sgml:Title ##### -->
-Xlib Rendering
-
-
-<!-- ##### SECTION ./tmpl/xlib-rgb.sgml:Long_Description ##### -->
-  <para>
-    The XlibRGB set of functions is a port of the GdkRGB library to
-    use plain Xlib and X drawables.  You can use these functions to
-    render RGB buffers into drawables very quickly with high-quality
-    dithering.
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/xlib-rgb.sgml:See_Also ##### -->
-  <para>
-    GdkRGB
-  </para>
-
-
-<!-- ##### SECTION ./tmpl/xlib-rgb.sgml:Short_Description ##### -->
-Functions for rendering RGB buffers to X drawables.
-
-
-<!-- ##### SECTION ./tmpl/xlib-rgb.sgml:Title ##### -->
-XlibRGB
-
-
-<!-- ##### MACRO GDK_PIXBUF_LOADER ##### -->
-  <para>
-    Casts a #GtkObject to a #GdkPixbufLoader.
-  </para>
-
-@obj: A GTK+ object.
-
-<!-- ##### MACRO GNOME_CANVAS_PIXBUF ##### -->
-  <para>
-    Casts a #GtkOjbect to a #GnomeCanvasPixbuf.
-  </para>
-
-@obj: A GTK+ object.
-
-<!-- ##### STRUCT GdkPixbufFrame ##### -->
-<para>
- This object describes an individual frame of an animation.
-</para>
-
-
-<!-- ##### ENUM GdkPixbufFrameAction ##### -->
-<para>
-
-</para>
-
-@GDK_PIXBUF_FRAME_RETAIN: 
-@GDK_PIXBUF_FRAME_DISPOSE: 
-@GDK_PIXBUF_FRAME_REVERT: 
-
-<!-- ##### USER_FUNCTION GdkPixbufLastUnref ##### -->
-  <para>
-    A function of this type can be used to override the default
-    operation when a pixbuf loses its last reference, i.e. when
-    gdk_pixbuf_unref() is called on a #GdkPixbuf structure that has a
-    reference count of 1.  This function should determine whether to
-    finalize the pixbuf by calling gdk_pixbuf_finalize(), or whether
-    to just resume normal execution.  The last unref handler for a
-    #GdkPixbuf can be set using the
-    gdk_pixbuf_set_last_unref_handler() function.  By default, pixbufs
-    will be finalized automatically if no last unref handler has been
-    defined.
-  </para>
-
-@pixbuf: The pixbuf that is losing its last reference.
-@data: User closure data.
-
-<!-- ##### ARG GnomeCanvasPixbuf:height ##### -->
-  <para>
-    Indicates the height the pixbuf will be scaled to.  This argument
-    will only be used if the <link
-    linkend="GnomeCanvasPixbuf--height-set">height_set</link> argument
-    is %TRUE.  Works in the same way as the <link
-    linkend="GnomeCanvasPixbuf--width">width</link> argument.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:height-in-pixels ##### -->
-  <para>
-    Works in the same way as the <link
-    linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>
-    argument.  The default is %FALSE.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:height-pixels ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:height-set ##### -->
-  <para>
-    Determines whether the <link
-    linkend="GnomeCanvasPixbuf--height">height</link> argument is
-    taken into account when scaling the pixbuf item.  Works in the
-    same way as the <link
-    linkend="GnomeCanvasPixbuf--width-set">width_set</link> argument.
-    The default is %FALSE.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:pixbuf ##### -->
-  <para>
-    Contains a pointer to a #GdkPixbuf structure that will be used by
-    the pixbuf canvas item as an image source.  When a pixbuf is set
-    its reference count is incremented; if the pixbuf item kept a
-    pointer to another #GdkPixbuf structure, the reference count of
-    this structure will be decremented.  Also, the GdkPixbuf's
-    reference count will automatically be decremented when the
-    #GnomeCanvasPixbuf item is destroyed.  When a pixbuf is queried, a
-    reference count will not be added to the return value; you must do
-    this yourself if you intend to keep the pixbuf structure around.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:width ##### -->
-  <para>
-    Indicates the width the pixbuf will be scaled to.  This argument
-    will only be used if the <link
-    linkend="GnomeCanvasPixbuf--width-set">width_set</link> argument
-    is %TRUE.  If the <link
-    linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>
-    argument is %FALSE, the width will be taken to be in canvas units,
-    and thus will be scaled along with the canvas item's affine
-    transformation.  If width_in_pixels is %TRUE, the width will be
-    taken to be in pixels, and will visually remain a constant size
-    even if the item's affine transformation changes.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:width-in-pixels ##### -->
-  <para>
-    If this argument is %TRUE, then the width of the pixbuf will be
-    considered to be in pixels, that is, it will not be visually
-    scaled even if the item's affine transformation changes.  If this
-    is %FALSE, then the width of the pixbuf will be considered to be
-    in canvas units, and so will be scaled normally by affine
-    transformations.  The default is %FALSE.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:width-pixels ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:width-set ##### -->
-  <para>
-    Determines whether the <link
-    linkend="GnomeCanvasPixbuf--width">width</link> argument is taken
-    into account when scaling the pixbuf item.  If this argument is
-    %FALSE, then the width value of the pixbuf will be used instead.
-    This argument is %FALSE by default.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:x ##### -->
-  <para>
-    Indicates the horizontal translation offset of the pixbuf item's
-    image.  This offset may not actually appear horizontal, since it
-    will be affected by the item's affine transformation.  The default
-    is 0.0.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:x-in-pixels ##### -->
-  <para>
-    If this argument is %TRUE, the pixbuf's translation with respect
-    to its logical origin in item-relative coordinates will be in
-    pixels, that is, the visible offset will not change even if the
-    item's affine transformation changes.  If it is %FALSE, the
-    pixbuf's translation will be taken to be in canvas units, and thus
-    will change along with the item's affine transformation.  The
-    default is %FALSE.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:x-pixels ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:x-set ##### -->
-  <para>
-    Determines whether the <link
-    linkend="GnomeCanvasPixbuf--x">x</link> argument is used to
-    translate the pixbuf from its logical origin in item-relative
-    coordinates.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:y ##### -->
-  <para>
-    Indicates the vertical translation offset of the pixbuf item's
-    image.  Works in the same way as the <link
-    linkend="GnomeCanvasPixbuf--x">x</link> argument.  The default is
-    0.0.
-  </para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:y-in-pixels ##### -->
-  <para>
-    Works in the same way as the <link
-    linkend="GnomeCanvasPixbuf--x-in-pixels">x_in_pixels</link>
-    argument, but controls whether the <link
-    linkend="GnomeCanvasPixbuf--y">y</link> translation offset is
-    scaled or not.  The default is %FALSE.
-  </para>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:y-pixels ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:y-set ##### -->
-  <para>
-    Determines whether the <link
-    linkend="GnomeCanvasPixbuf--y">y</link> argument is used to
-    translate the pixbuf from its logical origin in item-relative
-    coordinates.  Works in the same way as the <link
-    linkend="GnomeCanvasPixbuf--x-set">x_set</link> argument.  The
-    default is %FALSE.
-  </para>
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml
@@ -1,51 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-X Drawables to Pixbufs
-
-<!-- ##### SECTION Short_Description ##### -->
-Getting parts of an X drawable's image data into a pixbuf.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The functions in this section allow you to take the image data
-    from an X drawable and dump it into a #GdkPixbuf.  This can be
-    used for screenshots and other special effects.  Note that these
-    operations can be expensive, since the image data has to be
-    transferred from the X server to the client program and converted.
-  </para>
-
-  <para>
-    These functions are analogous to those for the GDK version of
-    &gdk-pixbuf;.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_xlib_get_from_drawable ##### -->
-<para>
-
-</para>
-
-@dest: 
-@src: 
-@cmap: 
-@visual: 
-@src_x: 
-@src_y: 
-@dest_x: 
-@dest_y: 
-@width: 
-@height: 
-@Returns: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml
@@ -1,49 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-&gdk-pixbuf; Xlib initialization
-
-<!-- ##### SECTION Short_Description ##### -->
-Initializing the &gdk-pixbuf; Xlib library.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    In addition to the normal Gdk-specific functions, the &gdk-pixbuf;
-    package provides a small library that lets Xlib-only applications
-    use #GdkPixbuf structures and render them to X drawables.  The
-    functions in this section are used to initialize the &gdk-pixbuf;
-    Xlib library.  This library must be initialized near the beginning
-    of the program or before calling any of the other &gdk-pixbuf;
-    Xlib functions.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    XlibRGB
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_xlib_init ##### -->
-<para>
-
-</para>
-
-@display: 
-@screen_num: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_xlib_init_with_depth ##### -->
-<para>
-
-</para>
-
-@display: 
-@screen_num: 
-@prefDepth: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml
@@ -1,97 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Xlib Rendering
-
-<!-- ##### SECTION Short_Description ##### -->
-Rendering a pixbuf to an X drawable.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The &gdk-pixbuf; Xlib library provides several convenience
-    functions to render pixbufs to X drawables.  It uses XlibRGB to
-    render the image data.
-  </para>
-
-  <para>
-    These functions are analogous to those for the GDK version of
-    &gdk-pixbuf;.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_xlib_render_threshold_alpha ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@bitmap: 
-@src_x: 
-@src_y: 
-@dest_x: 
-@dest_y: 
-@width: 
-@height: 
-@alpha_threshold: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_xlib_render_to_drawable ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@drawable: 
-@gc: 
-@src_x: 
-@src_y: 
-@dest_x: 
-@dest_y: 
-@width: 
-@height: 
-@dither: 
-@x_dither: 
-@y_dither: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_xlib_render_to_drawable_alpha ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@drawable: 
-@src_x: 
-@src_y: 
-@dest_x: 
-@dest_y: 
-@width: 
-@height: 
-@alpha_mode: 
-@alpha_threshold: 
-@dither: 
-@x_dither: 
-@y_dither: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_xlib_render_pixmap_and_mask ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@pixmap_return: 
-@mask_return: 
-@alpha_threshold: <!--
-Local variables:
-Kode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml
@@ -1,280 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-XlibRGB
-
-<!-- ##### SECTION Short_Description ##### -->
-Rendering RGB buffers to X drawables.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The XlibRGB set of functions is a port of the #GdkRGB library to
-    use plain Xlib and X drawables.  You can use these functions to
-    render RGB buffers into drawables very quickly with high-quality
-    dithering.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    GdkRGB
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT XlibRgbCmap ##### -->
-  <para>
-    FIXME: Describe this.
-  </para>
-
-@colors: FIXME.
-@lut: FIXME.
-
-<!-- ##### ENUM XlibRgbDither ##### -->
-  <para>
-    These values are used to specify which dithering method should be
-    used.  <symbol>XLIB_RGB_DITHER_NONE</symbol> will use no dithering
-    and simply map the colors in an RGB buffer to the closest colors
-    that the display can provide.
-    <symbol>XLIB_RGB_DITHER_NORMAL</symbol> will provide dithering
-    only on pseudocolor displays.
-    <symbol>XLIB_RGB_DITHER_MAX</symbol> will provide dithering on
-    pseudocolor and 16-bit truecolor or &ldquo;high color&rdquo;
-    displays.
-  </para>
-
-@XLIB_RGB_DITHER_NONE: Specifies no dithering.
-@XLIB_RGB_DITHER_NORMAL: Specifies dithering only on pseudocolor
-displays.
-@XLIB_RGB_DITHER_MAX: Specifies dithering on high color displays.
-
-<!-- ##### FUNCTION xlib_rgb_init ##### -->
-<para>
-
-</para>
-
-@display: 
-@screen: 
-
-
-<!-- ##### FUNCTION xlib_rgb_init_with_depth ##### -->
-<para>
-
-</para>
-
-@display: 
-@screen: 
-@prefDepth: 
-
-
-<!-- ##### FUNCTION xlib_rgb_xpixel_from_rgb ##### -->
-<para>
-
-</para>
-
-@rgb: 
-@Returns: 
-
-
-<!-- ##### FUNCTION xlib_rgb_gc_set_foreground ##### -->
-<para>
-
-</para>
-
-@gc: 
-@rgb: 
-
-
-<!-- ##### FUNCTION xlib_rgb_gc_set_background ##### -->
-<para>
-
-</para>
-
-@gc: 
-@rgb: 
-
-
-<!-- ##### FUNCTION xlib_draw_rgb_image ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@gc: 
-@x: 
-@y: 
-@width: 
-@height: 
-@dith: 
-@rgb_buf: 
-@rowstride: 
-
-
-<!-- ##### FUNCTION xlib_draw_rgb_image_dithalign ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@gc: 
-@x: 
-@y: 
-@width: 
-@height: 
-@dith: 
-@rgb_buf: 
-@rowstride: 
-@xdith: 
-@ydith: 
-
-
-<!-- ##### FUNCTION xlib_draw_rgb_32_image ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@gc: 
-@x: 
-@y: 
-@width: 
-@height: 
-@dith: 
-@buf: 
-@rowstride: 
-
-
-<!-- ##### FUNCTION xlib_draw_gray_image ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@gc: 
-@x: 
-@y: 
-@width: 
-@height: 
-@dith: 
-@buf: 
-@rowstride: 
-
-
-<!-- ##### FUNCTION xlib_rgb_cmap_new ##### -->
-<para>
-
-</para>
-
-@colors: 
-@n_colors: 
-@Returns: 
-
-
-<!-- ##### FUNCTION xlib_rgb_cmap_free ##### -->
-<para>
-
-</para>
-
-@cmap: 
-
-
-<!-- ##### FUNCTION xlib_draw_indexed_image ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@gc: 
-@x: 
-@y: 
-@width: 
-@height: 
-@dith: 
-@buf: 
-@rowstride: 
-@cmap: 
-
-
-<!-- ##### FUNCTION xlib_rgb_ditherable ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION xlib_rgb_set_verbose ##### -->
-<para>
-
-</para>
-
-@verbose: 
-
-
-<!-- ##### FUNCTION xlib_rgb_set_install ##### -->
-<para>
-
-</para>
-
-@install: 
-
-
-<!-- ##### FUNCTION xlib_rgb_set_min_colors ##### -->
-<para>
-
-</para>
-
-@min_colors: 
-
-
-<!-- ##### FUNCTION xlib_rgb_get_cmap ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION xlib_rgb_get_visual ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION xlib_rgb_get_visual_info ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION xlib_rgb_get_depth ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION xlib_rgb_get_display ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION xlib_rgb_get_screen ##### -->
-<para>
-
-</para>
-
-@Returns: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
@@ -1,291 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-The GdkPixbuf Structure
-
-<!-- ##### SECTION Short_Description ##### -->
-Information that describes an image.
-
-<!-- ##### SECTION Long_Description ##### -->
-
-  <para>
-    The <structname>GdkPixbuf</structname> structure contains
-    information that describes an image in memory.
-  </para>
-
-  <section id="image-data">
-    <title>Image Data</title>
-
-    <para>
-      Image data in a pixbuf is stored in memory in uncompressed,
-      packed format.  Rows in the image are stored top to bottom, and
-      in each row pixels are stored from left to right.  There may be
-      padding at the end of a row.  The "rowstride" value of a pixbuf,
-      as returned by gdk_pixbuf_get_rowstride(), indicates the number
-      of bytes between rows.
-    </para>
-
-    <example id="put-pixel">
-      <title>put_pixel(<!-- -->) example</title>
-
-      <para>
-	The following code illustrates a simple put_pixel(<!-- -->)
-	function for RGB pixbufs with 8 bits per channel with an alpha
-	channel.  It is not included in the gdk-pixbuf library for
-	performance reasons; rather than making several function calls
-	for each pixel, your own code can take shortcuts.
-      </para>
-
-      <programlisting>
-static void
-put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blue, guchar alpha)
-{
-  int width, height, rowstride, n_channels;
-  guchar *pixels, *p;
-
-  n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-
-  g_assert (gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB);
-  g_assert (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8);
-  g_assert (gdk_pixbuf_get_has_alpha (pixbuf));
-  g_assert (n_channels == 4);
-
-  width = gdk_pixbuf_get_width (pixbuf);
-  height = gdk_pixbuf_get_height (pixbuf);
-
-  g_assert (x &gt;= 0 &amp;&amp; x &lt; width);
-  g_assert (y &gt;= 0 &amp;&amp; y &lt; height);
-
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-
-  p = pixels + y * rowstride + x * n_channels;
-  p[0] = red;
-  p[1] = green;
-  p[2] = blue;
-  p[3] = alpha;
-}
-      </programlisting>
-
-      <para>
-	This function will not work for pixbufs with images that are
-	other than 8 bits per sample or channel, but it will work for
-	most of the pixbufs that GTK+ uses.
-      </para>
-    </example>
-
-    <note>
-      <para>
-	If you are doing memcpy() of raw pixbuf data, note that the
-	last row in the pixbuf may not be as wide as the full
-	rowstride, but rather just as wide as the pixel data needs to
-	be.  That is, it is unsafe to do <literal>memcpy (dest,
-	pixels, rowstride * height)</literal> to copy a whole pixbuf.
-	Use gdk_pixbuf_copy() instead, or compute the width in bytes
-	of the last row as <literal>width * ((n_channels *
-	bits_per_sample + 7) / 8)</literal>.
-      </para>
-    </note>
-  </section>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### ENUM GdkPixbufError ##### -->
-<para>
-An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;
-operations can cause errors in this domain, or in the #G_FILE_ERROR
-domain.
-</para>
-
-@GDK_PIXBUF_ERROR_CORRUPT_IMAGE: An image file was broken somehow.
-@GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY: Not enough memory.
-@GDK_PIXBUF_ERROR_BAD_OPTION: A bad option was passed to a pixbuf save module.
-@GDK_PIXBUF_ERROR_UNKNOWN_TYPE: Unknown image type.
-@GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION: Don't know how to perform the
-given operation on the type of image at hand.
-@GDK_PIXBUF_ERROR_FAILED: Generic failure code, something went wrong.
-
-<!-- ##### MACRO GDK_PIXBUF_ERROR ##### -->
-<para>
-Error domain used for pixbuf operations. Indicates that the error code
-will be in the #GdkPixbufError enumeration. See #GError for
-information on error domains and error codes.
-</para>
-
-
-
-<!-- ##### ENUM GdkColorspace ##### -->
-  <para>
-    This enumeration defines the color spaces that are supported by
-    the &gdk-pixbuf; library.  Currently only RGB is supported.
-  </para>
-
-@GDK_COLORSPACE_RGB: Indicates a red/green/blue additive color space.
-
-<!-- ##### ENUM GdkPixbufAlphaMode ##### -->
-  <para>
-    These values can be passed to
-    gdk_pixbuf_render_to_drawable_alpha() to control how the alpha
-    channel of an image should be handled.  This function can create a
-    bilevel clipping mask (black and white) and use it while painting
-    the image.  In the future, when the X Window System gets an alpha
-    channel extension, it will be possible to do full alpha
-    compositing onto arbitrary drawables.  For now both cases fall
-    back to a bilevel clipping mask.
-  </para>
-
-@GDK_PIXBUF_ALPHA_BILEVEL: A bilevel clipping mask (black and white)
-will be created and used to draw the image.  Pixels below 0.5 opacity
-will be considered fully transparent, and all others will be
-considered fully opaque.
-@GDK_PIXBUF_ALPHA_FULL: For now falls back to #GDK_PIXBUF_ALPHA_BILEVEL.
-In the future it will do full alpha compositing.
-
-<!-- ##### STRUCT GdkPixbuf ##### -->
-  <para>
-    This is the main structure in the &gdk-pixbuf; library.  It is
-    used to represent images.  It contains information about the
-    image's pixel data, its color space, bits per sample, width and
-    height, and the rowstride (the number of bytes between the start of
-    one row and the start of the next). 
-  </para>
-
-
-<!-- ##### ARG GdkPixbuf:bits-per-sample ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:colorspace ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:has-alpha ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:n-channels ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:pixels ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:rowstride ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:width ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gdk_pixbuf_get_colorspace ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_n_channels ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_has_alpha ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_bits_per_sample ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_pixels ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_width ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_height ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_rowstride ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_option ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@key: 
-@Returns: 
-
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2")
-End:
-->
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
@@ -1,103 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Initialization and Versions
-
-<!-- ##### SECTION Short_Description ##### -->
-
-Library version numbers.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-These macros and variables let you check the version of &gdk-pixbuf;
-you're linking against.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### VARIABLE gdk_pixbuf_version ##### -->
-<para>
-Contains the full version of the &gdk-pixbuf; library as a string.
-This is the version currently in use by a running program.
-</para>
-
-
-<!-- ##### VARIABLE gdk_pixbuf_major_version ##### -->
-<para>
-The major version number of the &gdk-pixbuf; library.  (e.g. in 
-&gdk-pixbuf; version 1.2.5 this is 1.) 
-</para>
-
-<para>
-This variable is in the library, so represents the
-&gdk-pixbuf; library you have linked against. Contrast with the
-#GDK_PIXBUF_MAJOR macro, which represents the major version of the
-&gdk-pixbuf; headers you have included.
-</para>
-
-
-<!-- ##### VARIABLE gdk_pixbuf_minor_version ##### -->
-<para>
-The minor version number of the &gdk-pixbuf; library.  (e.g. in 
-&gdk-pixbuf; version 1.2.5 this is 2.) 
-</para>
-
-<para>
-This variable is in the library, so represents the
-&gdk-pixbuf; library you have linked against. Contrast with the
-#GDK_PIXBUF_MINOR macro, which represents the minor version of the
-&gdk-pixbuf; headers you have included.
-</para>
-
-
-<!-- ##### VARIABLE gdk_pixbuf_micro_version ##### -->
-<para>
-The micro version number of the &gdk-pixbuf; library.  (e.g. in 
-&gdk-pixbuf; version 1.2.5 this is 5.) 
-</para>
-
-<para>
-This variable is in the library, so represents the
-&gdk-pixbuf; library you have linked against. Contrast with the
-#GDK_PIXBUF_MICRO macro, which represents the micro version of the
-&gdk-pixbuf; headers you have included.
-</para>
-
-
-<!-- ##### MACRO GDK_PIXBUF_VERSION ##### -->
-<para>
-Contains the full version of the &gdk-pixbuf; header as a string.
-This is the version being compiled against; contrast with
-#gdk_pixbuf_version.
-</para>
-
-
-
-<!-- ##### MACRO GDK_PIXBUF_MAJOR ##### -->
-<para>
-Major version of &gdk-pixbuf; library, that is the first "0" in
-"0.8.0" for example.
-</para>
-
-
-
-<!-- ##### MACRO GDK_PIXBUF_MINOR ##### -->
-<para>
-Minor version of &gdk-pixbuf; library, that is the "8" in
-"0.8.0" for example.
-</para>
-
-
-
-<!-- ##### MACRO GDK_PIXBUF_MICRO ##### -->
-<para>
-Micro version of &gdk-pixbuf; library, that is the last "0" in
-"0.8.0" for example.
-</para>
-
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/inline.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/inline.sgml
@@ -1,134 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Inline data
-
-<!-- ##### SECTION Short_Description ##### -->
-Functions for inlined pixbuf handling.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Using #GdkPixdata, images can be compiled into an application,
-making it unnecessary to refer to external image files at runtime.
-&gdk-pixbuf; includes a utility named gdk-pixbuf-csource, which 
-can be used to convert image files into #GdkPixdata structures suitable
-for inclusion in C sources. To convert the #GdkPixdata structures back 
-into #GdkPixbuf<!-- -->s, use gdk_pixbuf_from_pixdata.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GdkPixdata ##### -->
-  <para>
-
-  </para>
-
-@magic: 
-@length: 
-@pixdata_type: 
-@rowstride: 
-@width: 
-@height: 
-@pixel_data: 
-
-<!-- ##### ENUM GdkPixdataType ##### -->
-  <para>
-
-  </para>
-
-@GDK_PIXDATA_COLOR_TYPE_RGB: 
-@GDK_PIXDATA_COLOR_TYPE_RGBA: 
-@GDK_PIXDATA_COLOR_TYPE_MASK: 
-@GDK_PIXDATA_SAMPLE_WIDTH_8: 
-@GDK_PIXDATA_SAMPLE_WIDTH_MASK: 
-@GDK_PIXDATA_ENCODING_RAW: 
-@GDK_PIXDATA_ENCODING_RLE: 
-@GDK_PIXDATA_ENCODING_MASK: 
-
-<!-- ##### ENUM GdkPixdataDumpType ##### -->
-  <para>
-
-  </para>
-
-@GDK_PIXDATA_DUMP_PIXDATA_STREAM: 
-@GDK_PIXDATA_DUMP_PIXDATA_STRUCT: 
-@GDK_PIXDATA_DUMP_MACROS: 
-@GDK_PIXDATA_DUMP_GTYPES: 
-@GDK_PIXDATA_DUMP_CTYPES: 
-@GDK_PIXDATA_DUMP_STATIC: 
-@GDK_PIXDATA_DUMP_CONST: 
-@GDK_PIXDATA_DUMP_RLE_DECODER: 
-
-<!-- ##### MACRO GDK_PIXBUF_MAGIC_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GDK_PIXDATA_HEADER_LENGTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION gdk_pixdata_from_pixbuf ##### -->
-<para>
-
-</para>
-
-@pixdata: 
-@pixbuf: 
-@use_rle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_from_pixdata ##### -->
-<para>
-
-</para>
-
-@pixdata: 
-@copy_pixels: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixdata_serialize ##### -->
-<para>
-
-</para>
-
-@pixdata: 
-@stream_length_p: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixdata_deserialize ##### -->
-<para>
-
-</para>
-
-@pixdata: 
-@stream_length: 
-@stream: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixdata_to_csource ##### -->
-<para>
-
-</para>
-
-@pixdata: 
-@name: 
-@dump_type: 
-@Returns: 
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
@@ -1,378 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Module Interface
-
-<!-- ##### SECTION Short_Description ##### -->
-Extending &gdk-pixbuf;
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-If &gdk-pixbuf; has been compiled with GModule support, it can be extended by
-modules which can load (and perhaps also save) new image and animation
-formats. Each loadable module must export a
-#GdkPixbufModuleFillInfoFunc function named <function>fill_info</function> and
-a #GdkPixbufModuleFillVtableFunc function named
-<function>fill_vtable</function>.
-</para>
-
-<para>
-In order to make format-checking work before actually loading the modules
-(which may require dlopening image libraries), modules export their 
-signatures (and other information) via the <function>fill_info</function>
-function. An external utility, <command>gdk-pixbuf-query-loaders</command>, 
-uses this to create a text file containing a list of all available loaders and 
-their signatures. This file is then read at runtime by &gdk-pixbuf; to obtain
-the list of available loaders and their signatures. 
-</para>
-
-<para>
-Modules may only implement a subset of the functionality available via
-#GdkPixbufModule. If a particular functionality is not implemented, the
-<function>fill_vtable</function> function will simply not set the corresponding
-function pointers of the #GdkPixbufModule structure. If a module supports
-incremental loading (i.e. provides #begin_load, #stop_load and
-#load_increment), it doesn't have to implement #load, since &gdk-pixbuf; can 
-supply a generic #load implementation wrapping the incremental loading. 
-</para>
-
-<para>
-Installing a module is a two-step process:
-<itemizedlist>
-<listitem><para>copy the module file(s) to the loader directory (normally
-<filename><replaceable>libdir</replaceable>/gtk-2.0/<replaceable>version</replaceable>/loaders</filename>,
-unless overridden by the environment variable
-<envar>GDK_PIXBUF_MODULEDIR</envar>) 
-</para></listitem>
-<listitem><para>call <command>gdk-pixbuf-query-loaders</command> to update the
-module file (normally
-<filename><replaceable>sysconfdir</replaceable>/gtk-2.0/gdk-pixbuf.loaders</filename>,
-unless overridden by the environment variable
-<envar>GDK_PIXBUF_MODULE_FILE</envar>)
-</para></listitem>
-</itemizedlist>
-</para>
-
-<para>
-The &gdk-pixbuf; interfaces needed for implementing modules are contained in 
-<filename>gdk-pixbuf-io.h</filename> (and
-<filename>gdk-pixbuf-animation.h</filename> if the module supports animations).
-They are not covered by the same stability guarantees as the regular 
-&gdk-pixbuf; API. To underline this fact, they are protected by 
-<literal>#ifdef GDK_PIXBUF_ENABLE_BACKEND</literal>.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_set_option ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@key: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_formats ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_name ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_description ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_mime_types ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_extensions ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_is_writable ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_is_scalable ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_is_disabled ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_set_disabled ##### -->
-<para>
-
-</para>
-
-@format: 
-@disabled: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_license ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### STRUCT GdkPixbufFormat ##### -->
-<para>
-A #GdkPixbufFormat contains information about the image format accepted by a
-module. Only modules should access the fields directly, applications should
-use the <function>gdk_pixbuf_format_*</function> functions.
-</para>
-
-@name: the name of the image format.
-@signature: the signature of the module.
-@domain: the message domain for the @description.
-@description: a description of the image format.
-@mime_types: a %NULL-terminated array of MIME types for the image format.
-@extensions: a %NULL-terminated array of typical filename extensions for the
-image format.
-@flags: a combination of #GdkPixbufFormatFlags.
-@disabled: a boolean determining whether the loader is disabled.
-@license: a string containing license information, typically set to 
- shorthands like "GPL", "LGPL", etc.
-@Since: 2.2
-
-<!-- ##### ENUM GdkPixbufFormatFlags ##### -->
-<para>
-Flags which allow a module to specify further details about the supported
-operations.
-</para>
-
-@GDK_PIXBUF_FORMAT_WRITABLE: the module can write out images in the format.
-@GDK_PIXBUF_FORMAT_SCALABLE: the image format is scalable
-@GDK_PIXBUF_FORMAT_THREADSAFE: the module is threadsafe. If this flag is not
-  set, &gdk-pixbuf; will use a lock to prevent multiple threads from using
-  this module at the same time. (Since 2.6)
-@Since: 2.2
-
-<!-- ##### STRUCT GdkPixbufModulePattern ##### -->
-<para>
-The signature of a module is a set of prefixes. Prefixes are encoded as
-pairs of ordinary strings, where the second string, called the mask, if 
-not %NULL, must be of the same length as the first one and may contain 
-' ', '!', 'x', 'z', and 'n' to indicate bytes that must be matched, 
-not matched, "don't-care"-bytes, zeros and non-zeros. 
-Each prefix has an associated integer that describes the relevance of 
-the prefix, with 0 meaning a mismatch and 100 a "perfect match".
-</para>
-<para>
-Starting with &gdk-pixbuf; 2.8, the first byte of the mask may be '*', 
-indicating an unanchored pattern that matches not only at the beginning, 
-but also in the middle. Versions prior to 2.8 will interpret the '*'
-like an 'x'. 
-</para>
-<para>
-The signature of a module is stored as an array of 
-#GdkPixbufModulePattern<!-- -->s. The array is terminated by a pattern
-where the @prefix is %NULL.
-</para>
-
-<informalexample><programlisting>
-GdkPixbufModulePattern *signature[] = {
-  { "abcdx", " !x z", 100 },
-  { "bla", NULL,  90 },
-  { NULL, NULL, 0 }
-};
-</programlisting>
-The example matches e.g. "auud\0" with relevance 100, and "blau" with 
-relevance 90.</informalexample>
-
-@prefix: the prefix for this pattern
-@mask: mask containing bytes which modify how the prefix is matched against
-  test data
-@relevance: relevance of this pattern
-@Since: 2.2
-
-<!-- ##### USER_FUNCTION GdkPixbufModuleFillVtableFunc ##### -->
-<para>
-Defines the type of the function used to set the vtable of a 
-#GdkPixbufModule when it is loaded. 
-</para>
-
-@module: a #GdkPixbufModule.
-@Since: 2.2
-
-
-<!-- ##### USER_FUNCTION GdkPixbufModuleFillInfoFunc ##### -->
-<para>
-Defines the type of the function used to fill a 
-#GdkPixbufFormat structure with information about a module.
-</para>
-
-@info: a #GdkPixbufFormat.
-@Since: 2.2
-
-
-<!-- ##### USER_FUNCTION GdkPixbufModuleSizeFunc ##### -->
-<para>
-Defines the type of the function that gets called once the size 
-of the loaded image is known.
-</para>
-<para>
-The function is expected to set @width and @height to the desired
-size to which the image should be scaled. If a module has no efficient 
-way to achieve the desired scaling during the loading of the image, it may
-either ignore the size request, or only approximate it -- &gdk-pixbuf; will
-then perform the required scaling on the completely loaded image. 
-</para>
-<para>
-If the function sets @width or @height to zero, the module should interpret
-this as a hint that it will be closed soon and shouldn't allocate further 
-resources. This convention is used to implement gdk_pixbuf_get_file_info()
-efficiently.
-</para>
-
-@width: pointer to a location containing the current image width
-@height: pointer to a location containing the current image height
-@user_data: the loader.
-@Since: 2.2
-
-
-<!-- ##### USER_FUNCTION GdkPixbufModulePreparedFunc ##### -->
-<para>
-Defines the type of the function that gets called once the initial 
-setup of @pixbuf is done.
-</para>
-<para>
-#GdkPixbufLoader uses a function of this type to emit the 
-"<link linkend="GdkPixbufLoader-area-prepared">area_prepared</link>"
-signal.
-</para>
-
-@pixbuf: the #GdkPixbuf that is currently being loaded.
-@anim: if an animation is being loaded, the #GdkPixbufAnimation, else %NULL.
-@user_data: the loader.
-@Since: 2.2
-
-
-<!-- ##### USER_FUNCTION GdkPixbufModuleUpdatedFunc ##### -->
-<para>
-Defines the type of the function that gets called every time a region
-of @pixbuf is updated.
-</para>
-<para>
-#GdkPixbufLoader uses a function of this type to emit the 
-"<link linkend="GdkPixbufLoader-area-updated">area_updated</link>"
-signal.
-</para>
-
-@pixbuf: the #GdkPixbuf that is currently being loaded.
-@x: the X origin of the updated area.
-@y: the Y origin of the updated area.
-@width: the width of the updated area.
-@height: the height of the updated area.
-@user_data: the loader.
-@Since: 2.2
-
-
-<!-- ##### STRUCT GdkPixbufModule ##### -->
-<para>
-A #GdkPixbufModule contains the necessary functions to load and save 
-images in a certain file format. 
-</para>
-<para>
-A #GdkPixbufModule can be loaded dynamically from a #GModule.
-Each loadable module must contain a #GdkPixbufModuleFillVtableFunc function 
-named <function>fill_vtable</function>, which will get called when the module
-is loaded and must set the function pointers of the #GdkPixbufModule. 
-</para>
-
-@module_name: the name of the module, usually the same as the
-  usual file extension for images of this type, eg. "xpm", "jpeg" or "png".
-@module_path: the path from which the module is loaded.
-@module: the loaded #GModule.
-@info: a #GdkPixbufFormat holding information about the module.
-@load: loads an image from a file.
-@load_xpm_data: loads an image from data in memory.
-@begin_load: begins an incremental load.
-@stop_load: stops an incremental load.
-@load_increment: continues an incremental load.
-@load_animation: loads an animation from a file.
-@save: saves a #GdkPixbuf to a file.
-@save_to_callback: saves a #GdkPixbuf by calling the given #GdkPixbufSaveFunc.
-
-<!-- ##### STRUCT GdkPixbufAnimationClass ##### -->
-<para>
-Modules supporting animations must derive a type from 
-#GdkPixbufAnimation, providing suitable implementations of the 
-virtual functions.
-</para>
-
-@parent_class: the parent class
-@is_static_image: returns whether the given animation is just a static image.
-@get_static_image: returns a static image representing the given animation.
-@get_size: fills @width and @height with the frame size of the animation.
-@get_iter: returns an iterator for the given animation.
-
-<!-- ##### STRUCT GdkPixbufAnimationIterClass ##### -->
-<para>
-Modules supporting animations must derive a type from 
-#GdkPixbufAnimationIter, providing suitable implementations of the 
-virtual functions.
-</para>
-
-@parent_class: the parent class
-@get_delay_time: returns the time in milliseconds that the current frame 
-  should be shown.
-@get_pixbuf: returns the current frame.
-@on_currently_loading_frame: returns whether the current frame of @iter is 
-being loaded.
-@advance: advances the iterator to @current_time, possibly changing the 
-current frame.
-
--- a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
@@ -1,81 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Reference Counting and Memory Mangement
-
-<!-- ##### SECTION Short_Description ##### -->
-
-Functions for reference counting and memory management on pixbufs.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    #GdkPixbuf structures are reference counted.  This means that an
-    application can share a single pixbuf among many parts of the
-    code.  When a piece of the program needs to keep a pointer to a
-    pixbuf, it should add a reference to it by calling g_object_ref().
-    When it no longer needs the pixbuf, it should subtract a reference
-    by calling g_object_unref().  The pixbuf will be destroyed when
-    its reference count drops to zero.  Newly-created #GdkPixbuf
-    structures start with a reference count of one.
-  </para>
-
-  <note>
-    <para>
-      As #GdkPixbuf is derived from #GObject now, gdk_pixbuf_ref() and
-      gdk_pixbuf_unref() are deprecated in favour of g_object_ref()
-      and g_object_unref () resp.
-    </para>
-  </note>
-
-  <para>
-    <emphasis>Finalizing</emphasis> a pixbuf means to free its pixel
-    data and to free the #GdkPixbuf structure itself.  Most of the
-    library functions that create #GdkPixbuf structures create the
-    pixel data by themselves and define the way it should be freed;
-    you do not need to worry about those.  The only function that lets
-    you specify how to free the pixel data is
-    gdk_pixbuf_new_from_data().  Since you pass it a pre-allocated
-    pixel buffer, you must also specify a way to free that data.  This
-    is done with a function of type #GdkPixbufDestroyNotify.  When a
-    pixbuf created with gdk_pixbuf_new_from_data() is finalized, your
-    destroy notification function will be called, and it is its
-    responsibility to free the pixel array.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    #GdkPixbuf, gdk_pixbuf_new_from_data().
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
-  <para>
-
-  </para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_unref ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-
-
-<!-- ##### USER_FUNCTION GdkPixbufDestroyNotify ##### -->
-  <para>
-    A function of this type is responsible for freeing the pixel array
-    of a pixbuf.  The gdk_pixbuf_new_from_data() function lets you
-    pass in a pre-allocated pixel array so that a pixbuf can be
-    created from it; in this case you will need to pass in a function
-    of #GdkPixbufDestroyNotify so that the pixel data can be freed
-    when the pixbuf is finalized.
-  </para>
-
-@pixels: The pixel array of the pixbuf that is being finalized.
-@data: User closure data.
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
@@ -1,243 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Scaling
-
-<!-- ##### SECTION Short_Description ##### -->
-Scaling pixbufs and scaling and compositing pixbufs
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The &gdk-pixbuf; contains functions to scale pixbufs, to scale
-    pixbufs and composite against an existing image, and to scale
-    pixbufs and composite against a solid color or checkerboard.
-    Compositing a checkerboard is a common way to show an image with
-    an alpha channel in image-viewing and editing software.
-  </para>
-
-  <para>
-    Since the full-featured functions (gdk_pixbuf_scale(),
-    gdk_pixbuf_composite(), and gdk_pixbuf_composite_color()) are
-    rather complex to use and have many arguments, two simple
-    convenience functions are provided, gdk_pixbuf_scale_simple() and
-    gdk_pixbuf_composite_color_simple() which create a new pixbuf of a
-    given size, scale an original image to fit, and then return the
-    new pixbuf.
-  </para>
-
-  <para>
-   Scaling and compositing functions take advantage of MMX hardware
-   acceleration on systems where MMX is supported.  If gdk-pixbuf is built
-   with the Sun mediaLib library, these functions are instead accelerated
-   using mediaLib, which provides hardware acceleration on Intel, AMD,
-   and Sparc chipsets.  If desired, mediaLib support can be turned off by
-   setting the GDK_DISABLE_MEDIALIB environment variable.  
-  </para>
-
-  <para>
-    The following example demonstrates handling an expose event by
-    rendering the appropriate area of a source image (which is scaled
-    to fit the widget) onto the widget's window.  The source image is
-    rendered against a checkerboard, which provides a visual
-    representation of the alpha channel if the image has one. If the
-    image doesn't have an alpha channel, calling
-    gdk_pixbuf_composite_color() function has exactly the same effect
-    as calling gdk_pixbuf_scale().
-  </para>
-
-  <example>
-  <title>Handling an expose event.</title>
-  <programlisting>
-gboolean
-expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-  GdkPixbuf *dest;
-
-  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);
-
-  gdk_pixbuf_composite_color (pixbuf, dest,
-                              0, 0, event->area.width, event->area.height,
-                              -event->area.x, -event->area.y,
-                              (double) widget->allocation.width / gdk_pixbuf_get_width (pixbuf),
-                              (double) widget->allocation.height / gdk_pixbuf_get_height (pixbuf),
-                              GDK_INTERP_BILINEAR, 255,
-                              event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
-
-  gdk_draw_pixbuf (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL], dest,
-                   0, 0, event->area.x, event->area.y,
-                   event->area.width, event->area.height,
-                   GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
-  
-  gdk_pixbuf_unref (dest);
-  
-  return TRUE;
-}
-  </programlisting>
-  </example>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    <link linkend="gdk-GdkRGB">GdkRGB</link>.
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### ENUM GdkInterpType ##### -->
-  <para>
-    This enumeration describes the different interpolation modes that
-    can be used with the scaling functions. @GDK_INTERP_NEAREST is 
-    the fastest scaling method, but has horrible quality when 
-    scaling down. @GDK_INTERP_BILINEAR is the best choice if you 
-    aren't sure what to choose, it has a good speed/quality balance.
-
-    <note>
-      <para>
-	Cubic filtering is missing from the list; hyperbolic
-	interpolation is just as fast and results in higher quality.
-      </para>
-    </note>
-  </para>
-
-@GDK_INTERP_NEAREST: Nearest neighbor sampling; this is the fastest
-and lowest quality mode. Quality is normally unacceptable when scaling 
-down, but may be OK when scaling up.
-@GDK_INTERP_TILES: This is an accurate simulation of the PostScript
-image operator without any interpolation enabled.  Each pixel is
-rendered as a tiny parallelogram of solid color, the edges of which
-are implemented with antialiasing.  It resembles nearest neighbor for
-enlargement, and bilinear for reduction.
-@GDK_INTERP_BILINEAR: Best quality/speed balance; use this mode by
-default. Bilinear interpolation.  For enlargement, it is
-equivalent to point-sampling the ideal bilinear-interpolated image.
-For reduction, it is equivalent to laying down small tiles and
-integrating over the coverage area.
-@GDK_INTERP_HYPER: This is the slowest and highest quality
-reconstruction function. It is derived from the hyperbolic filters in
-Wolberg's "Digital Image Warping", and is formally defined as the
-hyperbolic-filter sampling the ideal hyperbolic-filter interpolated
-image (the filter is designed to be idempotent for 1:1 pixel mapping).
-
-<!-- ##### FUNCTION gdk_pixbuf_scale_simple ##### -->
-<para>
-
-</para>
-
-@src: 
-@dest_width: 
-@dest_height: 
-@interp_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_scale ##### -->
-<para>
-
-</para>
-
-@src: 
-@dest: 
-@dest_x: 
-@dest_y: 
-@dest_width: 
-@dest_height: 
-@offset_x: 
-@offset_y: 
-@scale_x: 
-@scale_y: 
-@interp_type: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_composite_color_simple ##### -->
-<para>
-
-</para>
-
-@src: 
-@dest_width: 
-@dest_height: 
-@interp_type: 
-@overall_alpha: 
-@check_size: 
-@color1: 
-@color2: 
-@Returns: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_composite ##### -->
-<para>
-
-</para>
-
-@src: 
-@dest: 
-@dest_x: 
-@dest_y: 
-@dest_width: 
-@dest_height: 
-@offset_x: 
-@offset_y: 
-@scale_x: 
-@scale_y: 
-@interp_type: 
-@overall_alpha: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_composite_color ##### -->
-<para>
-
-</para>
-
-@src: 
-@dest: 
-@dest_x: 
-@dest_y: 
-@dest_width: 
-@dest_height: 
-@offset_x: 
-@offset_y: 
-@scale_x: 
-@scale_y: 
-@interp_type: 
-@overall_alpha: 
-@check_x: 
-@check_y: 
-@check_size: 
-@color1: 
-@color2: 
-
-
-<!-- ##### ENUM GdkPixbufRotation ##### -->
-<para>
-The possible rotations which can be passed to gdk_pixbuf_rotate_simple().
-To make them easier to use, their numerical values are the actual degrees.
-</para>
-
-@GDK_PIXBUF_ROTATE_NONE: No rotation.
-@GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE: Rotate by 90 degrees.
-@GDK_PIXBUF_ROTATE_UPSIDEDOWN: Rotate by 180 degrees.
-@GDK_PIXBUF_ROTATE_CLOCKWISE: Rotate by 270 degrees.
-
-<!-- ##### FUNCTION gdk_pixbuf_rotate_simple ##### -->
-<para>
-
-</para>
-
-@src: 
-@angle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_flip ##### -->
-<para>
-
-</para>
-
-@src: 
-@horizontal: 
-@Returns: 
-
-
--- a/docs/reference/gdk-pixbuf/tmpl/util.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/util.sgml
@@ -1,84 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Utilities
-
-<!-- ##### SECTION Short_Description ##### -->
-Utility and miscellaneous convenience functions.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    These functions provide miscellaneous utilities for manipulating
-    pixbufs.  The pixel data in pixbufs may of course be manipulated
-    directly by applications, but several common operations can be
-    performed by these functions instead.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    #GdkPixbuf
-  </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_add_alpha ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@substitute_color: 
-@r: 
-@g: 
-@b: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_copy_area ##### -->
-<para>
-
-</para>
-
-@src_pixbuf: 
-@src_x: 
-@src_y: 
-@width: 
-@height: 
-@dest_pixbuf: 
-@dest_x: 
-@dest_y: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_saturate_and_pixelate ##### -->
-<para>
-
-</para>
-
-@src: 
-@dest: 
-@saturation: 
-@pixelate: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_apply_embedded_orientation ##### -->
-<para>
-
-</para>
-
-@src: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_fill ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@pixel: 
-
-
--- a/docs/reference/gdk-pixbuf/version.xml.in
+++ b/docs/reference/gdk-pixbuf/version.xml.in
@@ -1 +0,0 @@
-@GTK_VERSION@
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 AUTOMAKE_OPTIONS = 1.6

 # The name of the module.
-DOC_MODULE=gdk
+DOC_MODULE=gdk3

 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-docs.sgml
@@ -21,17 +21,14 @@ CFILE_GLOB=$(top_srcdir)/gdk/*.c

 # Header files to ignore when scanning
 IGNORE_HFILES=			\
-	gdkalias.h		\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
 	gdkinternals.h		\
 	gdkprivate.h		\
 	gdkpoly-generic.h	\
-	gdkregion-generic.h	\
 	keyname-table.h		\
 	win32 			\
-	directfb		\
 	x11			\
 	quartz

@@ -142,7 +139,7 @@ HTML_IMAGES =				\
 	images/xterm.png 

 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html \
+FIXXREF_OPTIONS= \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
 	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -24,12 +24,9 @@
    <xi:include href="xml/gdkscreen.xml" />

    <xi:include href="xml/regions.xml" />
-    <xi:include href="xml/gcs.xml" />
    <xi:include href="xml/drawing.xml" />

    <xi:include href="xml/pixmaps.xml" />
-    <xi:include href="xml/rgb.xml" />
-    <xi:include href="xml/images.xml" />
    <xi:include href="xml/pixbufs.xml" />

    <xi:include href="xml/colors.xml" />
@@ -53,7 +50,7 @@
    <xi:include href="xml/threads.xml" />

    <xi:include href="xml/input.xml" />
-    <xi:include href="xml/input_devices.xml" />
+    <xi:include href="xml/gdkdevicemanager.xml" />

    <xi:include href="xml/pango_interaction.xml" />
    <xi:include href="xml/cairo_interaction.xml" />
@@ -72,45 +69,9 @@
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
-  <index id="api-index-2-2" role="2.2">
-    <title>Index of new symbols in 2.2</title>
-    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-4" role="2.4">
-    <title>Index of new symbols in 2.4</title>
-    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-6" role="2.6">
-    <title>Index of new symbols in 2.6</title>
-    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-8" role="2.8">
-    <title>Index of new symbols in 2.8</title>
-    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-10" role="2.10">
-    <title>Index of new symbols in 2.10</title>
-    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-12" role="2.12">
-    <title>Index of new symbols in 2.12</title>
-    <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-14" role="2.14">
-    <title>Index of new symbols in 2.14</title>
-    <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-16" role="2.16">
-    <title>Index of new symbols in 2.16</title>
-    <xi:include href="xml/api-index-2.16.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-18" role="2.18">
-    <title>Index of new symbols in 2.18</title>
-    <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-20" role="2.20">
-    <title>Index of new symbols in 2.20</title>
-    <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
+  <index id="api-index-3-0" role="3.0">
+    <title>Index of new symbols in 3.0</title>
+    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
--- a/docs/reference/gdk/gdk3-overrides.txt
+++ b/docs/reference/gdk/gdk3-overrides.txt
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -10,7 +10,6 @@ gdk_parse_args
 gdk_get_display_arg_name
 gdk_set_locale
 gdk_set_sm_client_id
-gdk_exit
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id

@@ -45,10 +44,6 @@ gdk_keyboard_ungrab
 <SUBSECTION>
 gdk_beep

-<SUBSECTION>
-gdk_get_use_xshm
-gdk_set_use_xshm
-
 <SUBSECTION>
 gdk_error_trap_push
 gdk_error_trap_pop
@@ -56,6 +51,7 @@ gdk_error_trap_pop
 <SUBSECTION>
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
+GDK_WINDOWING_QUARTZ

 <SUBSECTION Standard>
 GDK_TYPE_GRAB_STATUS
@@ -74,26 +70,17 @@ gdk_drag_protocol_get_type
 gdk_event_mask_get_type
 gdk_event_type_get_type
 gdk_extension_mode_get_type
-gdk_fill_get_type
-gdk_fill_rule_get_type
 gdk_filter_return_get_type
-gdk_font_type_get_type
-gdk_function_get_type
-gdk_gc_values_mask_get_type
+gdk_grab_ownership_get_type
 gdk_grab_status_get_type
 gdk_gravity_get_type
-gdk_image_type_get_type
-gdk_input_condition_get_type
 gdk_input_mode_get_type
 gdk_input_source_get_type
-gdk_join_style_get_type
-gdk_line_style_get_type
 gdk_modifier_type_get_type
 gdk_notify_type_get_type
 gdk_overlap_type_get_type
 gdk_property_state_get_type
 gdk_prop_mode_get_type
-gdk_rgb_dither_get_type
 gdk_scroll_direction_get_type
 gdk_setting_action_get_type
 gdk_status_get_type
@@ -109,8 +96,7 @@ gdk_window_type_get_type
 gdk_window_type_hint_get_type
 gdk_wm_decoration_get_type
 gdk_wm_function_get_type
-gdk_pointer_grab_info_libgtk_only
-gdk_keyboard_grab_info_libgtk_only
+gdk_device_grab_info_libgtk_only
 gdk_add_option_entries_libgtk_only
 gdk_pre_parse_libgtk_only
 </SECTION>
@@ -125,13 +111,16 @@ gdk_display_get_name
 gdk_display_get_n_screens
 gdk_display_get_screen
 gdk_display_get_default_screen
+gdk_display_get_device_manager
 gdk_display_pointer_ungrab
 gdk_display_keyboard_ungrab
 gdk_display_pointer_is_grabbed
+gdk_display_device_is_grabbed
 gdk_display_beep
 gdk_display_sync
 gdk_display_flush
 gdk_display_close
+gdk_display_is_closed
 gdk_display_list_devices
 gdk_display_get_event
 gdk_display_peek_event
@@ -140,10 +129,15 @@ gdk_display_add_client_message_filter
 gdk_display_set_double_click_time
 gdk_display_set_double_click_distance
 gdk_display_get_pointer
+gdk_display_get_device_state
 gdk_display_get_window_at_pointer
+gdk_display_get_window_at_device_position
 GdkDisplayPointerHooks
 gdk_display_set_pointer_hooks
+GdkDisplayDeviceHooks
+gdk_display_set_device_hooks
 gdk_display_warp_pointer
+gdk_display_warp_device
 gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
@@ -199,8 +193,6 @@ gdk_screen_get_default_colormap
 gdk_screen_set_default_colormap
 gdk_screen_get_system_colormap
 gdk_screen_get_system_visual
-gdk_screen_get_rgb_colormap
-gdk_screen_get_rgb_visual
 gdk_screen_get_rgba_colormap
 gdk_screen_get_rgba_visual
 gdk_screen_is_composited
@@ -252,17 +244,7 @@ gdk_screen_get_type
 <FILE>pixmaps</FILE>
 GdkPixmap
 gdk_pixmap_new
-gdk_bitmap_create_from_data
-gdk_pixmap_create_from_data
-gdk_pixmap_create_from_xpm
-gdk_pixmap_colormap_create_from_xpm
-gdk_pixmap_create_from_xpm_d
-gdk_pixmap_colormap_create_from_xpm_d
-gdk_pixmap_ref
-gdk_pixmap_unref
 GdkBitmap
-gdk_bitmap_ref
-gdk_bitmap_unref

 <SUBSECTION Standard>
 GDK_PIXMAP
@@ -279,87 +261,14 @@ GdkPixmapObject
 GdkPixmapObjectClass
 </SECTION>

-<SECTION>
-<TITLE>Images</TITLE>
-<FILE>images</FILE>
-GdkImage
-gdk_image_new
-GdkImageType
-gdk_image_new_bitmap
-gdk_image_get
-gdk_image_ref
-gdk_image_unref
-gdk_image_destroy
-gdk_image_get_colormap
-gdk_image_set_colormap
-
-<SUBSECTION>
-gdk_image_put_pixel
-gdk_image_get_pixel
-
-<SUBSECTION Standard>
-GDK_IMAGE
-GDK_TYPE_IMAGE
-GDK_IS_IMAGE
-GDK_IMAGE_CLASS
-GDK_IMAGE_GET_CLASS
-GDK_IS_IMAGE_CLASS
-GDK_TYPE_IMAGE_TYPE
-
-<SUBSECTION Private>
-GdkImageClass
-gdk_image_get_type
-</SECTION>
-
-<SECTION>
-<TITLE>GdkRGB</TITLE>
-<FILE>rgb</FILE>
-gdk_rgb_init
-
-<SUBSECTION>
-gdk_draw_rgb_image
-gdk_draw_rgb_image_dithalign
-gdk_draw_indexed_image
-gdk_draw_gray_image
-gdk_draw_rgb_32_image
-gdk_draw_rgb_32_image_dithalign
-GdkRgbDither
-
-<SUBSECTION>
-gdk_rgb_cmap_new
-gdk_rgb_cmap_free
-GdkRgbCmap
-
-<SUBSECTION>
-gdk_rgb_gc_set_foreground
-gdk_rgb_gc_set_background
-gdk_rgb_xpixel_from_rgb
-gdk_rgb_find_color
-
-<SUBSECTION>
-gdk_rgb_set_install
-gdk_rgb_set_min_colors
-gdk_rgb_get_visual
-gdk_rgb_get_colormap
-gdk_rgb_get_cmap
-gdk_rgb_ditherable
-gdk_rgb_colormap_ditherable
-gdk_rgb_set_verbose
-
-<SUBSECTION Standard>
-GDK_TYPE_RGB_DITHER
-</SECTION>
-
 <SECTION>
 <TITLE>Pixbufs</TITLE>
 <FILE>pixbufs</FILE>
 gdk_pixbuf_render_threshold_alpha
-gdk_pixbuf_render_to_drawable
-gdk_pixbuf_render_to_drawable_alpha
 gdk_pixbuf_render_pixmap_and_mask
 gdk_pixbuf_render_pixmap_and_mask_for_colormap
 gdk_pixbuf_get_from_drawable
-gdk_pixbuf_get_from_image
+gdk_pixbuf_get_from_surface
 </SECTION>

 <SECTION>
@@ -368,27 +277,15 @@ gdk_pixbuf_get_from_image
 GdkColor
 GdkColormap
 gdk_colormap_new
-gdk_colormap_ref
-gdk_colormap_unref
 gdk_colormap_get_system
-gdk_colormap_get_system_size
-gdk_colormap_change
 gdk_colormap_alloc_colors
 gdk_colormap_alloc_color
 gdk_colormap_free_colors
-gdk_colormap_query_color
 gdk_colormap_get_visual
 gdk_colormap_get_screen
-gdk_colors_store
 gdk_color_copy
 gdk_color_free
-gdk_colors_alloc
-gdk_colors_free
-gdk_color_white
-gdk_color_black
 gdk_color_parse
-gdk_color_alloc
-gdk_color_change
 gdk_color_equal
 gdk_color_hash
 gdk_color_to_string
@@ -408,60 +305,10 @@ gdk_colormap_get_type
 gdk_color_get_type
 </SECTION>

-<SECTION>
-<TITLE>Fonts</TITLE>
-<FILE>fonts</FILE>
-GdkFont
-GdkFontType
-gdk_font_load
-gdk_font_load_for_display
-gdk_fontset_load
-gdk_fontset_load_for_display
-gdk_font_from_description
-gdk_font_from_description_for_display
-gdk_font_get_display
-gdk_font_ref
-gdk_font_unref
-gdk_font_id
-gdk_font_equal
-
-<SUBSECTION>
-gdk_string_extents
-gdk_text_extents
-gdk_text_extents_wc
-gdk_string_width
-gdk_text_width
-gdk_text_width_wc
-gdk_char_width
-gdk_char_width_wc
-gdk_string_measure
-gdk_text_measure
-gdk_char_measure
-gdk_string_height
-gdk_text_height
-gdk_char_height
-
-<SUBSECTION>
-GdkWChar
-gdk_wcstombs
-gdk_mbstowcs
-
-<SUBSECTION Standard>
-GDK_TYPE_FONT
-GDK_TYPE_FONT_TYPE
-
-<SUBSECTION Private>
-gdk_font_get_type
-</SECTION>
-
 <SECTION>
 <TITLE>Drawing Primitives</TITLE>
 <FILE>drawing</FILE>
 GdkDrawable
-gdk_drawable_ref
-gdk_drawable_unref
-gdk_drawable_set_data
-gdk_drawable_get_data
 gdk_drawable_get_display
 gdk_drawable_get_screen
 gdk_drawable_get_visual
@@ -472,37 +319,6 @@ gdk_drawable_get_size
 gdk_drawable_get_clip_region
 gdk_drawable_get_visible_region

-<SUBSECTION>
-gdk_draw_point
-gdk_draw_points
-gdk_draw_line
-gdk_draw_lines
-gdk_draw_pixbuf
-gdk_draw_segments
-GdkSegment
-gdk_draw_rectangle
-gdk_draw_arc
-gdk_draw_polygon
-gdk_draw_trapezoids
-GdkTrapezoid
-gdk_draw_glyphs
-gdk_draw_glyphs_transformed
-gdk_draw_layout_line
-gdk_draw_layout_line_with_colors
-gdk_draw_layout
-gdk_draw_layout_with_colors
-<SUBSECTION>
-gdk_draw_string
-gdk_draw_text
-gdk_draw_text_wc
-
-<SUBSECTION>
-gdk_draw_pixmap
-gdk_draw_drawable
-gdk_draw_image
-gdk_drawable_get_image
-gdk_drawable_copy_to_image
-
 <SUBSECTION Standard>
 GDK_DRAWABLE
 GDK_DRAWABLE_GET_CLASS
@@ -513,74 +329,6 @@ GDK_IS_DRAWABLE_CLASS

 <SUBSECTION Private>
 GdkDrawableClass
-gdk_draw_bitmap
-</SECTION>
-
-<SECTION>
-<TITLE>Graphics Contexts</TITLE>
-<FILE>gcs</FILE>
-GdkGC
-GdkGCValues
-GdkGCValuesMask
-
-GdkFunction
-
-gdk_gc_new
-gdk_gc_new_with_values
-gdk_gc_get_screen
-gdk_gc_ref
-gdk_gc_unref
-gdk_gc_destroy
-gdk_gc_set_values
-gdk_gc_get_values
-gdk_gc_set_foreground
-gdk_gc_set_background
-gdk_gc_set_rgb_fg_color
-gdk_gc_set_rgb_bg_color
-gdk_gc_set_font
-gdk_gc_set_function
-gdk_gc_set_fill
-GdkFill
-gdk_gc_set_tile
-gdk_gc_set_stipple
-gdk_gc_set_ts_origin
-gdk_gc_set_clip_origin
-gdk_gc_set_clip_mask
-gdk_gc_set_clip_rectangle
-gdk_gc_set_clip_region
-gdk_gc_set_subwindow
-GdkSubwindowMode
-gdk_gc_set_exposures
-gdk_gc_set_line_attributes
-GdkLineStyle
-GdkCapStyle
-GdkJoinStyle
-gdk_gc_set_dashes
-gdk_gc_copy
-gdk_gc_set_colormap
-gdk_gc_get_colormap
-
-gdk_gc_offset
-
-<SUBSECTION Standard>
-GDK_GC
-GDK_TYPE_GC
-GDK_IS_GC
-GDK_GC_CLASS
-GDK_GC_GET_CLASS
-GDK_IS_GC_CLASS
-GDK_TYPE_CAP_STYLE
-GDK_TYPE_FILL
-GDK_TYPE_FILL_RULE
-GDK_TYPE_FUNCTION
-GDK_TYPE_GC_VALUES_MASK
-GDK_TYPE_JOIN_STYLE
-GDK_TYPE_LINE_STYLE
-GDK_TYPE_SUBWINDOW_MODE
-
-<SUBSECTION Private>
-GdkGCClass
-gdk_gc_get_type
 </SECTION>

 <SECTION>
@@ -592,7 +340,14 @@ GdkByteOrder
 gdk_query_depths
 gdk_query_visual_types
 gdk_list_visuals
-
+gdk_visual_get_bits_per_rgb
+gdk_visual_get_blue_pixel_details
+gdk_visual_get_byte_order
+gdk_visual_get_colormap_size
+gdk_visual_get_depth
+gdk_visual_get_green_pixel_details
+gdk_visual_get_red_pixel_details
+gdk_visual_get_visual_type
 gdk_visual_get_best_depth
 gdk_visual_get_best_type
 gdk_visual_get_system
@@ -600,8 +355,6 @@ gdk_visual_get_best
 gdk_visual_get_best_with_depth
 gdk_visual_get_best_with_type
 gdk_visual_get_best_with_both
-gdk_visual_ref
-gdk_visual_unref
 gdk_visual_get_screen

 <SUBSECTION Standard>
@@ -634,8 +387,6 @@ GdkWindowAttr
 GdkWindowAttributesType
 gdk_window_new
 gdk_window_destroy
-gdk_window_ref
-gdk_window_unref
 gdk_window_get_window_type
 gdk_window_at_pointer
 gdk_window_show
@@ -644,6 +395,8 @@ gdk_window_hide
 gdk_window_is_destroyed
 gdk_window_is_visible
 gdk_window_is_viewable
+gdk_window_is_input_only
+gdk_window_is_shaped
 gdk_window_get_state
 gdk_window_withdraw
 gdk_window_iconify
@@ -658,18 +411,19 @@ gdk_window_set_keep_above
 gdk_window_set_keep_below
 gdk_window_set_opacity
 gdk_window_set_composited
+gdk_window_get_composited
 gdk_window_move
 gdk_window_resize
 gdk_window_move_resize
 gdk_window_scroll
 gdk_window_move_region
 gdk_window_flush
+gdk_window_has_native
 gdk_window_ensure_native
 gdk_window_reparent
 gdk_window_clear
 gdk_window_clear_area
 gdk_window_clear_area_e
-gdk_window_copy_area
 gdk_window_raise
 gdk_window_lower
 gdk_window_restack
@@ -703,7 +457,9 @@ gdk_window_configure_finished
 gdk_window_set_user_data
 gdk_window_set_override_redirect
 gdk_window_set_accept_focus
+gdk_window_get_accept_focus
 gdk_window_set_focus_on_map
+gdk_window_get_focus_on_map
 gdk_window_add_filter
 gdk_window_remove_filter
 GdkFilterFunc
@@ -718,19 +474,19 @@ gdk_window_input_shape_combine_region
 gdk_window_set_child_input_shapes
 gdk_window_merge_child_input_shapes
 gdk_window_set_static_gravities
-gdk_window_set_hints
 gdk_window_set_title
 gdk_window_set_background
 gdk_window_set_back_pixmap
+gdk_window_get_background_pattern
 GDK_PARENT_RELATIVE
 gdk_window_set_cursor
 gdk_window_get_cursor
-gdk_window_set_colormap
 gdk_window_get_user_data
 gdk_window_get_geometry
 gdk_window_set_geometry_hints
 gdk_window_set_icon_list
 gdk_window_set_modal_hint
+gdk_window_get_modal_hint
 gdk_window_set_type_hint
 gdk_window_get_type_hint
 gdk_window_set_skip_taskbar_hint
@@ -739,14 +495,11 @@ gdk_window_set_urgency_hint
 gdk_window_get_position
 gdk_window_get_root_origin
 gdk_window_get_frame_extents
-gdk_window_get_size
-gdk_window_get_visual
-gdk_window_get_colormap
-gdk_window_get_type
 gdk_window_get_origin
 gdk_window_get_deskrelative_origin
 gdk_window_get_root_coords
 gdk_window_get_pointer
+gdk_window_get_device_position
 GdkModifierType
 gdk_window_get_parent
 gdk_window_get_toplevel
@@ -766,9 +519,16 @@ gdk_window_get_decorations
 GdkWMDecoration
 gdk_window_set_functions
 GdkWMFunction
-gdk_window_get_toplevels
 gdk_get_default_root_window

+<SUBSECTION>
+gdk_window_get_support_multidevice
+gdk_window_set_support_multidevice
+gdk_window_get_device_cursor
+gdk_window_set_device_cursor
+gdk_window_get_device_events
+gdk_window_set_device_events
+
 <SUBSECTION>
 GdkPointerHooks
 gdk_set_pointer_hooks
@@ -780,11 +540,14 @@ gdk_offscreen_window_get_embedder
 gdk_window_geometry_changed
 gdk_window_redirect_to_drawable
 gdk_window_remove_redirection
+gdk_window_coords_from_parent
+gdk_window_coords_to_parent
+gdk_window_get_effective_parent
+gdk_window_get_effective_toplevel

 <SUBSECTION Standard>
 GDK_WINDOW
 GDK_WINDOW_GET_CLASS
-GDK_WINDOW_OBJECT
 GDK_TYPE_WINDOW
 GDK_IS_WINDOW
 GDK_WINDOW_CLASS
@@ -806,6 +569,10 @@ gdk_window_object_get_type
 gdk_drawable_get_type
 GdkWindowObject
 GdkWindowObjectClass
+GdkWindowImpl
+GdkWindowImplIface
+GdkWindowRedirect
+gdk_window_impl_get_type
 gdk_window_freeze_toplevel_updates_libgtk_only
 gdk_window_thaw_toplevel_updates_libgtk_only
 </SECTION>
@@ -813,9 +580,6 @@ gdk_window_thaw_toplevel_updates_libgtk_only
 <SECTION>
 <TITLE>Selections</TITLE>
 <FILE>selections</FILE>
-GdkSelection
-GdkSelectionType
-GdkTarget
 GDK_SELECTION_PRIMARY
 GDK_SELECTION_SECONDARY
 GDK_SELECTION_CLIPBOARD
@@ -875,41 +639,16 @@ GDK_TYPE_PROP_MODE
 <SECTION>
 <TITLE>Pango Interaction</TITLE>
 <FILE>pango_interaction</FILE>
-GdkPangoRenderer
-GdkPangoRendererClass
-gdk_pango_renderer_new
-gdk_pango_renderer_get_default
-gdk_pango_renderer_set_drawable
-gdk_pango_renderer_set_gc
-gdk_pango_renderer_set_stipple
-gdk_pango_renderer_set_override_color
-gdk_pango_context_get
-gdk_pango_context_get_for_screen
-gdk_pango_context_set_colormap
-GdkPangoAttrEmbossed
-GdkPangoAttrEmbossColor
-GdkPangoAttrStipple
-gdk_pango_attr_emboss_color_new
-gdk_pango_attr_embossed_new
-gdk_pango_attr_stipple_new
 gdk_pango_layout_get_clip_region
 gdk_pango_layout_line_get_clip_region
-<SUBSECTION Standard>
-GDK_TYPE_PANGO_RENDERER
-GDK_PANGO_RENDERER
-GDK_IS_PANGO_RENDERER
-GDK_PANGO_RENDERER_CLASS
-GDK_IS_PANGO_RENDERER_CLASS
-GDK_PANGO_RENDERER_GET_CLASS
-
-<SUBSECTION Private>
-gdk_pango_renderer_get_type
-GdkPangoRendererPrivate
+gdk_pango_context_get
+gdk_pango_context_get_for_screen
 </SECTION>

 <SECTION>
 <TITLE>Cairo Interaction</TITLE>
 <FILE>cairo_interaction</FILE>
+gdk_window_create_similar_surface
 gdk_cairo_create
 gdk_cairo_set_source_color
 gdk_cairo_set_source_pixbuf
@@ -929,43 +668,6 @@ GdkRectangle
 gdk_rectangle_intersect
 gdk_rectangle_union

-<SUBSECTION>
-GdkRegion
-gdk_region_new
-gdk_region_polygon
-GdkFillRule
-gdk_region_copy
-gdk_region_rectangle
-gdk_region_destroy
-
-<SUBSECTION>
-gdk_region_get_clipbox
-gdk_region_get_rectangles
-gdk_region_empty
-gdk_region_equal
-gdk_region_rect_equal
-gdk_region_point_in
-gdk_region_rect_in
-GdkOverlapType
-
-<SUBSECTION>
-gdk_region_offset
-gdk_region_shrink
-gdk_region_union_with_rect
-gdk_region_intersect
-gdk_region_union
-gdk_region_subtract
-gdk_region_xor
-
-<SUBSECTION>
-GdkSpan
-GdkSpanFunc
-gdk_region_spans_intersect_foreach
-
-<SUBSECTION Standard>
-GDK_TYPE_OVERLAP_TYPE
-GDK_TYPE_RECTANGLE
-
 <SUBSECTION Private>
 gdk_rectangle_get_type
 </SECTION>
@@ -1006,6 +708,7 @@ gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
+gdk_keymap_get_num_lock_state
 gdk_keymap_add_virtual_modifiers
 gdk_keymap_map_virtual_modifiers

@@ -1038,20 +741,41 @@ gdk_keymap_get_type
 </SECTION>

 <SECTION>
-<TITLE>Input Devices</TITLE>
-<FILE>input_devices</FILE>
+<TITLE>GdkDeviceManager</TITLE>
+<FILE>gdkdevicemanager</FILE>
+GdkDeviceManager
 GdkDevice
+GdkDeviceType
 GdkInputSource
 GdkInputMode
 GdkDeviceKey
 GdkDeviceAxis
 GdkAxisUse
-gdk_devices_list
+GdkGrabOwnership
+gdk_enable_multidevice
+gdk_device_manager_get_display
+gdk_device_manager_list_devices
+gdk_device_manager_get_client_pointer
+
+<SUBSECTION>
+gdk_device_get_name
 gdk_device_set_source
+gdk_device_get_source
 gdk_device_set_mode
+gdk_device_get_mode
 gdk_device_set_key
+gdk_device_get_key
 gdk_device_set_axis_use
-gdk_device_get_core_pointer
+gdk_device_get_axis_use
+gdk_device_get_associated_device
+gdk_device_get_device_type
+gdk_device_get_display
+gdk_device_get_has_cursor
+gdk_device_get_n_axes
+
+<SUBSECTION>
+gdk_device_grab
+gdk_device_ungrab

 <SUBSECTION>
 gdk_device_get_state
@@ -1059,16 +783,30 @@ gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord
 gdk_device_get_axis
+gdk_device_list_axes
+gdk_device_get_axis_value

 <SUBSECTION>
 gdk_input_set_extension_events
 GdkExtensionMode

+<SUBSECTION>
+gdk_devices_list
+gdk_device_get_core_pointer
+
 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
 GDK_TYPE_EXTENSION_MODE
 GDK_TYPE_INPUT_MODE
 GDK_TYPE_INPUT_SOURCE
+GDK_TYPE_DEVICE_TYPE
+GDK_TYPE_GRAB_OWNERSHIP
+GDK_DEVICE_MANAGER
+GDK_DEVICE_MANAGER_CLASS
+GDK_DEVICE_MANAGER_GET_CLASS
+GDK_IS_DEVICE_MANAGER
+GDK_IS_DEVICE_MANAGER_CLASS
+GDK_TYPE_DEVICE_MANAGER
 GDK_DEVICE
 GDK_DEVICE_CLASS
 GDK_DEVICE_GET_CLASS
@@ -1078,7 +816,12 @@ GDK_TYPE_DEVICE

 <SUBSECTION Private>
 GdkDeviceClass
+GdkDevicePrivate
+GdkDeviceManagerClass
+GdkDeviceManagerPrivate
 gdk_device_get_type
+gdk_device_manager_get_type
+gdk_device_type_get_type
 GDK_MAX_TIMECOORD_AXES
 </SECTION>

@@ -1096,7 +839,6 @@ GDK_PRIORITY_REDRAW
 gdk_events_pending
 gdk_event_peek
 gdk_event_get
-gdk_event_get_graphics_expose
 gdk_event_put
 gdk_event_new
 gdk_event_copy
@@ -1107,6 +849,9 @@ gdk_event_get_axis
 gdk_event_get_coords
 gdk_event_get_root_coords
 gdk_event_request_motions
+gdk_events_get_angle
+gdk_events_get_center
+gdk_events_get_distance

 <SUBSECTION>
 gdk_event_handler_set
@@ -1123,6 +868,8 @@ gdk_get_show_events
 gdk_set_show_events
 gdk_event_set_screen
 gdk_event_get_screen
+gdk_event_get_device
+gdk_event_set_device

 <SUBSECTION>
 gdk_setting_get
@@ -1198,9 +945,9 @@ gdk_cursor_new_from_name
 gdk_cursor_new_for_display
 gdk_cursor_get_display
 gdk_cursor_get_image
+gdk_cursor_get_cursor_type
 gdk_cursor_ref
 gdk_cursor_unref
-gdk_cursor_destroy

 <SUBSECTION Standard>
 GDK_TYPE_CURSOR_TYPE
@@ -1210,19 +957,6 @@ GDK_TYPE_CURSOR
 gdk_cursor_get_type
 </SECTION>

-<SECTION>
-<TITLE>Input</TITLE>
-<FILE>input</FILE>
-gdk_input_add_full
-GdkInputCondition
-GdkInputFunction
-GdkDestroyNotify
-gdk_input_add
-gdk_input_remove
-
-<SUBSECTION Standard>
-GDK_TYPE_INPUT_CONDITION
-</SECTION>

 <SECTION>
 <TITLE>Drag and Drop</TITLE>
@@ -1234,18 +968,23 @@ gdk_drag_context_new
 gdk_drag_drop
 gdk_drag_find_window
 gdk_drag_find_window_for_screen
-gdk_drag_context_ref
+gdk_drag_context_get_source_window
 gdk_drag_begin
 gdk_drag_motion
 gdk_drop_finish
 gdk_drag_get_protocol
 gdk_drag_get_protocol_for_display
 GdkDragProtocol
-gdk_drag_context_unref
 GdkDragContext
 GdkDragAction
 gdk_drag_status
 gdk_drag_drop_succeeded
+gdk_drag_context_get_actions
+gdk_drag_context_get_suggested_action
+gdk_drag_context_get_selected_action
+gdk_drag_context_list_targets
+gdk_drag_context_get_device
+gdk_drag_context_set_device

 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -1267,8 +1006,6 @@ gdk_drag_context_get_type
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
-GDK_ROOT_PARENT
-GDK_DISPLAY
 GDK_WINDOW_XDISPLAY
 GDK_WINDOW_XID
 GDK_PIXMAP_XDISPLAY
@@ -1276,24 +1013,16 @@ GDK_PIXMAP_XID
 GDK_DISPLAY_XDISPLAY
 GDK_DRAWABLE_XDISPLAY
 GDK_DRAWABLE_XID
-GDK_IMAGE_XDISPLAY
-GDK_IMAGE_XIMAGE
-GDK_GC_XDISPLAY
 GDK_COLORMAP_XDISPLAY
 GDK_COLORMAP_XCOLORMAP
 GDK_SCREEN_XDISPLAY
 GDK_SCREEN_XNUMBER
 GDK_SCREEN_XSCREEN
 GDK_VISUAL_XVISUAL
-GDK_FONT_XDISPLAY
-GDK_FONT_XFONT
 GDK_CURSOR_XCURSOR
 GDK_CURSOR_XDISPLAY
-GDK_GC_XGC
-GDK_GC_GET_XGC
 GDK_WINDOW_XWINDOW
 gdkx_visual_get
-gdkx_colormap_get
 gdk_pixmap_foreign_new
 gdk_pixmap_foreign_new_for_display
 gdk_pixmap_foreign_new_for_screen
@@ -1305,8 +1034,6 @@ gdk_window_lookup
 gdk_window_lookup_for_display
 gdk_pixmap_lookup
 gdk_pixmap_lookup_for_display
-gdk_font_lookup
-gdk_font_lookup_for_display
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
 gdk_net_wm_supports
@@ -1331,17 +1058,10 @@ gdk_x11_display_set_cursor_theme
 gdk_x11_register_standard_event_type
 gdk_x11_drawable_get_xdisplay
 gdk_x11_drawable_get_xid
-gdk_x11_font_get_name
-gdk_x11_font_get_xdisplay
-gdk_x11_font_get_xfont
-gdk_x11_gc_get_xdisplay
-gdk_x11_gc_get_xgc
 gdk_x11_get_default_root_xwindow
 gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
 gdk_x11_grab_server
-gdk_x11_image_get_xdisplay
-gdk_x11_image_get_ximage
 gdk_x11_screen_get_screen_number
 gdk_x11_screen_get_xscreen
 gdk_x11_ungrab_server
@@ -1356,11 +1076,10 @@ gdk_x11_get_xatom_name
 gdk_x11_get_xatom_name_for_display

 <SUBSECTION Private>
-gdk_display
 GDK_HAVE_WCHAR_H
 GDK_HAVE_WCTYPE_H
-gdk_iswalnum
-gdk_iswspace
+gdk_x11_pixmap_get_drawable_impl
+gdk_x11_window_get_drawable_impl
 </SECTION>

 <SECTION>
--- a/docs/reference/gdk/gdk3.types
+++ b/docs/reference/gdk/gdk3.types
@@ -5,7 +5,7 @@ gdk_display_manager_get_type
 gdk_screen_get_type
 gdk_drawable_get_type
 gdk_window_object_get_type
-gdk_pango_renderer_get_type
 gdk_pixmap_get_type
-gdk_gc_get_type
 gdk_keymap_get_type
+gdk_device_get_type
+gdk_device_manager_get_type
--- a/Show More
+++ b/Show More