fix an typo in zh_CN translation

Add an ugly workaround because GTK does not ensure surfaces get flushed
before directly accessing the drawable backed by the surface. This is
not visible on X11 (where flushing is a no-op), but can be seen on
Windows.

https://bugzilla.gnome.org/show_bug.cgi?id=628291

INSTALL.in

@@ -3,9 +3,11 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.17.6,
-   Pango 1.20, ATK 1.13.0 and cairo 1.6.0.
+ - 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.
+
+ - 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

Makefile.am

@@ -6,6 +6,7 @@ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST +=			\
 	HACKING			\
@@ -242,7 +243,7 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds --enable-introspection
 
 GITIGNOREFILES = \
 	po-properties/Makefile.in.in \

NEWS

@@ -1,3 +1,370 @@
+Overview of Changes from GTK+ 2.20.0 to 2.20.1
+==============================================
+
+* Support Tracker 0.8 in the filechooser search
+
+* Bug fixes:
+ 615028 gdk/x11/gdkdnd-x11.c missing Xutil.h
+ 614099 GtkFileSystemModel may causes crash in g_file_get_child
+ 615999 Gail doesn't send state-changed events for ATK_STATE_ENABLED
+ 614894 Add heuristic for pre XRandR 1.3 drivers
+ 613988 Compile error on DirectFB backend due to missing...
+ 560147 GtkBuilder docs should say what GErrors they throw
+ 615128 gdk monitor order does not seem to be correct
+ 614971 Initialize search engines on demand
+ 613887 Misprint in the description of gtk_cell_view_new_with_text
+ 615853 BadMatch when pressing keyboard volume keys...
+ 615000 gtk_builder_value_from_string_type() returns FALSE without...
+ 614540 configure wants gio-unix on all platform
+ 613974 GtkToolItemGroup devides by 0 when allocating space...
+ 557689 In 'select folder' action, filechooser doesn't work when...
+ 616851 gtk_misc_set_alignment: assertion `GTK_IS_MISC (misc)' failed
+ 402349 FileChooser's default directory is not "active"
+        64bit issue with the ICC profile support in the PNG loader
+        Missing break statement in gtk_tool_item_group_set_property
+        Missing default events in gtk_tool_item_group_realize
+
+* Updated translations:
+ Basque
+ Bengali India
+ Catalan
+ Catalan (Valencian)
+ Danish
+ Galician
+ Greek
+ Kannada
+ Latvian
+ Thai
+ Ukrainian
+
+
+Overview of Changes from GTK+ 2.19.7 to 2.20.0
+==============================================
+
+* Support the tracker 0.8 api in the file chooser search code
+
+* Bug fixes:
+ 609929 Dragging between two windows cause the menu widget...
+ 613241 entry sends extra notify::text with "" on destroy
+ 610946 error during gtk+ build + nonsense error messages
+ 610176 Some cups1.2 feature use not shielded by API version-check
+ 612574 GtkMenuItem does not emit notify::label when label...
+ 612505 Entry layout not updated when underlying buffer changes
+ 612346 gdk_window_set_icon_name doesn't work
+ 612308 GTK+ Build error: redefinition of 'struct IPrintDialogCallback'
+ 611118 Set APPLICATION_ID when launching desktop app
+ 612768 DND cause crash in VNC environment
+ 612575 Improve docs of gtk_notebook_set_tab_label_packing
+ 605333 Confusing error in documentation
+ 613028 Do not get a GtkSettings for size lookup if...
+
+* Translation updates:
+ Basque
+ Brazilian Portuguese
+ Catalan
+ Dutch
+ Estonian
+ Finnish
+ Galician
+ Gujarati
+ Italian
+ Punjabi
+ Romanian
+ Spanish
+ Swedish
+ Traditional Chinese
+ Vietnamese
+
+
+Overview of Changes from GTK+ 2.19.6 to 2.19.7
+==============================================
+
+* Bug fixes:
+ 611707 Move documentation from templates to inline comments
+  69872 GTK_WIDGET_SET_FLAGS should be deprecated
+ 612066 empathy hangs when clicked on information about contact...
+ 557420 Some compose sequences don't work anymore...
+ 569042 gailbooleancell does not seem to attend to changes...
+ 600992 File chooser reference counting issues
+ 610905 gtk_drag_source_set need instrospection hint
+ 611051 Search Entry Clear Icon not accessible
+ 611217 Incorrect translator comment
+ 611317 Document targets in drag and drop
+ 611319 gtk_window_set_transient_for undocumented NULL value for parent
+ 611658 Update documentation for gtkvscrollbar
+ 611662 Update documentation for gtkvseparator
+ 611686 focus_in/focus_out in gailtreeview.c should return FALSE...
+ 611831 Move documentation to inline comments: GtkVBox
+ 612119 Do not scroll when middle pasting
+
+* Translation updates:
+ Afrikaans
+ Arabic
+ Basque
+ British English
+ Bulgarian
+ Czech
+ Danish
+ French
+ Galician
+ German
+ Greek
+ Hungarian
+ Lithuanian
+ Low German
+ Norwegian bokmål
+ Polish
+ Portuguese
+ Russian
+ Slovenian
+ Swedish
+
+
+Overview of Changes from GTK+ 2.19.5 to 2.19.6
+==============================================
+
+* Bugs fixed:
+ 610701 gnome-shell crashes frequently
+ 604799 Crash when button is pressed.
+ 609744 crash at parse_data_for_row_pseudocolor
+ 600789 gdk/gdkwindow.c "find_native_sibling_above" will crash
+ 610141 gtk_assistant_get_nth_page() function fails to deliver...
+ 609952 destroying a notebook window when the last tab got dragged...
+ 603923 [annotations] gtk_tree_store_newv/set_column_types
+ 610474 [annotations] Add allow-none
+ 609650 GtkPlug Embedded signal is not emitted when plug...
+ 610381 More space between toolbar icon and label
+ 548026 No accessor for GtkWidget.requisition
+ 609514 fix introspection comments for gtk_tree_view_get_path_at_pos
+ 610235 msgid in bad English
+ 607697 GDK_META_MASK always set on Alt-Enter with gtk+ 2.19.x
+ 610632 gtk_info_bar_set_default_response problem
+ 609172 gdk/directfb: little cleanups
+ 610184 gtk_assistant_set_current_page() segfaults...
+
+* Updated translations
+ Bulgarian
+ Czech
+ Estonian
+ German
+ Japanese
+ Korean
+ Lithuanian
+ Norwegian bokmål
+ Oriya
+ Polish
+ Romanian
+ Slovenian
+ Spanish
+
+
+Overview of Changes from GTK+ 2.19.4 to 2.19.5
+==============================================
+
+* GSEAL work:
+ - Add accessors for GtkPaned members
+ - Add gtk_widget_style_attach
+ - Seal GtkTextTag
+ - Deprecate GtkCurveType
+ - More GtkWidget flags accessors
+
+* Bugs fixed:
+ 403485 Move docs from tmpl/* to the source files
+ 556263 Deprecate GtkCurve
+ 554420 Seal GtkTextTag
+ 561816 Optimize gtk_paned_set_position notifications
+ 606288 Not using GtkOptionMenu deprecated symbols in test file
+ 607061 GtkPlug socket window is sometimes incorrectly unref'd
+ 607344 GtkCalendar: crash when using tooltips via glade
+ 607885 GtkPaned::handle lack accessor
+ 608162 gtktoolbutton doesn't create right proxy menu item...
+ 608345 wrong reference on gdk_keymap_translate_keyboard_state
+ 608370 dnd drag-dest signal handlers don't get correctly disconn...
+ 608410 GOK types backwards in text entry fields
+ 608615 DnD events sent to wrong window
+ 608807 Marks on GtkScale widgets can overlap
+ 609188 gdk/directfb: compiler warning in _gdk_windowing_pointer_grab()
+ 609191 gdk/directfb: use G_DEFINE_TYPE in gdkcolor-directfb
+ 609199 gdk/directfb: use G_DEFINE_TYPE in gdkgc-directfb
+ 609201 gdk/directfb: max cursor size is artificially limited
+ 591186 GTK Menu Bar is unreadable under Windows 7
+
+* Updated translations
+ Bengali
+ Brazilian Portuguese
+ Czech
+ Estonian
+ French
+ Norwegian bokmål
+ Slovak
+ Spanish
+ Thai
+
+
+Overview of Changes from GTK+ 2.19.3 to 2.19.4
+==============================================
+
+* GSeal:
+ - New accessors for GtkEntry windows
+ - New accessors for GtkRange members
+
+* Bugs fixed:
+ 607082 Add accessors for sealed GtkRange members
+ 567729 Add GtkToolPalette
+ 591102 gdk_pixbuf_save() creates a zero-size file...
+ 600865 gnome-panel crashed with "BadPixmap...
+ 601412 action area presence makes gnome-terminal window grow...
+ 603144 Suspected wrong builtin page size: Chinese PRC6 and...
+ 606009 weirdness with clipping in abiword - csw
+ 606698 Misplaced declaration of gtk_print_job_set_status
+ 606761 pixops.c: variables are declared at middle of block
+ 607217 Mixing calls to _set_markup and _set_text causes...
+ 607269 gtk_label_set_attributes with empty list no longer...
+ 607322 Double-click doesn't work if the item is selected...
+ 607687 f-spot crashes when using themes using the pixmap...
+ 607778 Add accessors for GtkEntry's windows
+ 607770 Leak in GtkTreeView with HildonPannableArea
+ 603245 drawing artifacts with action widgets and long tab...
+
+* Updated translations:
+ Arabic
+ Asturian
+ Basque
+ Bengali
+ Bulgarian
+ Burmese
+ Norwegian bokmål
+ Slovenian
+ Spanish
+ Swedish
+
+
+Overview of Changes from GTK+ 2.19.2 to 2.19.3
+==============================================
+
+* GSeal:
+ - Deprecate widget flag macros
+   GTK_WIDGET_STATE
+   GTK_WIDGET_SAVED_STATE
+   GTK_WIDGET_FLAGS
+   GTK_WIDGET_TOPLEVEL
+   GTK_WIDGET_NO_WINDOW
+   GTK_WIDGET_COMPOSITE_CHILD
+   GTK_WIDGET_APP_PAINTABLE
+   GTK_WIDGET_CAN_DEFAULT
+   GTK_WIDGET_CAN_FOCUS
+   GTK_WIDGET_DOUBLE_BUFFERED
+   GTK_WIDGET_HAS_DEFAULT
+   GTK_WIDGET_HAS_GRAB
+   GTK_WIDGET_RECEIVES_DEFAULT
+ - Also deprecate the type macros
+   GTK_WIDGET_TYPE
+   GTK_OBJECT_TYPE_NAME
+   GTK_OBJECT_TYPE
+
+* GtkOffscreenWindow: A new toplevel container widget to manage
+  offscreen rendering of child widgets
+
+* OS X:
+ - Memory leak fixes and other improvements
+
+* Bugs:
+ 604901 Provide generic offscreen rendering container
+ 597100 There is a misprint in the documentation...
+ 598383 GtkWidget::state-changed signal should be documented
+ 602284 Need a way to retrieve the preedit string in a GtkTextView
+ 605090 Fix some compilation warnings
+ 605199 Contradiction in the description of function...
+ 606068 Setup libjpeg error handling earlier...
+ 606230 gtk_combo_box_set_active_iter & unsetting the active item
+ 606291 Fix some issues in "Migrating from GtkOptionMenu...
+ 606434 prop-editor should support GdkColor
+
+* Translations:
+ Asturian
+ Basque
+ Kannada
+ Norwegian bokmål
+ Slovenian
+ Spanish
+ Swedish
+ Thai
+ Ukrainian
+
+
+Overview of Changes from GTK+ 2.19.1 to 2.19.2
+==============================================
+
+* Introspection:
+ - Introspection data for gdk-pixbuf, gdk and gtk is now
+   included in GTK+ itself. As a consequence, the atk dependency
+   has been bumped to 2.29.2, and a gobject-introspection dependency
+   has been added. configure with --disable-introspection in order
+   to not build introspection data.
+
+* Client-side windows:
+ - Fix some issues with handling of button and motion events
+ - Fix damage reporting for drawing on offscreen windows
+ - Fix problems with handling of input extension events
+
+* Printing:
+ - Add api to handle printer hard margins
+
+* Simple IM Context:
+ - Sync with Xorg compose file
+ - Make Compose-vowel-minus combinations consistent
+
+* GDK:
+ - gdk_screen_get_primary_monitor: New function to get the
+   'primary' monitor in a multi-monitor setup
+
+* gdk-pixbuf has gained the ability to store and retrieve embedded
+  ICC color profiles in png and tiff images
+
+* Keyboard handling:
+ - Mnemonic underlines can now optionally be hidden until the Alt key
+   is pressed, this can be turned on with the gtk-auto-mnemonics setting
+ - Using the Super, Meta and Hyper modifiers in accelerators is working
+   more reliably
+
+* Bugs fixed:
+ 603652 Sporadic crashes with GtkSocket
+ 605008 the region of damage event doesn't be copied in gdk_event_copy
+ 588554 only show the accelerator when pressing alt
+ 601473 GDK_BUTTON?_MOTION_MASK appears to be broken
+ 601712 Add API for determining primary monitor
+  50942 selection/arrow key improvement
+ 427409 editing shortcut always fails with super key
+ 468989 need a way to get the printer's hard margins
+ 502266 gtk_tree_selection_get_selected_rows free example produces...
+ 592279 Introspection support
+ 597386 Cannot click buttons more than once without moving the mouse...
+ 599213 Use GtkCellEditable:editing_canceled property instead...
+ 599397 Button stuck at pressed look after screen rotation
+ 601383 gtk_icon_view_get_selected_items: example code gives...
+ 602099 Actions can be activatable too
+ 603619 the colormap of offscreen's pixmap doesn't inherit...
+ 603904 gdk_draw_line doesn't have expose area.
+ 604117 Add info about single includes when compiling GTK+ apps
+ 604289 Please permit progress pages to be final in a dialog
+ 604462 gtktoolitem.c: return-value is different type
+ 604747 Using gdk_draw_line, the expose area of damage event is wrong
+ 604787 property-notify-event is not delivered to a non-toplevel...
+ 604881 GtkCellEditable::editing-cancelled should be writable
+ 591085 GtkBuilder object ID bounded to GtkWidget "name" property
+
+* Updated translations:
+ Arabic
+ Estonian
+ Hebrew
+ Low German
+ Norwegian bokmål
+ Slovenian
+ Spanish
+ Telugu
+ Vietnamese
+
+
 Overview of Changes from GTK+ 2.19.0 to 2.19.1
 ==============================================
 

README.in

@@ -37,6 +37,15 @@ Release notes for 2.20
   which are doing so may need some adjustments, since the addition of the
   message area changed the internal widget hierarchy.
 
+* GtkBuilder no longer sets the "name" property of widgets to the ID
+  attribute of the <object>. Use gtk_buildable_get_name() instead of
+  gtk_widget_get_name() to obtain the ID.
+
+* GTK+ now includes introspection data, as a consequence, it gained a
+  dependency on gobject-introspection. It is possible to build without
+  introspection by passing --disable-introspection to configure.
+
+
 Release notes for 2.18
 ======================
 

autogen.sh

@@ -109,7 +109,7 @@ rm -rf autom4te.cache
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
-$ACLOCAL $ACLOCAL_FLAGS || exit $?
+$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
 
 libtoolize --force || exit $?
 gtkdocize || exit $?

config.h.win32.in

@@ -5,6 +5,9 @@
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
+/* Define if gio can sniff image data */
+/* #undef GDK_PIXBUF_USE_GIO_MIME */
+
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
 
@@ -12,7 +15,7 @@
 #define GTK_COMPILED_WITH_DEBUGGING "yes"
 
 /* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "c:/devel/target/HEAD/share/locale"
+#define GTK_LOCALEDIR "NONE/share/locale"
 
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
@@ -97,6 +100,9 @@
 /* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
+/* Define to 1 if libpapi available */
+/* #undef HAVE_PAPI */
+
 /* Define to 1 is libjpeg supports progressive JPEG */
 /* #undef HAVE_PROGRESSIVE_JPEG */
 
@@ -106,9 +112,6 @@
 /* Have the Xrandr extension library */
 /* #undef HAVE_RANDR */
 
-/* Define to 1 if the XShape extension is available */
-/* #undef HAVE_SHAPE_EXT */
-
 /* Define to 1 if shm.h is available */
 /* #undef HAVE_SHM_H */
 
@@ -199,7 +202,7 @@
 /* Define to 1 if XFree Xinerama is available */
 /* #undef HAVE_XFREE_XINERAMA */
 
-/* Define to 1 is Xinerama is available */
+/* Define to 1 if xinerama is available */
 /* #undef HAVE_XINERAMA */
 
 /* Define to 1 if you have the `XInternAtoms' function. */
@@ -229,12 +232,23 @@
 /* Define to 1 if you have the `_NSGetEnviron' function. */
 /* #undef HAVE__NSGETENVIRON */
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
 /* Define if <X11/extensions/XIproto.h> needed for xReply */
 /* #undef NEED_XIPROTO_H_FOR_XREPLY */
 
 /* Define to 1 if fd_set is not available */
 #define NO_FD_SET 1
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#ifndef _MSC_VER
+/* #undef NO_MINUS_C_MINUS_O */
+#else 
+#define NO_MINUS_C_MINUS_O 1
+#endif
+
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"
 

configure.in

@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 # require autoconf 2.54
-AC_PREREQ(2.54)
+AC_PREREQ(2.62)
 
 # Making releases:
 #   GTK_MICRO_VERSION += 1;
@@ -11,9 +11,9 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [19])
+m4_define([gtk_minor_version], [20])
 m4_define([gtk_micro_version], [2])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_interface_age], [2])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0])
 m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.21.3])
+m4_define([glib_required_version], [2.23.6])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
 m4_define([cairo_required_version], [1.6])
@@ -43,10 +43,12 @@ AC_INIT([gtk+], [gtk_version],
 
 AC_CONFIG_SRCDIR([gdk/gdktypes.h])
 
+AC_CONFIG_MACRO_DIR([m4])
+
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE(no-define)
+AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
 AM_CONFIG_HEADER(config.h)
 
 # Support silent build rules, requires at least automake-1.11. Enable
@@ -129,6 +131,7 @@ AC_CANONICAL_HOST
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 LIB_EXE_MACHINE_FLAG=X86
+EXE_MANIFEST_ARCHITECTURE=X86
 case "$host" in
   *-*-mingw*)
     os_win32=yes
@@ -137,6 +140,7 @@ case "$host" in
     case "$host" in
     x86_64-*-*)
       LIB_EXE_MACHINE_FLAG=X64
+      EXE_MANIFEST_ARCHITECTURE=AMD64
       ;;
     esac
     ;;
@@ -147,6 +151,7 @@ esac
 AC_MSG_RESULT([$os_win32])
 
 AC_SUBST(LIB_EXE_MACHINE_FLAG)
+AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
 
 case $host in
   *-*-linux*)
@@ -580,6 +585,7 @@ case $host in
   ;;
 esac
 
+AC_SUBST(MATH_LIB)
 #
 # see bug 162979
 #
@@ -1713,7 +1719,13 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES cairo-$cairo_backend"
+# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
+if test "x$gdktarget" = "xx11"; then
+  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
+else
+  GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
+fi
+
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 #
@@ -1970,6 +1982,11 @@ if test -n "$export_dynamic"; then
   GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
+##################################################
+# GObject introspection
+##################################################
+
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 ##################################################
 # Checks for gtk-doc and docbook-tools

demos/Makefile.am

@@ -19,11 +19,14 @@ DEPS = 									\
 LDADDS = 								\
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/$(gtktargetlib)				\
+	$(GTK_DEP_LIBS)							\
+	$(MATH_LIB)
 
 noinst_PROGRAMS = 		\
 	testpixbuf-drawable 	\
 	testanimation 		\
+	testpixbuf-color	\
 	testpixbuf-save		\
 	testpixbuf-scale 	\
 	pixbuf-demo
@@ -52,6 +55,7 @@ test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
 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)
@@ -59,6 +63,7 @@ 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)
@@ -66,6 +71,7 @@ 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
 testanimation_SOURCES = testanimation.c pixbuf-init.c
 pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c

demos/gtk-demo/Makefile.am

@@ -62,7 +62,8 @@ DEPS = \
 LDADDS = \
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/$(gtktargetlib)				\
+	$(GTK_DEP_LIBS)
 
 bin_PROGRAMS = gtk-demo
 

demos/gtk-demo/appwindow.c

@@ -595,7 +595,7 @@ do_appwindow (GtkWidget *do_widget)
       update_statusbar (buffer, GTK_STATUSBAR (statusbar));
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/assistant.c

@@ -153,7 +153,7 @@ do_assistant (GtkWidget *do_widget)
 			G_CALLBACK (on_assistant_prepare), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (assistant))
+  if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
     {

demos/gtk-demo/builder.c

@@ -53,7 +53,7 @@ do_builder (GtkWidget *do_widget)
 			G_CALLBACK (gtk_widget_destroyed), &window);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/button_box.c

@@ -113,7 +113,7 @@ do_button_box (GtkWidget *do_widget)
 			TRUE, TRUE, 5);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/clipboard.c

@@ -314,7 +314,7 @@ do_clipboard (GtkWidget *do_widget)
       gtk_clipboard_set_can_store (clipboard, NULL, 0);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/colorsel.c

@@ -125,7 +125,7 @@ do_colorsel (GtkWidget *do_widget)
 			G_CALLBACK (change_color_callback), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/combobox.c

@@ -440,7 +440,7 @@ do_combobox (GtkWidget *do_widget)
   
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/dialog.c

@@ -167,7 +167,7 @@ do_dialog (GtkWidget *do_widget)
       gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/drawingarea.c

@@ -57,7 +57,7 @@ scribble_expose_event (GtkWidget      *widget,
    */
 
   gdk_draw_drawable (widget->window,
-                     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                     widget->style->fg_gc[gtk_widget_get_state (widget)],
                      pixmap,
                      /* Only copy the area that was exposed. */
                      event->area.x, event->area.y,
@@ -318,7 +318,7 @@ do_drawingarea (GtkWidget *do_widget)
 
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/editable_cells.c

@@ -381,7 +381,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/entry_buffer.c

@@ -54,7 +54,7 @@ do_entry_buffer (GtkWidget *do_widget)
     g_object_unref (buffer);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/entry_completion.c

@@ -86,7 +86,7 @@ do_entry_completion (GtkWidget *do_widget)
     gtk_entry_completion_set_text_column (completion, 0);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/expander.c

@@ -47,7 +47,7 @@ do_expander (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (expander), label);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/hypertext.c

@@ -300,7 +300,7 @@ do_hypertext (GtkWidget *do_widget)
       gtk_widget_show_all (sw);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/iconview.c

@@ -358,7 +358,7 @@ do_iconview (GtkWidget *do_widget)
 	}
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/iconview_edit.c

@@ -146,7 +146,7 @@ do_iconview_edit (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), icon_view);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/images.c

@@ -450,7 +450,7 @@ do_images (GtkWidget *do_widget)
                         vbox);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/infobar.c

@@ -90,7 +90,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/links.c

@@ -70,7 +70,7 @@ do_links (GtkWidget *do_widget)
       gtk_widget_show (label);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/list_store.c

@@ -272,7 +272,7 @@ do_list_store (GtkWidget *do_widget)
                         G_CALLBACK (window_closed), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
       if (timeout == 0) {

demos/gtk-demo/menus.c

@@ -191,12 +191,12 @@ do_menus (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK(gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/offscreen_window.c

@@ -166,7 +166,7 @@ gtk_rotated_bin_class_init (GtkRotatedBinClass *klass)
 static void
 gtk_rotated_bin_init (GtkRotatedBin *bin)
 {
-  GTK_WIDGET_UNSET_FLAGS (bin, GTK_NO_WINDOW);
+  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
 }
 
 GtkWidget *
@@ -184,7 +184,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
  GtkAllocation child_area;
  double x, y;
 
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ if (bin->child && gtk_widget_get_visible (bin->child))
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
@@ -229,7 +229,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   gint border_width;
   GtkRequisition child_requisition;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 
@@ -262,7 +262,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
 
   child_requisition.width = child_requisition.height = 0;
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       attributes.width = bin->child->allocation.width;
       attributes.height = bin->child->allocation.height;
@@ -331,7 +331,7 @@ gtk_rotated_bin_remove (GtkContainer *container,
   GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
   gboolean was_visible;
 
-  was_visible = GTK_WIDGET_VISIBLE (widget);
+  was_visible = gtk_widget_get_visible (widget);
 
   if (bin->child == widget)
     {
@@ -339,7 +339,7 @@ gtk_rotated_bin_remove (GtkContainer *container,
 
       bin->child = NULL;
 
-      if (was_visible && GTK_WIDGET_VISIBLE (container))
+      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
         gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
@@ -382,7 +382,7 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   child_requisition.width = 0;
   child_requisition.height = 0;
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     gtk_widget_size_request (bin->child, &child_requisition);
 
   s = sin (bin->angle);
@@ -410,13 +410,13 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     gdk_window_move_resize (widget->window,
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       GtkRequisition child_requisition;
       GtkAllocation child_allocation;
@@ -436,7 +436,7 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
         child_allocation.width = MIN ((w - s * child_allocation.height) / c,
                                       (h - c * child_allocation.height) / s);
 
-      if (GTK_WIDGET_REALIZED (widget))
+      if (gtk_widget_get_realized (widget))
         gdk_window_move_resize (bin->offscreen_window,
                                 child_allocation.x,
                                 child_allocation.y,
@@ -466,7 +466,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
   gdouble s, c;
   gdouble w, h;
 
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       if (event->window == widget->window)
         {
@@ -474,7 +474,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
           GtkAllocation child_area;
           cairo_t *cr;
 
-          if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+          if (bin->child && gtk_widget_get_visible (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
               child_area = bin->child->allocation;
@@ -566,7 +566,7 @@ do_offscreen_window (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (bin), button);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/offscreen_window2.c

@@ -104,7 +104,7 @@ gtk_mirror_bin_class_init (GtkMirrorBinClass *klass)
 static void
 gtk_mirror_bin_init (GtkMirrorBin *bin)
 {
-  GTK_WIDGET_UNSET_FLAGS (bin, GTK_NO_WINDOW);
+  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
 }
 
 GtkWidget *
@@ -122,7 +122,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
  GtkAllocation child_area;
  double x, y;
 
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ if (bin->child && gtk_widget_get_visible (bin->child))
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
@@ -167,7 +167,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   gint border_width;
   GtkRequisition child_requisition;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 
@@ -200,7 +200,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
 
   child_requisition.width = child_requisition.height = 0;
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       attributes.width = bin->child->allocation.width;
       attributes.height = bin->child->allocation.height;
@@ -269,7 +269,7 @@ gtk_mirror_bin_remove (GtkContainer *container,
   GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
   gboolean was_visible;
 
-  was_visible = GTK_WIDGET_VISIBLE (widget);
+  was_visible = gtk_widget_get_visible (widget);
 
   if (bin->child == widget)
     {
@@ -277,7 +277,7 @@ gtk_mirror_bin_remove (GtkContainer *container,
 
       bin->child = NULL;
 
-      if (was_visible && GTK_WIDGET_VISIBLE (container))
+      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
         gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
@@ -306,7 +306,7 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
   child_requisition.width = 0;
   child_requisition.height = 0;
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  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;
@@ -327,13 +327,13 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     gdk_window_move_resize (widget->window,
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       GtkRequisition child_requisition;
       GtkAllocation child_allocation;
@@ -344,7 +344,7 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
       child_allocation.height = child_requisition.height;
       child_allocation.width = child_requisition.width;
 
-      if (GTK_WIDGET_REALIZED (widget))
+      if (gtk_widget_get_realized (widget))
         gdk_window_move_resize (bin->offscreen_window,
                                 allocation->x + border_width,
                                 allocation->y + border_width,
@@ -369,7 +369,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   gint width, height;
 
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       if (event->window == widget->window)
         {
@@ -378,7 +378,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
           cairo_matrix_t matrix;
           cairo_pattern_t *mask;
 
-          if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+          if (bin->child && gtk_widget_get_visible (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
               gdk_drawable_get_size (pixmap, &width, &height);
@@ -487,7 +487,7 @@ do_offscreen_window2 (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (hbox), applybutton, FALSE, FALSE, 0);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/panes.c

@@ -180,7 +180,7 @@ do_panes (GtkWidget *do_widget)
       gtk_widget_show_all (vbox);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/pickers.c

@@ -59,7 +59,7 @@ do_pickers (GtkWidget *do_widget)
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/pixbufs.c

@@ -260,7 +260,7 @@ do_pixbufs (GtkWidget *do_widget)
         }
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/rotated_text.c

@@ -223,7 +223,7 @@ do_rotated_text (GtkWidget *do_widget)
       pango_attr_list_unref (attrs);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/search_entry.c

@@ -1,6 +1,6 @@
-/* Entry/Search Entry 
+/* Entry/Search Entry
  *
- * GtkEntry allows to display icons and progress information. 
+ * GtkEntry allows to display icons and progress information.
  * This demo shows how to use these features in a search entry.
  */
 
@@ -45,21 +45,21 @@ finish_search (GtkButton *button)
   show_find_button ();
   g_source_remove (search_progress_id);
   search_progress_id = 0;
-  
+
   return FALSE;
 }
 
 static gboolean
 start_search_feedback (gpointer data)
 {
-  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100, 
+  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100,
                                            (GSourceFunc)search_progress, data,
                                            (GDestroyNotify)search_progress_done);
   return FALSE;
 }
 
 static void
-start_search (GtkButton *button, 
+start_search (GtkButton *button,
               GtkEntry  *entry)
 {
   show_cancel_button ();
@@ -77,16 +77,99 @@ stop_search (GtkButton *button,
 }
 
 static void
-icon_press_cb (GtkEntry       *entry, 
+clear_entry (GtkEntry *entry)
+{
+  gtk_entry_set_text (entry, "");
+}
+
+static void
+search_by_name (GtkWidget *item,
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_FIND);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by name\n"
+                                   "Click here to change the search type");
+}
+
+static void
+search_by_description (GtkWidget *item,
+                       GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_EDIT);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by description\n"
+                                   "Click here to change the search type");
+}
+
+static void
+search_by_file (GtkWidget *item,
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_OPEN);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by file name\n"
+                                   "Click here to change the search type");
+}
+
+GtkWidget *
+create_search_menu (GtkWidget *entry)
+{
+  GtkWidget *menu;
+  GtkWidget *item;
+  GtkWidget *image;
+
+  menu = gtk_menu_new ();
+
+  item = gtk_image_menu_item_new_with_mnemonic ("Search by _name");
+  image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (search_by_name), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_image_menu_item_new_with_mnemonic ("Search by _description");
+  image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (search_by_description), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_image_menu_item_new_with_mnemonic ("Search by _file name");
+  image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (search_by_file), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  gtk_widget_show_all (menu);
+
+  return menu;
+}
+
+static void
+icon_press_cb (GtkEntry       *entry,
                gint            position,
                GdkEventButton *event,
                gpointer        data)
 {
   if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
+    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
                     event->button, event->time);
-  else 
-    gtk_entry_set_text (entry, "");
+  else
+    clear_entry (entry);
 }
 
 static void
@@ -97,7 +180,7 @@ text_changed_cb (GtkEntry   *entry,
   gboolean has_text;
 
   has_text = gtk_entry_get_text_length (entry) > 0;
-  gtk_entry_set_icon_sensitive (entry, 
+  gtk_entry_set_icon_sensitive (entry,
                                 GTK_ENTRY_ICON_SECONDARY,
                                 has_text);
   gtk_widget_set_sensitive (button, has_text);
@@ -114,45 +197,6 @@ activate_cb (GtkEntry  *entry,
 
 }
 
-static void
-search_by_name (GtkWidget *item, 
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_FIND);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by name\n"
-                                   "Click here to change the search type");
-} 
-                
-static void
-search_by_description (GtkWidget *item, 
-                       GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_EDIT);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by description\n"
-                                   "Click here to change the search type");
-} 
-                
-static void
-search_by_file (GtkWidget *item, 
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_OPEN);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by file name\n"
-                                   "Click here to change the search type");
-} 
-
 static void
 search_entry_destroyed (GtkWidget  *widget)
 {
@@ -165,7 +209,35 @@ search_entry_destroyed (GtkWidget  *widget)
   window = NULL;
 }
 
-                
+static void
+entry_populate_popup (GtkEntry *entry,
+                      GtkMenu  *menu,
+                      gpointer user_data)
+{
+  GtkWidget *item;
+  GtkWidget *search_menu;
+  gboolean has_text;
+
+  has_text = gtk_entry_get_text_length (entry) > 0;
+
+  item = gtk_separator_menu_item_new ();
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_menu_item_new_with_mnemonic ("C_lear");
+  gtk_widget_show (item);
+  g_signal_connect_swapped (item, "activate",
+                            G_CALLBACK (clear_entry), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_widget_set_sensitive (item, has_text);
+
+  search_menu = create_search_menu (GTK_WIDGET (entry));
+  item = gtk_menu_item_new_with_label ("Search by");
+  gtk_widget_show (item);
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), search_menu);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+}
+
 GtkWidget *
 do_search_entry (GtkWidget *do_widget)
 {
@@ -173,19 +245,17 @@ do_search_entry (GtkWidget *do_widget)
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *entry;
-  GtkWidget *item;
-  GtkWidget *image;
   GtkWidget *find_button;
   GtkWidget *cancel_button;
-  
+
   if (!window)
     {
       window = gtk_dialog_new_with_buttons ("Search Entry",
                                             GTK_WINDOW (do_widget),
- 					    0,
-					    GTK_STOCK_CLOSE,
-					    GTK_RESPONSE_NONE,
-					    NULL);
+                                            0,
+                                            GTK_STOCK_CLOSE,
+                                            GTK_RESPONSE_NONE,
+                                            NULL);
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
       g_signal_connect (window, "response",
@@ -216,59 +286,43 @@ do_search_entry (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE, 0);
 
       find_button = gtk_button_new_with_label ("Find");
-      g_signal_connect (find_button, "clicked", 
+      g_signal_connect (find_button, "clicked",
                         G_CALLBACK (start_search), entry);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), find_button, NULL);
       gtk_widget_show (find_button);
 
       cancel_button = gtk_button_new_with_label ("Cancel");
-      g_signal_connect (cancel_button, "clicked", 
+      g_signal_connect (cancel_button, "clicked",
                         G_CALLBACK (stop_search), NULL);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), cancel_button, NULL);
       gtk_widget_show (cancel_button);
 
       /* Set up the search icon */
       search_by_name (NULL, GTK_ENTRY (entry));
-      
+
       /* Set up the clear icon */
-      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), 
-                                     GTK_ENTRY_ICON_SECONDARY, 
+      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
                                      GTK_STOCK_CLEAR);
       text_changed_cb (GTK_ENTRY (entry), NULL, find_button);
 
-      g_signal_connect (entry, "icon-press", 
+      g_signal_connect (entry, "icon-press",
                         G_CALLBACK (icon_press_cb), NULL);
-      g_signal_connect (entry, "notify::text", 
+      g_signal_connect (entry, "notify::text",
                         G_CALLBACK (text_changed_cb), find_button);
-      g_signal_connect (entry, "activate", 
+      g_signal_connect (entry, "activate",
                         G_CALLBACK (activate_cb), NULL);
 
       /* Create the menu */
-      menu = gtk_menu_new ();
+      menu = create_search_menu (entry);
       gtk_menu_attach_to_widget (GTK_MENU (menu), entry, NULL);
 
-      item = gtk_image_menu_item_new_with_label ("Search by name");
-      image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_name), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      item = gtk_image_menu_item_new_with_label ("Search by description");
-      image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_description), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      item = gtk_image_menu_item_new_with_label ("Search by file name");
-      image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_file), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      gtk_widget_show_all (menu);
+      /* add accessible alternatives for icon functionality */
+      g_signal_connect (entry, "populate-popup",
+                        G_CALLBACK (entry_populate_popup), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {
@@ -279,5 +333,3 @@ do_search_entry (GtkWidget *do_widget)
 
   return window;
 }
-
-

demos/gtk-demo/sizegroup.c

@@ -158,7 +158,7 @@ do_sizegroup (GtkWidget *do_widget)
 			G_CALLBACK (toggle_grouping), size_group);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/spinner.c

@@ -83,7 +83,7 @@ do_spinner (GtkWidget *do_widget)
     on_play_clicked (NULL, NULL);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/stock_browser.c

@@ -532,7 +532,7 @@ do_stock_browser (GtkWidget *do_widget)
 			NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/textscroll.c

@@ -191,7 +191,7 @@ do_textscroll (GtkWidget *do_widget)
       create_text_view (hbox, FALSE);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/textview.c

@@ -500,7 +500,7 @@ do_textview (GtkWidget *do_widget)
       gtk_widget_show_all (vpaned);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/toolpalette.c

@@ -151,9 +151,9 @@ palette_drop_item (GtkToolItem      *drag_item,
 }
 
 static void
-palette_drop_group (GtkToolPalette *palette,
-                    GtkWidget      *drag_group,
-                    GtkWidget      *drop_group)
+palette_drop_group (GtkToolPalette   *palette,
+                    GtkToolItemGroup *drag_group,
+                    GtkToolItemGroup *drop_group)
 {
   gint drop_position = -1;
 
@@ -173,8 +173,9 @@ palette_drag_data_received (GtkWidget        *widget,
                             guint             time,
                             gpointer          data)
 {
-  GtkWidget *drag_palette = gtk_drag_get_source_widget (context);
-  GtkWidget *drag_item = NULL, *drop_group = NULL;
+  GtkToolItemGroup *drop_group = NULL;
+  GtkWidget        *drag_palette = gtk_drag_get_source_widget (context);
+  GtkWidget        *drag_item = NULL;
 
   while (drag_palette && !GTK_IS_TOOL_PALETTE (drag_palette))
     drag_palette = gtk_widget_get_parent (drag_palette);
@@ -188,10 +189,12 @@ palette_drag_data_received (GtkWidget        *widget,
     }
 
   if (GTK_IS_TOOL_ITEM_GROUP (drag_item))
-    palette_drop_group (GTK_TOOL_PALETTE (drag_palette), drag_item, drop_group);
+    palette_drop_group (GTK_TOOL_PALETTE (drag_palette),
+                        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),
-                       GTK_TOOL_ITEM_GROUP (drop_group),
+                       drop_group,
                        x - GTK_WIDGET (drop_group)->allocation.x,
                        y - GTK_WIDGET (drop_group)->allocation.y);
 }
@@ -613,7 +616,7 @@ do_toolpalette (GtkWidget *do_widget)
                                 gtk_label_new ("Interactive DnD Mode"));
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/tree_store.c

@@ -438,7 +438,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/ui_manager.c

@@ -221,7 +221,7 @@ do_ui_manager (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK (gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
 
       gtk_widget_show_all (window);

demos/testpixbuf-color.c

@@ -0,0 +1,161 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+
+#include "config.h"
+#include <stdio.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#define ICC_PROFILE             "/usr/share/color/icc/bluish.icc"
+#define ICC_PROFILE_SIZE        3966
+
+static gboolean
+save_image_png (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
+{
+	gchar *contents = NULL;
+	gchar *contents_encode = NULL;
+	gsize length;
+	gboolean ret;
+	gint len;
+
+	/* get icc file */
+	ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
+	if (!ret)
+		goto out;
+	contents_encode = g_base64_encode ((const guchar *) contents, length);
+	ret = gdk_pixbuf_save (pixbuf, filename, "png", error,
+			       "tEXt::Software", "Hello my name is dave",
+			       "icc-profile", contents_encode,
+			       NULL);
+	len = strlen (contents_encode);
+	g_debug ("ICC profile was %i bytes", len);
+out:
+	g_free (contents);
+	g_free (contents_encode);
+	return ret;
+}
+
+static gboolean
+save_image_tiff (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
+{
+	gchar *contents = NULL;
+	gchar *contents_encode = NULL;
+	gsize length;
+	gboolean ret;
+	gint len;
+
+	/* get icc file */
+	ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
+	if (!ret)
+		goto out;
+	contents_encode = g_base64_encode ((const guchar *) contents, length);
+	ret = gdk_pixbuf_save (pixbuf, filename, "tiff", error,
+			       "icc-profile", contents_encode,
+			       NULL);
+	len = strlen (contents_encode);
+	g_debug ("ICC profile was %i bytes", len);
+out:
+	g_free (contents);
+	g_free (contents_encode);
+	return ret;
+}
+
+static gboolean
+save_image_verify (const gchar *filename, GError **error)
+{
+	gboolean ret = FALSE;
+	GdkPixbuf *pixbuf = NULL;
+	const gchar *option;
+	gchar *icc_profile = NULL;
+	gsize len = 0;
+
+	/* load */
+	pixbuf = gdk_pixbuf_new_from_file (filename, error);
+	if (pixbuf == NULL)
+		goto out;
+
+	/* check values */
+	option = gdk_pixbuf_get_option (pixbuf, "icc-profile");
+	if (option == NULL) {
+		*error = g_error_new (1, 0, "no profile set");
+		goto out;
+	}
+
+	/* decode base64 */
+	icc_profile = (gchar *) g_base64_decode (option, &len);
+	if (len != ICC_PROFILE_SIZE) {
+		*error = g_error_new (1, 0,
+		                      "profile length invalid, got %" G_GSIZE_FORMAT,
+		                      len);
+		g_file_set_contents ("error.icc", icc_profile, len, NULL);
+		goto out;
+	}
+
+	/* success */
+	ret = TRUE;
+out:
+	if (pixbuf != NULL)
+		g_object_unref (pixbuf);
+	g_free (icc_profile);
+	return ret;
+}
+
+int
+main (int argc, char **argv)
+{
+	GdkWindow *root;
+	GdkPixbuf *pixbuf;
+	gboolean ret;
+	gint retval = 1;
+	GError *error = NULL;
+
+	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);
+
+	/* PASS */
+	g_debug ("try to save PNG with a profile");
+	ret = save_image_png ("icc-profile.png", pixbuf, &error);
+	if (!ret) {
+		g_warning ("FAILED: did not save image: %s", error->message);
+		g_error_free (error);
+		goto out;
+	}
+
+	/* PASS */
+	g_debug ("try to save TIFF with a profile");
+	ret = save_image_tiff ("icc-profile.tiff", pixbuf, &error);
+	if (!ret) {
+		g_warning ("FAILED: did not save image: %s", error->message);
+		g_error_free (error);
+		goto out;
+	}
+
+	/* PASS */
+	g_debug ("try to load PNG and get color attributes");
+	ret = save_image_verify ("icc-profile.png", &error);
+	if (!ret) {
+		g_warning ("FAILED: did not load image: %s", error->message);
+		g_error_free (error);
+		goto out;
+	}
+
+	/* PASS */
+	g_debug ("try to load TIFF and get color attributes");
+	ret = save_image_verify ("icc-profile.tiff", &error);
+	if (!ret) {
+		g_warning ("FAILED: did not load image: %s", error->message);
+		g_error_free (error);
+		goto out;
+	}
+
+	/* success */
+	retval = 0;
+	g_debug ("ALL OKAY!");
+out:
+	return retval;
+}

docs/RELEASE-HOWTO

@@ -7,6 +7,7 @@ dependencies:
 * gtk-doc
 * docbook-utils
 Without those packages make distcheck will *not* pass.
+Make sure that gtk-doc is the latest released version.
 
 
  0) Go back to a pristine working directory. With git, this works:
@@ -101,7 +102,7 @@ Without those packages make distcheck will *not* pass.
     summary of changes.
 
 18) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
-    gtk-devel-list. Set reply-to to gnome-hackers.
+    gtk-devel-list. Set reply-to to desktop-devel-list.
 
 19) Add a link to the release announcement to www.gtk.org which lives
-    in the gtk-web cvs module.
+    in the gtk-web git module.

docs/reference/gdk-pixbuf/gdk-pixbuf.sgml

@@ -186,4 +186,7 @@
       </address>
     </para>
   </appendix>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/gdk-pixbuf/tmpl/animation.sgml

@@ -23,6 +23,9 @@ Animated images.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
 <para>
 An opaque struct representing an animation.
@@ -152,6 +155,11 @@ An opaque struct representing a simple animation.
 </para>
 
 
+<!-- ##### ARG GdkPixbufSimpleAnim:loop ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gdk_pixbuf_simple_anim_new ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/creating.sgml

@@ -46,6 +46,9 @@ Creating a pixbuf from image data that is already in memory.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/file-loading.sgml

@@ -28,6 +28,9 @@ Loading a pixbuf from a file.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/file-saving.sgml

@@ -21,6 +21,9 @@ to a socket or store it in a database.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml

@@ -72,6 +72,9 @@ Application-driven progressive image loading.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufLoader ##### -->
 <para>
 The <structname>GdkPixbufLoader</structname> struct contains only private
@@ -114,6 +117,7 @@ fields.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml

@@ -26,6 +26,9 @@ Getting parts of an X drawable's image data into a pixbuf.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_get_from_drawable ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml

@@ -23,6 +23,9 @@ Initializing the &gdk-pixbuf; Xlib library.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_init ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml

@@ -24,6 +24,9 @@ Rendering a pixbuf to an X drawable.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_render_threshold_alpha ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml

@@ -20,6 +20,9 @@ Rendering RGB buffers to X drawables.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT XlibRgbCmap ##### -->
   <para>
     FIXME: Describe this.
@@ -198,6 +201,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -230,6 +234,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -238,6 +243,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -246,6 +252,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -254,6 +261,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -262,6 +270,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -270,6 +279,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: <!--
 Local variables:
 mode: sgml

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml

@@ -93,6 +93,9 @@ put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blu
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkPixbufError ##### -->
 <para>
 An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;

docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml

@@ -19,6 +19,9 @@ you're linking against.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### VARIABLE gdk_pixbuf_version ##### -->
 <para>
 Contains the full version of the &gdk-pixbuf; library as a string.

docs/reference/gdk-pixbuf/tmpl/inline.sgml

@@ -22,6 +22,9 @@ into #GdkPixbuf<!-- -->s, use gdk_pixbuf_from_pixdata.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixdata ##### -->
   <para>
 

docs/reference/gdk-pixbuf/tmpl/module_interface.sgml

@@ -68,6 +68,9 @@ They are not covered by the same stability guarantees as the regular
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_set_option ##### -->
 <para>
 
@@ -84,6 +87,7 @@ They are not covered by the same stability guarantees as the regular
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk-pixbuf/tmpl/refcounting.sgml

@@ -48,6 +48,9 @@ Functions for reference counting and memory management on pixbufs.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
   <para>
 

docs/reference/gdk-pixbuf/tmpl/scaling.sgml

@@ -81,6 +81,9 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkInterpType ##### -->
   <para>
     This enumeration describes the different interpolation modes that

docs/reference/gdk-pixbuf/tmpl/util.sgml

@@ -20,6 +20,9 @@ Utility and miscellaneous convenience functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_add_alpha ##### -->
 <para>
 

docs/reference/gdk/gdk-docs.sgml

@@ -107,5 +107,12 @@
   <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>
+  <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>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/gdk/gdk-sections.txt

@@ -215,6 +215,7 @@ gdk_screen_list_visuals
 gdk_screen_get_toplevel_windows
 gdk_screen_make_display_name
 gdk_screen_get_n_monitors
+gdk_screen_get_primary_monitor
 gdk_screen_get_monitor_geometry
 gdk_screen_get_monitor_at_point
 gdk_screen_get_monitor_at_window
@@ -1005,6 +1006,8 @@ gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
+gdk_keymap_add_virtual_modifiers
+gdk_keymap_map_virtual_modifiers
 
 <SUBSECTION>
 gdk_keyval_name

docs/reference/gdk/tmpl/cairo_interaction.sgml

@@ -27,6 +27,9 @@ Cairo paths and to use pixbufs as sources for drawing operations.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_cairo_create ##### -->
 <para>
 

docs/reference/gdk/tmpl/colors.sgml

@@ -46,6 +46,9 @@ gdk_color_change() will probably become aliases.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkColor ##### -->
 <para>
 The #GdkColor structure is used to describe an 
@@ -102,6 +105,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -109,6 +113,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/cursors.sgml

@@ -31,6 +31,9 @@ gdk_window_set_cursor() or by setting the cursor member of the
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkCursor ##### -->
 <para>
 A <type>GdkCursor</type> structure represents a cursor.

docs/reference/gdk/tmpl/dnd.sgml

@@ -25,6 +25,9 @@ the GTK+ documentation for more information.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_drag_get_selection ##### -->
 <para>
 </para>
@@ -54,6 +57,7 @@ the GTK+ documentation for more information.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/drawing.sgml

@@ -34,6 +34,9 @@ gtk_widget_create_pango_layout().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDrawable ##### -->
 <para>
 An opaque structure representing an object that can be

docs/reference/gdk/tmpl/event_structs.sgml

@@ -23,6 +23,9 @@ required events are received. See gtk_widget_set_events().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### UNION GdkEvent ##### -->
 <para>
 The #GdkEvent struct contains a union of all of the event structs,
@@ -221,7 +224,7 @@ Generated when all or part of a window becomes visible and needs to be
 redrawn.
 </para>
 
-@type: the type of the event (%GDK_EXPOSE).
+@type: the type of the event (%GDK_EXPOSE or %GDK_DAMAGE).
 @window: the window which received the event.
 @send_event: %TRUE if the event was sent explicitly (e.g. using 
 <function>XSendEvent</function>).

docs/reference/gdk/tmpl/events.sgml

@@ -30,6 +30,9 @@ The structs used for each type of event.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkEventType ##### -->
 <para>
 Specifies the type of the event.
@@ -165,6 +168,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -172,6 +176,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -179,6 +184,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -340,6 +346,7 @@ gdk_event_handler_set().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/fonts.sgml

@@ -264,6 +264,9 @@ here).
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkFont ##### -->
 <para>
 The <structname>GdkFont</structname> structure represents a font or fontset. It

docs/reference/gdk/tmpl/gcs.sgml

@@ -33,6 +33,9 @@ be set by the latter method.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkGC ##### -->
 <para>
 The #GdkGC structure represents a graphics context.

docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml

@@ -36,6 +36,9 @@ g_object_unref (context);
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GdkAppLaunchContext ##### -->
 <para>
 An opaque structure representing an application launch context.
@@ -47,6 +50,7 @@ An opaque structure representing an application launch context.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdkdisplay.sgml

@@ -31,6 +31,9 @@ Controls the keyboard/mouse pointer grabs and a set of <type>GdkScreen</type>s
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDisplay ##### -->
 <para>
 The <structname>GdkDisplay</structname> struct is the GDK representation
@@ -61,6 +64,7 @@ of an X display. All its fields are private and should not be accessed directly.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdkdisplaymanager.sgml

@@ -19,6 +19,9 @@ changes.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDisplayManager ##### -->
 <para>
 The <structname>GdkDisplayManager</structname> struct has no interesting 
@@ -45,6 +48,7 @@ fields.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdkscreen.sgml

@@ -25,6 +25,9 @@ form a large screen area.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkScreen ##### -->
 <para>
 This is a currently just a placeholder typedef for the first argument of 
@@ -70,6 +73,7 @@ when GDK gets multihead support.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -253,6 +257,15 @@ when GDK gets multihead support.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_screen_get_primary_monitor ##### -->
+<para>
+
+</para>
+
+@screen: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_screen_get_monitor_geometry ##### -->
 <para>
 

docs/reference/gdk/tmpl/gdktesting.sgml

@@ -18,6 +18,9 @@ They allow to simulate some user input.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_test_render_sync ##### -->
 <para>
 

docs/reference/gdk/tmpl/general.sgml

@@ -18,6 +18,9 @@ utility functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_init ##### -->
 <para>
 Initializes the GDK library and connects to the X server.
@@ -70,6 +73,7 @@ by GTK+ applications.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -94,6 +98,7 @@ If the locale is not supported by X then it is reset to the standard "C"
 locale.
 </para>
 
+@void: 
 @Returns: the resulting locale.
 
 
@@ -123,6 +128,7 @@ of g_atexit()).
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_notify_startup_complete_with_id ##### -->
@@ -141,6 +147,7 @@ commandline option, the default value is the program name (determined
 with g_get_prgname()) with the first character converted to uppercase. 
 </para>
 
+@void: 
 @Returns: the program class.
 
 
@@ -160,6 +167,7 @@ Gets the name of the display, which usually comes from the <envar>DISPLAY</envar
 environment variable or the <option>--display</option> command line option.
 </para>
 
+@void: 
 @Returns: the name of the display.
 
 
@@ -170,12 +178,14 @@ by the server. This is rarely needed by applications. It's main use is for
 trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_screen_width ##### -->
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -183,6 +193,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -190,6 +201,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -197,6 +209,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -279,6 +292,7 @@ success or the reason for the failure of the grab attempt.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -324,6 +338,7 @@ available.
 <para>
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_get_use_xshm ##### -->
@@ -338,6 +353,7 @@ SYSV shared memory calls. However, it can only be used if the X client and
 server are on the same machine and the server supports it.
 </para>
 
+@void: 
 @Returns: %TRUE if use of the MIT shared memory extension will be attempted.
 
 
@@ -375,6 +391,7 @@ avoid the X error in any other way.
 </programlisting>
 </example>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_error_trap_pop ##### -->
@@ -382,6 +399,7 @@ avoid the X error in any other way.
 Removes the X error trap installed with gdk_error_trap_push().
 </para>
 
+@void: 
 @Returns: the X error code, or 0 if no error occurred.
 
 

docs/reference/gdk/tmpl/images.sgml

@@ -58,6 +58,9 @@ displays.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkImage ##### -->
 <para>
 The #GdkImage struct contains information on the image and the pixel data.

docs/reference/gdk/tmpl/input.sgml

@@ -34,6 +34,9 @@ callbacks.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_input_add_full ##### -->
 
 

docs/reference/gdk/tmpl/input_devices.sgml

@@ -87,6 +87,9 @@ and <structfield>ytilt</structfield>.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDevice ##### -->
 <para>
 A <structname>GdkDevice</structname> structure contains
@@ -174,6 +177,7 @@ types that GTK+ understands.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -224,19 +228,17 @@ Specifies how an axis of a device is used.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
 <!-- ##### FUNCTION gdk_device_get_state ##### -->
-<para>
-Gets the current state of a device.
-</para>
 
-@device: a #GdkDevice.
-@window: a #GdkWindow.
-@axes: an array of doubles to store the values of the axes of @device in, 
-  or %NULL.
-@mask: location to store the modifiers, or %NULL.
+
+@device: 
+@window: 
+@axes: 
+@mask: 
 
 
 <!-- ##### FUNCTION gdk_device_get_history ##### -->

docs/reference/gdk/tmpl/keys.sgml

@@ -34,7 +34,7 @@ When it makes sense, key values can be converted to and from
 Unicode characters with gdk_keyval_to_unicode() and gdk_unicode_to_keyval().
 </para>
 
-<para>
+<para id="key-group-explanation">
 One #GdkKeymap object exists for each user display. gdk_keymap_get_default() 
 returns the #GdkKeymap for the default display; to obtain keymaps for other 
 displays, use gdk_keymap_get_for_display(). A keymap
@@ -88,6 +88,9 @@ gdk_keymap_translate_keyboard_state() just to get the keyval.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkKeymap ##### -->
 <para>
 A <structname>GdkKeymap</structname> defines the translation from keyboard state
@@ -143,6 +146,7 @@ be mapped to a keyval.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -234,6 +238,25 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_keymap_add_virtual_modifiers ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@state: 
+
+
+<!-- ##### FUNCTION gdk_keymap_map_virtual_modifiers ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@state: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_keyval_name ##### -->
 <para>
 Converts a key value into a symbolic name.

docs/reference/gdk/tmpl/pango_interaction.sgml

@@ -132,6 +132,9 @@ g_object_unref (gc);
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPangoRenderer ##### -->
 <para>
 
@@ -210,6 +213,7 @@ g_object_unref (gc);
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/pixbufs.sgml

@@ -19,6 +19,9 @@ pixbufs, see the #GdkPixbuf API documentation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
 <para>
 

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -21,6 +21,9 @@ pixel can be either on or off).
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable.
@@ -77,76 +80,45 @@ for the new pixmap. Can be %NULL, if the depth is given.
 
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm ##### -->
-<para>
-Create a pixmap from a XPM file.
-</para>
 
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap.
-@mask: a pointer to a place to store a bitmap representing
-the transparency mask of the XPM file. Can be %NULL,
-in which case transparency will be ignored.
-@transparent_color: the color to be used for the pixels
-that are transparent in the input file. Can be %NULL,
-in which case a default color will be used.
-@filename: the filename of a file containing XPM data.
-@Returns: the #GdkPixmap
+
+@drawable: 
+@mask: 
+@transparent_color: 
+@filename: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_pixmap_colormap_create_from_xpm ##### -->
-<para>
-Create a pixmap from a XPM file using a particular colormap.
-</para>
 
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap. Can be %NULL if @colormap is given.
-@colormap: the #GdkColormap that the new pixmap will be use.
-  If omitted, the colormap for @window will be used.
-@mask: a pointer to a place to store a bitmap representing
-the transparency mask of the XPM file. Can be %NULL,
-in which case transparency will be ignored.
-@transparent_color: the color to be used for the pixels
-that are transparent in the input file. Can be %NULL,
-in which case a default color will be used.
-@filename: the filename of a file containing XPM data.
-@Returns: the #GdkPixmap.
+
+@drawable: 
+@colormap: 
+@mask: 
+@transparent_color: 
+@filename: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm_d ##### -->
-<para>
-Create a pixmap from data in XPM format.
-</para>
 
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap.
-@mask: Pointer to a place to store a bitmap representing
-the transparency mask of the XPM file. Can be %NULL,
-in which case transparency will be ignored.
-@transparent_color: This color will be used for the pixels
-that are transparent in the input file. Can be %NULL
-in which case a default color will be used.
-@data: Pointer to a string containing the XPM data.
-@Returns: the #GdkPixmap
+
+@drawable: 
+@mask: 
+@transparent_color: 
+@data: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_pixmap_colormap_create_from_xpm_d ##### -->
-<para>
-Create a pixmap from data in XPM format using a particular
-colormap.
-</para>
 
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap. Can be %NULL if @colormap is given.
-@colormap: the #GdkColormap that the new pixmap will be use.
-  If omitted, the colormap for @window will be used.
-@mask: a pointer to a place to store a bitmap representing
-the transparency mask of the XPM file. Can be %NULL,
-in which case transparency will be ignored.
-@transparent_color: the color to be used for the pixels
-that are transparent in the input file. Can be %NULL,
-in which case a default color will be used.
-@data: Pointer to a string containing the XPM data.
-@Returns: the #GdkPixmap.
+
+@drawable: 
+@colormap: 
+@mask: 
+@transparent_color: 
+@data: 
+@Returns: 
 
 
 <!-- ##### MACRO gdk_pixmap_ref ##### -->

docs/reference/gdk/tmpl/properties.sgml

@@ -45,6 +45,9 @@ data commonly stored in X window properties.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkAtom ##### -->
 <para>
 An opaque type representing a string as an index into a table

docs/reference/gdk/tmpl/regions.sgml

@@ -36,6 +36,9 @@ It can be intersected to regions by using gdk_region_spans_intersect_foreach().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPoint ##### -->
 <para>
 Defines the x and y coordinates of a point.
@@ -86,6 +89,7 @@ A GdkRegion represents a set of pixels on the screen.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/rgb.sgml

@@ -125,12 +125,16 @@ colors.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_rgb_init ##### -->
 <para>
 This function no longer does anything at all. It's completely useless
 (and harmless).
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_draw_rgb_image ##### -->
@@ -399,6 +403,7 @@ private colormap.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -407,6 +412,7 @@ private colormap.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -427,6 +433,7 @@ dither mode is desired; if the display is not ditherable, it may make
 sense to gray out or hide the corresponding UI widget.
 </para>
 
+@void: 
 @Returns: %TRUE if the preferred visual is ditherable.
 
 

docs/reference/gdk/tmpl/selections.sgml

@@ -50,6 +50,9 @@ to the X Inter-client Communication Conventions Manual
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GdkSelection ##### -->
 <para>
 The #GdkSelection enumeration contains predefined 

docs/reference/gdk/tmpl/threads.sgml

@@ -250,6 +250,9 @@ int main (int argc, char *argv[])
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO GDK_THREADS_ENTER ##### -->
 <para>
 This macro marks the beginning of a critical section in which GDK and
@@ -275,6 +278,7 @@ begun with #GDK_THREADS_ENTER.
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_threads_enter ##### -->
@@ -285,6 +289,7 @@ conditions.  Only one thread at a time can be in such a critial
 section.
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_threads_leave ##### -->
@@ -292,6 +297,7 @@ section.
 Leaves a critical region begun with gdk_threads_enter(). 
 </para>
 
+@void: 
 
 
 <!-- ##### VARIABLE gdk_threads_mutex ##### -->

docs/reference/gdk/tmpl/visuals.sgml

@@ -54,6 +54,9 @@ then %GDK_VISUAL_STATIC_GRAY.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkVisual ##### -->
 <para>
 The <type>GdkVisual</type> structure contains information about
@@ -171,6 +174,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -179,6 +183,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -187,6 +192,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -195,6 +201,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -203,6 +210,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/windows.sgml

@@ -210,6 +210,9 @@ gdk_offscreen_window_get_pixmap().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkWindow ##### -->
 <para>
 An opaque structure representing an onscreen drawable.
@@ -985,7 +988,7 @@ Registers a window as a potential drop destination.
 
 @window: 
 @region: 
-@child_func: 
+@GdkWindow *, gpointer: 
 @user_data: 
 
 
@@ -1019,6 +1022,7 @@ Registers a window as a potential drop destination.
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_window_process_updates ##### -->
@@ -1746,6 +1750,7 @@ The hint must be set before mapping the window.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -1754,6 +1759,7 @@ The hint must be set before mapping the window.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/x_interaction.sgml

@@ -17,6 +17,9 @@ X backend-specific functions
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO GDK_ROOT_WINDOW ##### -->
 <para>
 Obtains the Xlib window id of the root window of the current screen. 
@@ -657,6 +660,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -665,6 +669,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -673,6 +678,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -681,6 +687,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_x11_image_get_xdisplay ##### -->
@@ -724,6 +731,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_x11_visual_get_xvisual ##### -->

docs/reference/gtk/building.sgml

@@ -244,17 +244,24 @@ How to compile GTK+ itself
 	<para>
 	  The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
 	  library provides Pango with a standard way of locating
-	  fonts and matching them against font names. 
+	  fonts and matching them against font names.
 	</para>
       </listitem>
       <listitem>
 	<para>
 	  <ulink url="http://www.cairographics.org">Cairo</ulink>
-          is a graphics library that supports vector graphics and image 
+          is a graphics library that supports vector graphics and image
           compositing. Both Pango and GTK+ use cairo for much of their
           drawing.
         </para>
       </listitem>
+      <listitem>
+	<para>
+	  <ulink url="http://live.gnome.org/GObjectIntrospection">gobject-introspection</ulink>
+          is a framework for making introspection data available to
+          language bindings.
+        </para>
+      </listitem>
       <listitem>
         <para>
           The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink> 
@@ -368,6 +375,9 @@ How to compile GTK+ itself
 	  <group>
 	    <arg>--with-gdktarget=[x11|win32|quartz|directfb]</arg>
 	  </group>
+          <group>
+	    <arg>--disable-introspection</arg>
+          </group>
 	</cmdsynopsis>
       </para>
 
@@ -580,7 +590,13 @@ How to compile GTK+ itself
           for the Linux framebuffer.
 	</para>
       </formalpara>
+      <formalpara>
+        <title><systemitem>--disable-introspection</systemitem></title>
 
+        <para>
+          Build without introspection support.
+        </para>
+      </formalpara>
     </refsect1>
 
 </refentry>

docs/reference/gtk/compiling.sgml

@@ -69,12 +69,17 @@ toplevel headers <filename>gtk.h</filename>, <filename>gdk.h</filename>,
 If you want to make sure that your program follows this recommended
 practise, you can define the preprocessor symbols GTK_DISABLE_SINGLE_INCLUDES
 and GDK_PIXBUF_DISABLE_SINGLE_INCLUDES to make GTK+ generate an error
-when individual headers are directly included. 
+when individual headers are directly included.
+There are some exceptions: <filename>gdkkeysyms.h</filename> is not included in
+<filename>gdk.h</filename> because the file is quite large; see
+<link linkend="gdk-Keyboard-Handling">Key Values documentation</link>.
+<filename>gdkx.h</filename> must be included independently because It's
+platform-specific; see
+<link linkend="gdk-X-Window-System-Interaction">X Window System Interaction</link>
+documentation.
+The same for <filename>gtkunixprint.h</filename> if you use the non-portable
+<link linkend="GtkPrintUnixDialog">GtkPrintUnixDialog</link> API.
 </para>
 
 </refsect1>
 </refentry>
-
-
-
-

docs/reference/gtk/drawing-model.xml

@@ -124,11 +124,10 @@
 	However, in practice it is convenient to have widgets which do
 	not have a <classname>GdkWindow</classname> of their own, but
 	rather share the one from their parent widget.  Such widgets
-	have the <constant>GTK_NO_WINDOW</constant> <link
-	linkend="GtkWidgetFlags">widget flag</link> turned on; this
-	can be tested easily with the <link
-	linkend="GTK-WIDGET-NO-WINDOW-CAPS"><function>GTK_WIDGET_NO_WINDOW()</function></link>
-	macro.  As such, these are called <firstterm>no-window
+	have called <function>gtk_widget_set_has_window</function> to
+	disable it; this can be tested easily with the <link
+	linkend="gtk-widget-get-has-window"><function>gtk_widget_get_has_window()</function></link>
+	function.  As such, these are called <firstterm>no-window
 	widgets</firstterm>.
       </para>
 
@@ -444,7 +443,7 @@ my_widget_init (MyWidget *widget)
 {
   ...
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED);
+  gtk_widget_set_double_buffered (widget, FALSE);
 
   ...
 }
@@ -508,7 +507,7 @@ static gint
 gtk_window_expose (GtkWidget      *widget,
 		   GdkEventExpose *event)
 {
-  if (!GTK_WIDGET_APP_PAINTABLE (widget))
+  if (!gtk_widget_get_app_paintable (widget))
     gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_NORMAL, 
                         GTK_SHADOW_NONE, event->area, widget, "base", 0, 0, -1, -1);
 

docs/reference/gtk/glossary.xml

@@ -195,9 +195,8 @@
       <para>
 	A widget that does not have a GdkWindow of its own on which to
 	draw its contents, but rather shares its <glossterm
-	linkend="parent">parent's</glossterm>.  Such a widget has the
-	%GTK_NO_WINDOW <link linkend="GtkWidgetFlags">flag</link> set, and 
-        can be tested with the GTK_WIDGET_NO_WINDOW() macro.  See
+	linkend="parent">parent's</glossterm>.  This can be tested with
+	the gtk_widget_get_has_window() function.  See
 	<xref linkend="window-no-window-widgets"/> for a detailed
 	description of this flag.
       </para>