2.20.0

In certain cases the menu label of a notebook page will be reused after the
page was removed from the notebook, for instance when a page is dragged from
one notebook to another. For such cases make sure that the menu label isn't
destroyed as part of destroying the menu item it was in.

INSTALL.in

@@ -3,9 +3,9 @@ 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.
 
  - 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,500 @@
+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
+==============================================
+
+* Client-side windows:
+ - Avoid some unnecessary exposes
+ - Avoid unnecessary redraws related to clearing windows
+
+* GtkNotebook gained an 'action area'
+
+* GtkStatusbar gained a 'message area'
+
+* GtkToolPalette is a new container to show tool items
+  in collapsible groups in a grid
+
+* gdk-pixbuf can now handle compressed TIFF images
+
+* GSEAL work:
+ - New accessor: gtk_window_get_window_type()
+
+* Bugs fixed:
+ 590017  Does not compile under MinGW32 + Wine
+ 569430 Gail should include a reciprocal relationship for NODE_CHILD_OF
+ 598758 Need context for a propper translation
+ 594535 No accesor for GtkStatusbar->label and ->frame
+ 602725 fix setting icon-size on GICON images
+ 599402 Landscape and Reverse Landscape icons need to be swapped
+ 588740 JPEG images open with blur effect?
+ 601337 Only use gdk_input_select_events() if XINPUT_NONE is defined
+ 598050 Flickering in a gtk_socket
+ 600158 Do not use static GTypeInfo and GInterfaceInfo
+ 561973 Problem dragging images from Firefox to GTK+ app on Windows
+ 601512 Remove unnecessary check in GtkTreeModelFilter
+ 600222 Check for existence of cairo-svg.h in configure.in
+ 595498 No accesor for GTK_WINDOW ()->type
+ 116650 "action area" for GtkNotebook (e.g. for tab close button)
+ 600150 GtkColorSelection tooltip issues
+ 480065 wrong tree collapsed (or expanded) after having scrolled
+ 596473 Second double-click of GtkTreeView row doesn't emit...
+ 601869 GtkUIManager assumes too much about popup menus
+ 581145 Wrong positioning for fullscreen gedit toolbar animation
+ 602724 gailimage doesn't handle GTK_IMAGE_{GICON,ICON_NAME}...
+ 561130 get_monitor_geometry segfaults if called with non-existant...
+ 597026 Missing include for memset()
+ 585383 Segfault in gdk_pixbuf__ico_image_save
+ 597865 Move documentation from templates to inline comments
+ 123569 Catch contents being reparented out of socket
+ 561334 Incorrect named constant in documentation of two GtkButton...
+ 601611 gtk_selection_data_get_targets() reads X Atom data as GdkAtoms
+ 601409 action area presence modifies notebook behaviour
+ 603268 wrong Since: markers in toolpalette merge
+ 603271 wrong toolbar style
+ 601959 must release compose key before continuing compose sequence
+ 603302 Incorrectly warn about links on text with color and underline
+ 603201 gtk_about_dialog_set_url_hook has no effect anymore
+ 591438 dfb_events_dispatch is not thread safe
+ 589842 GtkAction API to have its menu item proxies have always-show...
+ 584700 TIFF pixbuf loader should support compression
+ 603128 Adding new UI that was recently removed may cause wrong order
+ 601682 Print preview should use gtk_show_uri by default
+ 596083 Deprecate notebook label packing functionality
+
+* Updated translations:
+ Estonian
+ Galician
+ Japanese
+ Low German
+ Norwegian bokmål
+ Punjabi
+ Slovenian
+ Spanish
+ Swedish
+
+
+Overview of Changes from GTK+ 2.18.x to 2.19.0
+==============================================
+
+* A throbber widget and cell renderer have been added: GtkSpinner and
+  GtkCellRendererSpinner
+
+* GtkFileSystemModel has been reimplemented, for major speedups and
+  other improvements
+
+* Synchronize compose sequences with the current X.org Compose file
+
+* Win32:
+ - The GDI+ image loader works again
+ - XP themes have been disabled since they don't work currently
+
+* OS X:
+ - Fix crashes due to unimplemented GdkWindowImplIface methods
+ - Use standard Mac keyboard shortcuts (Cmx-X, Cmd-C instead of
+   Ctrl-X, Ctrl-C, etc)
+ - Add a pixbuf loader for the QTIF format
+ - Improve multi-monitor handling
+
+* GSEAL work:
+ - New accessor for GtkDialog buttons: gtk_dialog_get_widget_for_response
+ - New accessor for GtkViewport bin_window: gtk_viewport_get_bin_window
+ - Add a GtkCellEditable::editing-canceled property
+
+* Deprecations:
+ - GtkInputDialog has been deprecated
+ - GtkCurve and GtkGammaCurve have been deprecated
+ - The tab-packing feature in GtkNotebook has been deprecated
+
+* Bugs fixed:
+ 594644 Cannot compile GTK+ with MinGW 4.4.0
+ 581150 GtkIconView tries to paint items with invalid sizes
+ 598881 Unimplemented GdkWindowImplIface methods crash gimp on OSX
+ 598218 Substitute deprecated gtk_*_ref/unref calls
+ 381371 Print margins not correct in WIN32 - not allowing for...
+ 597596 Toolbar button accessible objects don't have label name
+ 599118 Translators comment for "Finishing" labels
+ 598261 Add support to GtkTooltip to handle GIcons
+ 530351 Use standard mac shortcuts
+ 597865 Move documentation from templates to inline comments
+ 596083 Deprecate notebook label packing functionality
+ 594903 Deprecate GtkInputDialog
+ 599403 Avoid using accel group internals in GtkSocket
+ 590800 The window content is not updated correctly when scrolling
+ 598515 Do not assign the GtkSpinner parent class twice
+ 552678 gdi+ pixbuf loaders fail on "large" images
+ 598217 Substitute deprecated gdk_*_ref/unref calls
+ 596238 Make Quartz backend properly implement the GdkScreen...
+ 599446 atk_object_set_name () assertion in gtk_tool_button_set_label
+ 592582 Print preview doesn't reflect the printout
+ 563010 GtkFileChooserButton cannot have none file selected again
+ 596019 No accesors for GtkDialog buttons
+ 366217 Add QTIF image support
+ 594962 No accessor for GTK_ENTRY (entry)->editing_canceled
+
+* Updated translations:
+ Arabic
+ Brazilian Portuguese
+ Bulgarian
+ Catalan
+ Finnish
+ Greek
+ Norwegian bokmål
+ Oriya
+ Punjabi
+ Romanian
+ Russian
+ Serbian
+ Shavian
+ Slovenian
+ Spanish
+ Swedish
+ Slovenian
+ Vietnamese
+
+
+Overview of Changes from GTK+ 2.18.1 to 2.18.2
+==============================================
+
+* GTK+ now ignores SIGPIPE in gtk_init(). Previously
+  this was done deep in the lpr printbackend.
+
+* Fix compilation of the DirectFB backend.
+
+* Bugs fixed:
+ 597386 Cannot click buttons more than once...
+ 588059 sometimes notification icons are not visible with csw
+
+* Updated translations:
+ Italian
+ Japanese
+ Serbian
+
+
 Overview of Changes from GTK+ 2.18.0 to 2.18.1
 ==============================================
 

README.in

@@ -27,6 +27,20 @@ Installation
 See the file 'INSTALL'
 
 
+Release notes for 2.20
+======================
+
+* GtkStatusbar now has a message area (see gtk_status_bar_get_message_area)
+  which makes it easy to place additional widgets inside the statusbar
+  frame or to replace the label widgets. Previously, this was only possible
+  by accessing the innards of the statusbar widget directly. Applications
+  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.
+
 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 $?

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], [18])
-m4_define([gtk_micro_version], [2])
-m4_define([gtk_interface_age], [2])
+m4_define([gtk_minor_version], [20])
+m4_define([gtk_micro_version], [0])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -31,9 +31,9 @@ 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.13.0])
+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
 #
@@ -990,7 +996,7 @@ fi
 # because some important apps like GIMP need to read and write
 # arbitrary tEXt chunks which doesn't seem to be possible through GDI+
 
-all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
+all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif"
 if test x$with_libjasper != xno; then
   all_loaders="$all_loaders,jasper"
 fi
@@ -1061,6 +1067,7 @@ AM_CONDITIONAL(INCLUDE_TGA, [test x"$INCLUDE_tga" = xyes])
 AM_CONDITIONAL(INCLUDE_PCX, [test x"$INCLUDE_pcx" = xyes])
 AM_CONDITIONAL(INCLUDE_ICNS, [test x"$INCLUDE_icns" = xyes])
 AM_CONDITIONAL(INCLUDE_JASPER, [test x"$INCLUDE_jasper" = xyes])
+AM_CONDITIONAL(INCLUDE_QTIF, [test x"$INCLUDE_qtif" = xyes])
 # As all GDI+ loaders are either built-in or not, arbitrarily just
 # check one of the variables here
 AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
@@ -1712,7 +1719,8 @@ 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
+GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
 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"
 #
@@ -1931,6 +1939,10 @@ if test "$os_win32" != "yes"; then
   AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
 *** Can't find cairo-ps.h. You must build Cairo with the 
 *** postscript backend enabled.]))
+
+  AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
+*** Can't find cairo-svg.h. You must build Cairo with the
+*** svg backend enabled.]))
 fi   
 
 CPPFLAGS="$gtk_save_cppflags"
@@ -1965,6 +1977,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

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c

@@ -154,7 +154,7 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int bpl;
 	register guint8 data;
 	guint8 *o;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	d (printf ("1 bits/pixel\n"));
 
@@ -191,7 +191,7 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int bpl;
 	register guint8 data;
 	guint8 *o;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 	guint32 remap[2];
 
 	d (printf ("1 bits/pixel\n"));
@@ -241,7 +241,7 @@ rgb8 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int bpl;
 	guint32 mask;
 	register guint32 data;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 	register guint8 *s;
 	register guint8 *o;
 
@@ -282,7 +282,7 @@ rgb8a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	guint32 remap[256];
 	register guint8 *s;	/* read 2 pixels at once */
 	register guint32 *o;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -336,7 +336,7 @@ rgb565lsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	register guint8 *s;	/* read 2 pixels at once */
 #endif
 	register guint16 *o;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -407,7 +407,7 @@ rgb565msb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	register guint32 *s;	/* read 2 pixels at once */
 #endif
 	register guint16 *o;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -479,7 +479,7 @@ rgb565alsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 #endif
 	register guint32 *o;
 
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -536,7 +536,7 @@ rgb565amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 #endif
 	register guint32 *o;
 
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -592,7 +592,7 @@ rgb555lsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	register guint8 *s;	/* read 2 pixels at once */
 #endif
 	register guint16 *o;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -663,7 +663,7 @@ rgb555msb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	register guint32 *s;	/* read 2 pixels at once */
 #endif
 	register guint16 *o;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -735,7 +735,7 @@ rgb555alsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 #endif
 	register guint32 *o;
 
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -792,7 +792,7 @@ rgb555amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 #endif
 	register guint32 *o;
 
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -840,7 +840,7 @@ rgb888alsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 
 	guint8 *s;	/* for byte order swapping */
 	guint8 *o;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -871,7 +871,7 @@ rgb888lsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	int width, height;
 	int bpl;
 
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 	guint8 *o, *s;
 
 	width = image->width;
@@ -901,7 +901,7 @@ rgb888amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 	int width, height;
 	int bpl;
 
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 #ifdef LITTLE
 	guint32 *o;
 	guint32 *s;
@@ -949,7 +949,7 @@ rgb888msb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	int width, height;
 	int bpl;
 
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 	guint8 *s;
 	guint8 *o;
 
@@ -983,7 +983,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 	int xx, yy;
 	int width, height;
 	int bpl;
-	guint8 *srow = image->data, *orow = pixels;
+	guint8 *srow = (guint8 *)image->data, *orow = pixels;
 	guint8 *o;
 	guint32 pixel;
 	Visual *v;
@@ -1134,7 +1134,7 @@ xlib_window_is_viewable (Window w)
 
 	while (w != 0) {
 		Window parent, root, *children;
-		int nchildren;
+		guint nchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
 		if (wa.map_state != IsViewable)
@@ -1223,7 +1223,7 @@ gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
 				   int dest_x, int dest_y,
 				   int width, int height)
 {
-	int src_width, src_height;
+	guint src_width, src_height;
 	XImage *image;
 	int rowstride, bpp, alpha;
 	XWindowAttributes wa;
@@ -1260,7 +1260,8 @@ gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
 	    src_height = wa.height;
 	} else {
 	    Window root;
-	    int tx, ty, bwidth, depth;
+	    int tx, ty;
+	    guint bwidth, depth;
 	    XGetGeometry (gdk_pixbuf_dpy, src, &root, &tx, &ty,
 			  &src_width, &src_height, &bwidth, &depth);
 	}

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

@@ -37,9 +37,11 @@ demos =						\
 	rotated_text.c				\
 	search_entry.c				\
 	sizegroup.c				\
+	spinner.c				\
 	stock_browser.c				\
 	textview.c				\
 	textscroll.c				\
+	toolpalette.c				\
 	tree_store.c				\
 	ui_manager.c
 
@@ -60,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

@@ -10,6 +10,8 @@
 #include <gtk/gtk.h>
 
 static GtkWidget *window = NULL;
+static GtkTreeModel *model = NULL;
+static guint timeout = 0;
 
 typedef struct
 {
@@ -26,6 +28,8 @@ enum
   COLUMN_NUMBER,
   COLUMN_SEVERITY,
   COLUMN_DESCRIPTION,
+  COLUMN_PULSE,
+  COLUMN_ACTIVE,
   NUM_COLUMNS
 };
 
@@ -47,6 +51,33 @@ static Bug data[] =
   { FALSE, 1,     "Normal",     "First bug :=)" },
 };
 
+static gboolean
+spinner_timeout (gpointer data)
+{
+  GtkTreeIter iter;
+  guint pulse;
+
+  if (model == NULL)
+    return FALSE;
+
+  gtk_tree_model_get_iter_first (model, &iter);
+  gtk_tree_model_get (model, &iter,
+                      COLUMN_PULSE, &pulse,
+                      -1);
+  if (pulse == G_MAXUINT)
+    pulse = 0;
+  else
+    pulse++;
+
+  gtk_list_store_set (GTK_LIST_STORE (model),
+                      &iter,
+                      COLUMN_PULSE, pulse,
+                      COLUMN_ACTIVE, TRUE,
+                      -1);
+
+  return TRUE;
+}
+
 static GtkTreeModel *
 create_model (void)
 {
@@ -56,21 +87,25 @@ create_model (void)
 
   /* create list store */
   store = gtk_list_store_new (NUM_COLUMNS,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_UINT,
-			      G_TYPE_STRING,
-			      G_TYPE_STRING);
+                              G_TYPE_BOOLEAN,
+                              G_TYPE_UINT,
+                              G_TYPE_STRING,
+                              G_TYPE_STRING,
+                              G_TYPE_UINT,
+                              G_TYPE_BOOLEAN);
 
   /* add data to the list store */
   for (i = 0; i < G_N_ELEMENTS (data); i++)
     {
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-			  COLUMN_FIXED, data[i].fixed,
-			  COLUMN_NUMBER, data[i].number,
-			  COLUMN_SEVERITY, data[i].severity,
-			  COLUMN_DESCRIPTION, data[i].description,
-			  -1);
+                          COLUMN_FIXED, data[i].fixed,
+                          COLUMN_NUMBER, data[i].number,
+                          COLUMN_SEVERITY, data[i].severity,
+                          COLUMN_DESCRIPTION, data[i].description,
+                          COLUMN_PULSE, 0,
+                          COLUMN_ACTIVE, FALSE,
+                          -1);
     }
 
   return GTK_TREE_MODEL (store);
@@ -78,8 +113,8 @@ create_model (void)
 
 static void
 fixed_toggled (GtkCellRendererToggle *cell,
-	       gchar                 *path_str,
-	       gpointer               data)
+               gchar                 *path_str,
+               gpointer               data)
 {
   GtkTreeModel *model = (GtkTreeModel *)data;
   GtkTreeIter  iter;
@@ -110,48 +145,75 @@ add_columns (GtkTreeView *treeview)
   /* column for fixed toggles */
   renderer = gtk_cell_renderer_toggle_new ();
   g_signal_connect (renderer, "toggled",
-		    G_CALLBACK (fixed_toggled), model);
+                    G_CALLBACK (fixed_toggled), model);
 
   column = gtk_tree_view_column_new_with_attributes ("Fixed?",
-						     renderer,
-						     "active", COLUMN_FIXED,
-						     NULL);
+                                                     renderer,
+                                                     "active", COLUMN_FIXED,
+                                                     NULL);
 
   /* set this column to a fixed sizing (of 50 pixels) */
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
+                                   GTK_TREE_VIEW_COLUMN_FIXED);
   gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for bug numbers */
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Bug number",
-						     renderer,
-						     "text",
-						     COLUMN_NUMBER,
-						     NULL);
+                                                     renderer,
+                                                     "text",
+                                                     COLUMN_NUMBER,
+                                                     NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_NUMBER);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for severities */
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Severity",
-						     renderer,
-						     "text",
-						     COLUMN_SEVERITY,
-						     NULL);
+                                                     renderer,
+                                                     "text",
+                                                     COLUMN_SEVERITY,
+                                                     NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_SEVERITY);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for description */
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Description",
-						     renderer,
-						     "text",
-						     COLUMN_DESCRIPTION,
-						     NULL);
+                                                     renderer,
+                                                     "text",
+                                                     COLUMN_DESCRIPTION,
+                                                     NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_DESCRIPTION);
   gtk_tree_view_append_column (treeview, column);
+
+  /* column for spinner */
+  renderer = gtk_cell_renderer_spinner_new ();
+  column = gtk_tree_view_column_new_with_attributes ("Spinning",
+                                                     renderer,
+                                                     "pulse",
+                                                     COLUMN_PULSE,
+                                                     "active",
+                                                     COLUMN_ACTIVE,
+                                                     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, COLUMN_PULSE);
+  gtk_tree_view_append_column (treeview, column);
+}
+
+static gboolean
+window_closed (GtkWidget *widget,
+               GdkEvent  *event,
+               gpointer   user_data)
+{
+  model = NULL;
+  window = NULL;
+  if (timeout != 0)
+    {
+      g_source_remove (timeout);
+      timeout = 0;
+    }
+  return FALSE;
 }
 
 GtkWidget *
@@ -162,17 +224,16 @@ do_list_store (GtkWidget *do_widget)
       GtkWidget *vbox;
       GtkWidget *label;
       GtkWidget *sw;
-      GtkTreeModel *model;
       GtkWidget *treeview;
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
 
       g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
       vbox = gtk_vbox_new (FALSE, 8);
@@ -183,10 +244,10 @@ do_list_store (GtkWidget *do_widget)
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-					   GTK_SHADOW_ETCHED_IN);
+                                           GTK_SHADOW_ETCHED_IN);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_AUTOMATIC);
+                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC);
       gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
 
       /* create tree model */
@@ -196,7 +257,7 @@ do_list_store (GtkWidget *do_widget)
       treeview = gtk_tree_view_new_with_model (model);
       gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
-				       COLUMN_DESCRIPTION);
+                                       COLUMN_DESCRIPTION);
 
       g_object_unref (model);
 
@@ -207,14 +268,27 @@ do_list_store (GtkWidget *do_widget)
 
       /* finish & show */
       gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
+      g_signal_connect (window, "delete-event",
+                        G_CALLBACK (window_closed), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
+  if (!gtk_widget_get_visible (window))
+    {
+      gtk_widget_show_all (window);
+      if (timeout == 0) {
+        /* FIXME this should use the animation-duration instead */
+        timeout = g_timeout_add (80, spinner_timeout, NULL);
+      }
+    }
   else
     {
       gtk_widget_destroy (window);
       window = NULL;
+      if (timeout != 0)
+        {
+          g_source_remove (timeout);
+          timeout = 0;
+        }
     }
 
   return window;

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/printing.c

@@ -149,7 +149,8 @@ do_printing (GtkWidget *do_widget)
   GtkPrintOperation *operation;
   GtkPrintSettings *settings;
   PrintData *data;
-  gchar *uri, *dir, *ext;
+  gchar *uri, *ext;
+  const gchar *dir;
   GError *error = NULL;
 
   operation = gtk_print_operation_new ();

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

@@ -0,0 +1,94 @@
+/* Spinner
+ *
+ * GtkSpinner allows to show that background activity is on-going.
+ *
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+static GtkWidget *spinner_sensitive = NULL;
+static GtkWidget *spinner_unsensitive = NULL;
+
+static void
+on_play_clicked (GtkButton *button, gpointer user_data)
+{
+  gtk_spinner_start (GTK_SPINNER (spinner_sensitive));
+  gtk_spinner_start (GTK_SPINNER (spinner_unsensitive));
+}
+
+static void
+on_stop_clicked (GtkButton *button, gpointer user_data)
+{
+  gtk_spinner_stop (GTK_SPINNER (spinner_sensitive));
+  gtk_spinner_stop (GTK_SPINNER (spinner_unsensitive));
+}
+
+GtkWidget *
+do_spinner (GtkWidget *do_widget)
+{
+  GtkWidget *vbox;
+  GtkWidget *hbox;
+  GtkWidget *button;
+  GtkWidget *spinner;
+
+  if (!window)
+  {
+    window = gtk_dialog_new_with_buttons ("GtkSpinner",
+                                          GTK_WINDOW (do_widget),
+                                          0,
+                                          GTK_STOCK_CLOSE,
+                                          GTK_RESPONSE_NONE,
+                                          NULL);
+    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+    g_signal_connect (window, "response",
+                      G_CALLBACK (gtk_widget_destroy), NULL);
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed), &window);
+
+    vbox = gtk_vbox_new (FALSE, 5);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+
+    /* Sensitive */
+    hbox = gtk_hbox_new (FALSE, 5);
+    spinner = gtk_spinner_new ();
+    gtk_container_add (GTK_CONTAINER (hbox), spinner);
+    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
+    gtk_container_add (GTK_CONTAINER (vbox), hbox);
+    spinner_sensitive = spinner;
+
+    /* Disabled */
+    hbox = gtk_hbox_new (FALSE, 5);
+    spinner = gtk_spinner_new ();
+    gtk_container_add (GTK_CONTAINER (hbox), spinner);
+    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
+    gtk_container_add (GTK_CONTAINER (vbox), hbox);
+    spinner_unsensitive = spinner;
+    gtk_widget_set_sensitive (hbox, FALSE);
+
+    button = gtk_button_new_from_stock (GTK_STOCK_MEDIA_PLAY);
+    g_signal_connect (G_OBJECT (button), "clicked",
+                      G_CALLBACK (on_play_clicked), spinner);
+    gtk_container_add (GTK_CONTAINER (vbox), button);
+
+    button = gtk_button_new_from_stock (GTK_STOCK_MEDIA_STOP);
+    g_signal_connect (G_OBJECT (button), "clicked",
+                      G_CALLBACK (on_stop_clicked), spinner);
+    gtk_container_add (GTK_CONTAINER (vbox), button);
+
+    /* Start by default to test for:
+     * https://bugzilla.gnome.org/show_bug.cgi?id=598496 */
+    on_play_clicked (NULL, NULL);
+  }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show_all (window);
+  else
+    gtk_widget_destroy (window);
+
+  return 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

@@ -0,0 +1,795 @@
+/* Tool Palette
+ *
+ * A tool palette widget shows groups of toolbar items as a grid of icons
+ * or a list of names.
+ */
+
+#include <string.h>
+#include <gtk/gtk.h>
+#include "config.h"
+#include "demo-common.h"
+
+static GtkWidget *window = NULL;
+
+static void load_stock_items (GtkToolPalette *palette);
+static void load_toggle_items (GtkToolPalette *palette);
+static void load_special_items (GtkToolPalette *palette);
+
+typedef struct _CanvasItem CanvasItem;
+
+struct _CanvasItem
+{
+  GdkPixbuf *pixbuf;
+  gdouble x, y;
+};
+
+static CanvasItem *drop_item = NULL;
+static GList *canvas_items = NULL;
+
+/********************************/
+/* ====== Canvas drawing ====== */
+/********************************/
+
+static CanvasItem*
+canvas_item_new (GtkWidget     *widget,
+                 GtkToolButton *button,
+                 gdouble        x,
+                 gdouble        y)
+{
+  CanvasItem *item = NULL;
+  const gchar *stock_id;
+  GdkPixbuf *pixbuf;
+
+  stock_id = gtk_tool_button_get_stock_id (button);
+  pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_DIALOG, NULL);
+
+  if (pixbuf)
+    {
+      item = g_slice_new0 (CanvasItem);
+      item->pixbuf = pixbuf;
+      item->x = x;
+      item->y = y;
+    }
+
+  return item;
+}
+
+static void
+canvas_item_free (CanvasItem *item)
+{
+  g_object_unref (item->pixbuf);
+  g_slice_free (CanvasItem, item);
+}
+
+static void
+canvas_item_draw (const CanvasItem *item,
+                  cairo_t          *cr,
+                  gboolean          preview)
+{
+  gdouble cx = gdk_pixbuf_get_width (item->pixbuf);
+  gdouble cy = gdk_pixbuf_get_height (item->pixbuf);
+
+  gdk_cairo_set_source_pixbuf (cr,
+                               item->pixbuf,
+                               item->x - cx * 0.5,
+                               item->y - cy * 0.5);
+
+  if (preview)
+    cairo_paint_with_alpha (cr, 0.6);
+  else
+    cairo_paint (cr);
+}
+
+static gboolean
+canvas_expose_event (GtkWidget      *widget,
+                     GdkEventExpose *event)
+{
+  cairo_t *cr;
+  GList *iter;
+
+  cr = gdk_cairo_create (widget->window);
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  cairo_set_source_rgb (cr, 1, 1, 1);
+  cairo_rectangle (cr, 0, 0, widget->allocation.width, widget->allocation.height);
+  cairo_fill (cr);
+
+  for (iter = canvas_items; iter; iter = iter->next)
+    canvas_item_draw (iter->data, cr, FALSE);
+
+  if (drop_item)
+    canvas_item_draw (drop_item, cr, TRUE);
+
+  cairo_destroy (cr);
+
+  return TRUE;
+}
+
+/*****************************/
+/* ====== Palette DnD ====== */
+/*****************************/
+
+static void
+palette_drop_item (GtkToolItem      *drag_item,
+                   GtkToolItemGroup *drop_group,
+                   gint              x,
+                   gint              y)
+{
+  GtkWidget *drag_group = gtk_widget_get_parent (GTK_WIDGET (drag_item));
+  GtkToolItem *drop_item = gtk_tool_item_group_get_drop_item (drop_group, x, y);
+  gint drop_position = -1;
+
+  if (drop_item)
+    drop_position = gtk_tool_item_group_get_item_position (GTK_TOOL_ITEM_GROUP (drop_group), drop_item);
+
+  if (GTK_TOOL_ITEM_GROUP (drag_group) != drop_group)
+    {
+      gboolean homogeneous, expand, fill, new_row;
+
+      g_object_ref (drag_item);
+      gtk_container_child_get (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item),
+                               "homogeneous", &homogeneous,
+                               "expand", &expand,
+                               "fill", &fill,
+                               "new-row", &new_row,
+                               NULL);
+      gtk_container_remove (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item));
+      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (drop_group),
+                                  drag_item, drop_position);
+      gtk_container_child_set (GTK_CONTAINER (drop_group), GTK_WIDGET (drag_item),
+                               "homogeneous", homogeneous,
+                               "expand", expand,
+                               "fill", fill,
+                               "new-row", new_row,
+                               NULL);
+      g_object_unref (drag_item);
+    }
+  else
+    gtk_tool_item_group_set_item_position (GTK_TOOL_ITEM_GROUP (drop_group),
+                                           drag_item, drop_position);
+}
+
+static void
+palette_drop_group (GtkToolPalette   *palette,
+                    GtkToolItemGroup *drag_group,
+                    GtkToolItemGroup *drop_group)
+{
+  gint drop_position = -1;
+
+  if (drop_group)
+    drop_position = gtk_tool_palette_get_group_position (palette, drop_group);
+
+  gtk_tool_palette_set_group_position (palette, drag_group, drop_position);
+}
+
+static void
+palette_drag_data_received (GtkWidget        *widget,
+                            GdkDragContext   *context,
+                            gint              x,
+                            gint              y,
+                            GtkSelectionData *selection,
+                            guint             info,
+                            guint             time,
+                            gpointer          data)
+{
+  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);
+
+  if (drag_palette)
+    {
+      drag_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (drag_palette),
+                                                  selection);
+      drop_group = gtk_tool_palette_get_drop_group (GTK_TOOL_PALETTE (widget),
+                                                    x, y);
+    }
+
+  if (GTK_IS_TOOL_ITEM_GROUP (drag_item))
+    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),
+                       drop_group,
+                       x - GTK_WIDGET (drop_group)->allocation.x,
+                       y - GTK_WIDGET (drop_group)->allocation.y);
+}
+
+/********************************/
+/* ====== Passive Canvas ====== */
+/********************************/
+
+static void
+passive_canvas_drag_data_received (GtkWidget        *widget,
+                                   GdkDragContext   *context,
+                                   gint              x,
+                                   gint              y,
+                                   GtkSelectionData *selection,
+                                   guint             info,
+                                   guint             time,
+                                   gpointer          data)
+{
+  /* find the tool button, which is the source of this DnD operation */
+
+  GtkWidget *palette = gtk_drag_get_source_widget (context);
+  CanvasItem *canvas_item = NULL;
+  GtkWidget *tool_item = NULL;
+
+  while (palette && !GTK_IS_TOOL_PALETTE (palette))
+    palette = gtk_widget_get_parent (palette);
+
+  if (palette)
+    tool_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (palette),
+                                                selection);
+
+  g_assert (NULL == drop_item);
+
+  /* append a new canvas item when a tool button was found */
+
+  if (GTK_IS_TOOL_ITEM (tool_item))
+    canvas_item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
+
+  if (canvas_item)
+    {
+      canvas_items = g_list_append (canvas_items, canvas_item);
+      gtk_widget_queue_draw (widget);
+    }
+}
+
+/************************************/
+/* ====== Interactive Canvas ====== */
+/************************************/
+
+static gboolean
+interactive_canvas_drag_motion (GtkWidget      *widget,
+                                GdkDragContext *context,
+                                gint            x,
+                                gint            y,
+                                guint           time,
+                                gpointer        data)
+{
+  if (drop_item)
+    {
+      /* already have a drop indicator - just update position */
+
+      drop_item->x = x;
+      drop_item->y = y;
+
+      gtk_widget_queue_draw (widget);
+      gdk_drag_status (context, GDK_ACTION_COPY, time);
+    }
+  else
+    {
+      /* request DnD data for creating a drop indicator */
+
+      GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
+
+      if (!target)
+        return FALSE;
+
+      gtk_drag_get_data (widget, context, target, time);
+    }
+
+  return TRUE;
+}
+
+static void
+interactive_canvas_drag_data_received (GtkWidget        *widget,
+                                       GdkDragContext   *context,
+                                       gint              x,
+                                       gint              y,
+                                       GtkSelectionData *selection,
+                                       guint             info,
+                                       guint             time,
+                                       gpointer          data)
+
+{
+  /* find the tool button which is the source of this DnD operation */
+
+  GtkWidget *palette = gtk_drag_get_source_widget (context);
+  GtkWidget *tool_item = NULL;
+
+  while (palette && !GTK_IS_TOOL_PALETTE (palette))
+    palette = gtk_widget_get_parent (palette);
+
+  if (palette)
+    tool_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (palette),
+                                                selection);
+
+  /* create a drop indicator when a tool button was found */
+
+  g_assert (NULL == drop_item);
+
+  if (GTK_IS_TOOL_ITEM (tool_item))
+    {
+      drop_item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
+      gdk_drag_status (context, GDK_ACTION_COPY, time);
+      gtk_widget_queue_draw (widget);
+    }
+}
+
+static gboolean
+interactive_canvas_drag_drop (GtkWidget      *widget,
+                              GdkDragContext *context,
+                              gint            x,
+                              gint            y,
+                              guint           time,
+                              gpointer        data)
+{
+  if (drop_item)
+    {
+      /* turn the drop indicator into a real canvas item */
+
+      drop_item->x = x;
+      drop_item->y = y;
+
+      canvas_items = g_list_append (canvas_items, drop_item);
+      drop_item = NULL;
+
+      /* signal the item was accepted and redraw */
+
+      gtk_drag_finish (context, TRUE, FALSE, time);
+      gtk_widget_queue_draw (widget);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+interactive_canvas_real_drag_leave (gpointer data)
+{
+  if (drop_item)
+    {
+      GtkWidget *widget = GTK_WIDGET (data);
+
+      canvas_item_free (drop_item);
+      drop_item = NULL;
+
+      gtk_widget_queue_draw (widget);
+    }
+
+  return FALSE;
+}
+
+static void
+interactive_canvas_drag_leave (GtkWidget      *widget,
+                               GdkDragContext *context,
+                               guint           time,
+                               gpointer        data)
+{
+  /* defer cleanup until a potential "drag-drop" signal was received */
+  g_idle_add (interactive_canvas_real_drag_leave, widget);
+}
+
+static void
+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);
+  GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
+  GtkTreeIter iter;
+  gint val = 0;
+
+  if (!gtk_combo_box_get_active_iter (combo_box, &iter))
+    return;
+
+  gtk_tree_model_get (model, &iter, 1, &val, -1);
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (palette), val);
+
+  if (val == GTK_ORIENTATION_HORIZONTAL)
+    gtk_scrolled_window_set_policy (sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+  else
+    gtk_scrolled_window_set_policy (sw, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+}
+
+static void
+on_combo_style_changed (GtkComboBox *combo_box,
+                        gpointer     user_data)
+{
+  GtkToolPalette *palette = GTK_TOOL_PALETTE (user_data);
+  GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
+  GtkTreeIter iter;
+  gint val = 0;
+
+  if (!gtk_combo_box_get_active_iter (combo_box, &iter))
+    return;
+
+  gtk_tree_model_get (model, &iter, 1, &val, -1);
+
+  if (val == -1)
+    gtk_tool_palette_unset_style (palette);
+  else
+    gtk_tool_palette_set_style (palette, val);
+}
+
+GtkWidget *
+do_toolpalette (GtkWidget *do_widget)
+{
+  GtkWidget *box = NULL;
+  GtkWidget *hbox = NULL;
+  GtkWidget *combo_orientation = NULL;
+  GtkListStore *orientation_model = NULL;
+  GtkWidget *combo_style = NULL;
+  GtkListStore *style_model = NULL;
+  GtkCellRenderer *cell_renderer = NULL;
+  GtkTreeIter iter;
+  GtkWidget *palette = NULL;
+  GtkWidget *palette_scroller = NULL;
+  GtkWidget *notebook = NULL;
+  GtkWidget *contents = NULL;
+  GtkWidget *contents_scroller = NULL;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Tool Palette");
+      gtk_window_set_default_size (GTK_WINDOW (window), 200, 600);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+
+      /* Add widgets to control the ToolPalette appearance: */
+      box = gtk_vbox_new (FALSE, 6);
+      gtk_container_add (GTK_CONTAINER (window), box);
+
+      /* Orientation combo box: */
+      orientation_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+      gtk_list_store_append (orientation_model, &iter);
+      gtk_list_store_set (orientation_model, &iter,
+                          0, "Horizontal",
+                          1, GTK_ORIENTATION_HORIZONTAL,
+                          -1);
+      gtk_list_store_append (orientation_model, &iter);
+      gtk_list_store_set (orientation_model, &iter,
+                          0, "Vertical",
+                          1, GTK_ORIENTATION_VERTICAL,
+                          -1);
+
+      combo_orientation =
+        gtk_combo_box_new_with_model (GTK_TREE_MODEL (orientation_model));
+      cell_renderer = gtk_cell_renderer_text_new ();
+      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_orientation),
+                                  cell_renderer,
+                                  TRUE);
+      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_orientation),
+                                      cell_renderer,
+                                      "text", 0,
+                                      NULL);
+      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_orientation), &iter);
+      gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE, FALSE, 0);
+
+      /* Style combo box: */
+      style_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Text",
+                          1, GTK_TOOLBAR_TEXT,
+                          -1);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Both",
+                          1, GTK_TOOLBAR_BOTH,
+                          -1);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Both: Horizontal",
+                          1, GTK_TOOLBAR_BOTH_HORIZ,
+                          -1);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Icons",
+                          1, GTK_TOOLBAR_ICONS,
+                          -1);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Default",
+                          1, -1,  /* A custom meaning for this demo. */
+                          -1);
+      combo_style = gtk_combo_box_new_with_model (GTK_TREE_MODEL (style_model));
+      cell_renderer = gtk_cell_renderer_text_new ();
+      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_style),
+                                  cell_renderer,
+                                  TRUE);
+      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_style),
+                                      cell_renderer,
+                                      "text", 0,
+                                      NULL);
+      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_style), &iter);
+      gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE, 0);
+
+      /* Add hbox */
+      hbox = gtk_hbox_new (FALSE, 5);
+      gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0);
+
+      /* Add and fill the ToolPalette: */
+      palette = gtk_tool_palette_new ();
+
+      load_stock_items (GTK_TOOL_PALETTE (palette));
+      load_toggle_items (GTK_TOOL_PALETTE (palette));
+      load_special_items (GTK_TOOL_PALETTE (palette));
+
+      palette_scroller = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
+                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC);
+      gtk_container_set_border_width (GTK_CONTAINER (palette_scroller), 6);
+
+      gtk_container_add (GTK_CONTAINER (palette_scroller), palette);
+      gtk_container_add (GTK_CONTAINER (hbox), palette_scroller);
+
+      gtk_widget_show_all (box);
+
+      /* Connect signals: */
+      g_signal_connect (combo_orientation, "changed",
+                        G_CALLBACK (on_combo_orientation_changed), palette);
+      g_signal_connect (combo_style, "changed",
+                        G_CALLBACK (on_combo_style_changed), palette);
+
+      /* Keep the widgets in sync: */
+      on_combo_orientation_changed (GTK_COMBO_BOX (combo_orientation), palette);
+
+      /* ===== notebook ===== */
+
+      notebook = gtk_notebook_new ();
+      gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
+      gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE, 0);
+
+      /* ===== DnD for tool items ===== */
+
+      g_signal_connect (palette, "drag-data-received",
+                        G_CALLBACK (palette_drag_data_received), NULL);
+
+      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
+                                      palette,
+                                      GTK_DEST_DEFAULT_ALL,
+                                      GTK_TOOL_PALETTE_DRAG_ITEMS |
+                                      GTK_TOOL_PALETTE_DRAG_GROUPS,
+                                      GDK_ACTION_MOVE);
+
+      /* ===== passive DnD dest ===== */
+
+      contents = gtk_drawing_area_new ();
+      gtk_widget_set_app_paintable (contents, TRUE);
+
+      g_object_connect (contents,
+                        "signal::expose-event", canvas_expose_event, NULL,
+                        "signal::drag-data-received", passive_canvas_drag_data_received, NULL,
+                        NULL);
+
+      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
+                                      contents,
+                                      GTK_DEST_DEFAULT_ALL,
+                                      GTK_TOOL_PALETTE_DRAG_ITEMS,
+                                      GDK_ACTION_COPY);
+
+      contents_scroller = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_ALWAYS);
+      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (contents_scroller),
+                                             contents);
+      gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
+
+      gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                                contents_scroller,
+                                gtk_label_new ("Passive DnD Mode"));
+
+      /* ===== interactive DnD dest ===== */
+
+      contents = gtk_drawing_area_new ();
+      gtk_widget_set_app_paintable (contents, TRUE);
+
+      g_object_connect (contents,
+                        "signal::expose-event", canvas_expose_event, NULL,
+                        "signal::drag-motion", interactive_canvas_drag_motion, NULL,
+                        "signal::drag-data-received", interactive_canvas_drag_data_received, NULL,
+                        "signal::drag-leave", interactive_canvas_drag_leave, NULL,
+                        "signal::drag-drop", interactive_canvas_drag_drop, NULL,
+                        NULL);
+
+      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
+                                      contents,
+                                      GTK_DEST_DEFAULT_HIGHLIGHT,
+                                      GTK_TOOL_PALETTE_DRAG_ITEMS,
+                                      GDK_ACTION_COPY);
+
+      contents_scroller = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_ALWAYS);
+      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (contents_scroller),
+                                             contents);
+      gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
+
+      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), contents_scroller,
+                                gtk_label_new ("Interactive DnD Mode"));
+    }
+
+  if (!gtk_widget_get_visible (window))
+    {
+      gtk_widget_show_all (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
+
+
+static void
+load_stock_items (GtkToolPalette *palette)
+{
+  GtkWidget *group_af = gtk_tool_item_group_new ("Stock Icons (A-F)");
+  GtkWidget *group_gn = gtk_tool_item_group_new ("Stock Icons (G-N)");
+  GtkWidget *group_or = gtk_tool_item_group_new ("Stock Icons (O-R)");
+  GtkWidget *group_sz = gtk_tool_item_group_new ("Stock Icons (S-Z)");
+  GtkWidget *group = NULL;
+
+  GtkToolItem *item;
+  GSList *stock_ids;
+  GSList *iter;
+
+  stock_ids = gtk_stock_list_ids ();
+  stock_ids = g_slist_sort (stock_ids, (GCompareFunc) strcmp);
+
+  gtk_container_add (GTK_CONTAINER (palette), group_af);
+  gtk_container_add (GTK_CONTAINER (palette), group_gn);
+  gtk_container_add (GTK_CONTAINER (palette), group_or);
+  gtk_container_add (GTK_CONTAINER (palette), group_sz);
+
+  for (iter = stock_ids; iter; iter = g_slist_next (iter))
+    {
+      GtkStockItem stock_item;
+      gchar *id = iter->data;
+
+      switch (id[4])
+        {
+          case 'a':
+            group = group_af;
+            break;
+
+          case 'g':
+            group = group_gn;
+            break;
+
+          case 'o':
+            group = group_or;
+            break;
+
+          case 's':
+            group = group_sz;
+            break;
+        }
+
+      item = gtk_tool_button_new_from_stock (id);
+      gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item), id);
+      gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE);
+      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+
+      if (!gtk_stock_lookup (id, &stock_item) || !stock_item.label)
+        gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), id);
+
+      g_free (id);
+    }
+
+  g_slist_free (stock_ids);
+}
+
+static void
+load_toggle_items (GtkToolPalette *palette)
+{
+  GSList *toggle_group = NULL;
+  GtkToolItem *item;
+  GtkWidget *group;
+  char *label;
+  int i;
+
+  group = gtk_tool_item_group_new ("Radio Item");
+  gtk_container_add (GTK_CONTAINER (palette), group);
+
+  for (i = 1; i <= 10; ++i)
+    {
+      label = g_strdup_printf ("#%d", i);
+      item = gtk_radio_tool_button_new (toggle_group);
+      gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), label);
+      g_free (label);
+
+      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+      toggle_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (item));
+    }
+}
+
+static GtkToolItem *
+create_entry_item (const char *text)
+{
+  GtkToolItem *item;
+  GtkWidget *entry;
+
+  entry = gtk_entry_new ();
+  gtk_entry_set_text (GTK_ENTRY (entry), text);
+  gtk_entry_set_width_chars (GTK_ENTRY (entry), 5);
+
+  item = gtk_tool_item_new ();
+  gtk_container_add (GTK_CONTAINER (item), entry);
+
+  return item;
+}
+
+static void
+load_special_items (GtkToolPalette *palette)
+{
+  GtkToolItem *item;
+  GtkWidget *group;
+  GtkWidget *label_button;
+
+  group = gtk_tool_item_group_new (NULL);
+  label_button = gtk_button_new_with_label ("Advanced Features");
+  gtk_widget_show (label_button);
+  gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (group),
+                                        label_button);
+  gtk_container_add (GTK_CONTAINER (palette), group);
+
+  item = create_entry_item ("homogeneous=FALSE");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE, NULL);
+
+  item = create_entry_item ("homogeneous=FALSE, expand=TRUE");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE, "expand", TRUE,
+                           NULL);
+
+  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, fill=FALSE");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE, "expand", TRUE,
+                           "fill", FALSE, NULL);
+
+  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, new-row=TRUE");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE, "expand", TRUE,
+                           "new-row", TRUE, NULL);
+
+  item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
+  gtk_tool_item_set_tooltip_text (item, "Show on vertical palettes only");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_tool_item_set_visible_horizontal (item, FALSE);
+
+  item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+  gtk_tool_item_set_tooltip_text (item, "Show on horizontal palettes only");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_tool_item_set_visible_vertical (item, FALSE);
+
+  item = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
+  gtk_tool_item_set_tooltip_text (item, "Do not show at all");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_widget_set_no_show_all (GTK_WIDGET (item), TRUE);
+
+  item = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN);
+  gtk_tool_item_set_tooltip_text (item, "Expanded this item");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE,
+                           "expand", TRUE,
+                           NULL);
+
+  item = gtk_tool_button_new_from_stock (GTK_STOCK_HELP);
+  gtk_tool_item_set_tooltip_text (item, "A regular item");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+}

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;
+}

demos/testpixbuf-save.c

@@ -72,7 +72,7 @@ save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
 {
         GdkPixbufLoader *loader = data;
 
-        return gdk_pixbuf_loader_write (loader, buf, count, err);
+        return gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err);
 }
 
 static GdkPixbuf *
@@ -82,7 +82,7 @@ buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
         GdkPixbuf *pixbuf;
 
         loader = gdk_pixbuf_loader_new ();
-        if (gdk_pixbuf_loader_write (loader, buf, count, err) && 
+        if (gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err) &&
             gdk_pixbuf_loader_close (loader, err)) {
                 pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
                 g_object_unref (loader);

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/developers.txt

@@ -48,15 +48,6 @@ Events that are assured to have a valid GdkEvent.any.window field are
 GDK_EXPOSE		GtkWidget::expose_event
 
 
-gtk_widget_ref() vs. gtk_object_ref()
--------------------------------------
-
-The widget referencing functions gtk_widget_ref() and gtk_widget_unref()
-are currently just wrappers about the corresponding referencing functions
-for objects. Still you should use the widget referencing functions if you
-are sure the referenced object is of type GTK_WIDGET_TYPE.
-
-
 Writing Gdk functions
 ---------------------
 

docs/dnd_internals.txt

@@ -62,8 +62,6 @@ used by anything other than the DND code in GTK+.
 /* Drag and Drop */
 
 GdkDragContext * gdk_drag_context_new        (void);
-void             gdk_drag_context_ref        (GdkDragContext *context);
-void             gdk_drag_context_unref      (GdkDragContext *context);
 
 These create and refcount GdkDragContexts in a
 straightforward manner.

docs/faq/gtk-faq.sgml

@@ -2108,10 +2108,10 @@ not.</para>
 snippet:</para>
 
 <programlisting role="C">
-     gtk_widget_ref(widget);
+     g_object_ref(widget);
      gtk_container_remove(GTK_CONTAINER(old_parent), widget);
      gtk_container_add(GTK_CONTAINER(new_parent), widget);
-     gtk_widget_unref(widget);
+     g_object_unref(widget);
 </programlisting>
 
 </sect1>
@@ -2307,8 +2307,8 @@ used, as in:</para>
                NULL, gtk_widget_get_colormap(top),
                &amp;pixmap_mask, NULL, pixfile);
   pixw = gtk_pixmap_new (pixmap, pixmap_mask);
-  gdk_pixmap_unref (pixmap);
-  gdk_pixmap_unref (pixmap_mask);
+  g_object_unref (pixmap);
+  g_object_unref (pixmap_mask);
 </programlisting>
 
 </sect1>

docs/refcounting.txt

@@ -250,12 +250,12 @@ Example code sequences that require reference wraps:
    /* gtk_container_remove() will unparent the child and therefore
     * cause its reference count to be decremented by one.
     */
-   gtk_widget_ref (widget);
+   g_object_ref (widget);
    gtk_container_remove (container, widget);
    /* without the reference count, the widget would have been destroyed here.
    */
    gtk_container_add (container, widget);
-   gtk_widget_unref (widget);
+   g_object_unref (widget);
 
 
   /* all items in item_list need to be referenced
@@ -267,7 +267,7 @@ Example code sequences that require reference wraps:
    slist = NULL;
    for (list = item_list; list; list = list->next)
    {
-     gtk_widget_ref (GTK_WIDGET (list->data));
+     g_object_ref (GTK_WIDGET (list->data));
      slist = g_slist_prepend (slist, list->data);
    }
    gtk_list_remove_items (list, item_list);
@@ -280,7 +280,7 @@ Example code sequences that require reference wraps:
      
      tmp = slist;
      slist = slist->next;
-     gtk_widget_unref (GTK_WIDGET (tmp->data));
+     g_object_unref (GTK_WIDGET (tmp->data));
      g_slist_free_1 (tmp);
    }
    

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/gdk-pixbuf.types

@@ -4,3 +4,5 @@ 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
+

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

@@ -152,6 +152,11 @@ An opaque struct representing a simple animation.
 </para>
 
 
+<!-- ##### ARG GdkPixbufSimpleAnim:loop ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gdk_pixbuf_simple_anim_new ##### -->
 <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/event_structs.sgml

@@ -221,7 +221,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/gdkscreen.sgml

@@ -253,6 +253,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/input_devices.sgml

@@ -57,12 +57,7 @@ devices without having to keep track of complicated per-device
 settings.
 </para>
 <para>
-Various aspects of each device may be configured. The easiest way of
-creating a GUI to allow the user to configure such a device
-is to use the #GtkInputDialog widget in GTK+. 
-However, even when using this widget, application writers
-will need to directly query and set the configuration parameters
-in order to save the state between invocations of the application.
+Various aspects of each device may be configured.
 The configuration of devices is queried using gdk_devices_list().
 Each device must be activated using gdk_device_set_mode(), which
 also controls whether the device's range is mapped to the
@@ -233,15 +228,12 @@ Specifies how an axis of a device is used.
 
 
 <!-- ##### 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
@@ -234,6 +234,16 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 @Returns: 
 
 
+<!-- ##### 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/pixmaps.sgml

@@ -77,76 +77,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/gtk/Makefile.am

@@ -87,6 +87,7 @@ IGNORE_HFILES=				\
 	gtktrayicon.h			\
 	gtktreedatalist.h		\
 	gtktreeprivate.h		\
+	gtktoolpaletteprivate.h		\
 	gtktypebuiltins.h		\
 	gtkxembed.h			\
 	gtkwin32embed.h			\
@@ -335,9 +336,11 @@ HTML_IMAGES = \
 	$(srcdir)/images/scrolledwindow.png				\
 	$(srcdir)/images/separator.png					\
 	$(srcdir)/images/spinbutton.png					\
+	$(srcdir)/images/spinner.png					\
 	$(srcdir)/images/statusbar.png					\
 	$(srcdir)/images/toggle-button.png				\
 	$(srcdir)/images/toolbar.png					\
+	$(srcdir)/images/toolpalette.png				\
 	$(srcdir)/images/tree-view-coordinates.png			\
 	$(srcdir)/images/volumebutton.png				\
 	$(srcdir)/images/window.png					\

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>

docs/reference/gtk/gtk-docs.sgml

@@ -150,6 +150,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkwindowgroup.xml" />
       <xi:include href="xml/gtkaboutdialog.xml" />
       <xi:include href="xml/gtkassistant.xml" />
+      <xi:include href="xml/gtkoffscreenwindow.xml" />
     </chapter>
 
     <chapter id="DisplayWidgets">
@@ -161,6 +162,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkstatusbar.xml" />
       <xi:include href="xml/gtkinfobar.xml" />
       <xi:include href="xml/gtkstatusicon.xml" />
+      <xi:include href="xml/gtkspinner.xml" />
     </chapter>
 
     <chapter id="ButtonWidgets">
@@ -219,6 +221,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkcellrendererspin.xml" />
       <xi:include href="xml/gtkcellrenderertext.xml" />
       <xi:include href="xml/gtkcellrenderertoggle.xml" />
+      <xi:include href="xml/gtkcellrendererspinner.xml" />
       <xi:include href="xml/gtkliststore.xml" />
       <xi:include href="xml/gtktreestore.xml" />
     </chapter>
@@ -238,6 +241,8 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtktoolshell.xml" />
       <xi:include href="xml/gtktoolbar.xml" />
       <xi:include href="xml/gtktoolitem.xml" />
+      <xi:include href="xml/gtktoolpalette.xml" />
+      <xi:include href="xml/gtktoolitemgroup.xml" />
       <xi:include href="xml/gtkseparatortoolitem.xml" />
       <xi:include href="xml/gtktoolbutton.xml" />
       <xi:include href="xml/gtkmenutoolbutton.xml" />
@@ -491,4 +496,11 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <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>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/gtk/gtk-sections.txt

@@ -192,6 +192,8 @@ gtk_action_block_activate
 gtk_action_unblock_activate
 gtk_action_block_activate_from
 gtk_action_unblock_activate_from
+gtk_action_get_always_show_image
+gtk_action_set_always_show_image
 gtk_action_get_accel_path
 gtk_action_set_accel_path
 gtk_action_get_accel_closure
@@ -1182,6 +1184,7 @@ gtk_dialog_set_default_response
 gtk_dialog_set_has_separator
 gtk_dialog_set_response_sensitive
 gtk_dialog_get_response_for_widget
+gtk_dialog_get_widget_for_response
 gtk_dialog_get_action_area
 gtk_dialog_get_content_area
 <SUBSECTION>
@@ -1333,6 +1336,8 @@ gtk_entry_set_icon_tooltip_markup
 gtk_entry_get_icon_tooltip_markup
 gtk_entry_set_icon_drag_source
 gtk_entry_get_current_icon_drag_source
+gtk_entry_get_icon_window
+gtk_entry_get_text_window
 
 <SUBSECTION Standard>
 GTK_ENTRY
@@ -2633,7 +2638,6 @@ gtk_message_dialog_get_type
 GtkInfoBar
 gtk_info_bar_new
 gtk_info_bar_new_with_buttons
-gtk_info_bar_set_contents
 gtk_info_bar_add_action_widget
 gtk_info_bar_add_button
 gtk_info_bar_add_buttons
@@ -2732,6 +2736,8 @@ gtk_notebook_set_group_id
 gtk_notebook_get_group_id
 gtk_notebook_set_group
 gtk_notebook_get_group
+gtk_notebook_set_action_widget
+gtk_notebook_get_action_widget
 GtkNotebookWindowCreationFunc
 gtk_notebook_set_window_creation_hook
 <SUBSECTION Standard>
@@ -2795,6 +2801,25 @@ GTK_OBJECT_SET_FLAGS
 GTK_OBJECT_UNSET_FLAGS
 </SECTION>
 
+<SECTION>
+<FILE>gtkoffscreenwindow</FILE>
+<TITLE>GtkOffscreenWindow</TITLE>
+GtkOffscreenWindow
+gtk_offscreen_window_new
+gtk_offscreen_window_get_pixmap
+gtk_offscreen_window_get_pixbuf
+<SUBSECTION Standard>
+GTK_OFFSCREEN_WINDOW
+GTK_IS_OFFSCREEN_WINDOW
+GTK_TYPE_OFFSCREEN_WINDOW
+GTK_OFFSCREEN_WINDOW_CLASS
+GTK_IS_OFFSCREEN_WINDOW_CLASS
+GTK_OFFSCREEN_WINDOW_GET_CLASS
+
+<SUBSECTION Private>
+gtk_offscreen_window_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkoptionmenu</FILE>
 <TITLE>GtkOptionMenu</TITLE>
@@ -2820,7 +2845,6 @@ gtk_option_menu_get_type
 <FILE>gtkpaned</FILE>
 <TITLE>GtkPaned</TITLE>
 GtkPaned
-gtk_paned_new
 gtk_paned_add1
 gtk_paned_add2
 gtk_paned_gutter_size
@@ -2831,6 +2855,7 @@ gtk_paned_get_child2
 gtk_paned_set_gutter_size
 gtk_paned_set_position
 gtk_paned_get_position
+gtk_paned_get_handle_window
 <SUBSECTION Standard>
 GTK_PANED
 GTK_IS_PANED
@@ -3076,6 +3101,13 @@ gtk_range_set_upper_stepper_sensitivity
 gtk_range_get_upper_stepper_sensitivity
 gtk_range_get_flippable
 gtk_range_set_flippable
+gtk_range_get_min_slider_size
+gtk_range_get_range_rect
+gtk_range_get_slider_range
+gtk_range_get_slider_size_fixed
+gtk_range_set_min_slider_size
+gtk_range_set_slider_size_fixed
+
 <SUBSECTION Standard>
 GTK_RANGE
 GTK_IS_RANGE
@@ -3315,7 +3347,6 @@ gtk_recent_action_get_type
 <TITLE>GtkRuler</TITLE>
 GtkRuler
 GtkRulerMetric
-gtk_ruler_new
 gtk_ruler_set_metric
 gtk_ruler_set_range
 gtk_ruler_get_metric
@@ -3337,8 +3368,6 @@ gtk_ruler_draw_pos
 <FILE>gtkscale</FILE>
 <TITLE>GtkScale</TITLE>
 GtkScale
-gtk_scale_new
-gtk_scale_new_with_range
 gtk_scale_set_digits
 gtk_scale_set_draw_value
 gtk_scale_set_value_pos
@@ -3391,7 +3420,6 @@ gtk_scale_button_get_type
 <FILE>gtkscrollbar</FILE>
 <TITLE>GtkScrollbar</TITLE>
 GtkScrollbar
-gtk_scrollbar_new
 <SUBSECTION Standard>
 GTK_SCROLLBAR
 GTK_IS_SCROLLBAR
@@ -3437,7 +3465,6 @@ gtk_scrolled_window_get_type
 <FILE>gtkseparator</FILE>
 <TITLE>GtkSeparator</TITLE>
 GtkSeparator
-gtk_separator_new
 <SUBSECTION Standard>
 GTK_SEPARATOR
 GTK_IS_SEPARATOR
@@ -3584,6 +3611,24 @@ GTK_SPIN_BUTTON_GET_CLASS
 gtk_spin_button_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkspinner</FILE>
+<TITLE>GtkSpinner</TITLE>
+GtkSpinner
+gtk_spinner_new
+gtk_spinner_start
+gtk_spinner_stop
+<SUBSECTION Standard>
+GTK_SPINNER
+GTK_IS_SPINNER
+GTK_TYPE_SPINNER
+GTK_SPINNER_CLASS
+GTK_IS_SPINER_CLASS
+GTK_SPINNER_GET_CLASS
+<SUBSECTION Private>
+gtk_spinner_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkstatusbar</FILE>
 <TITLE>GtkStatusbar</TITLE>
@@ -3595,6 +3640,7 @@ gtk_statusbar_pop
 gtk_statusbar_remove
 gtk_statusbar_set_has_resize_grip
 gtk_statusbar_get_has_resize_grip
+gtk_statusbar_get_message_area
 <SUBSECTION Standard>
 GTK_STATUSBAR
 GTK_IS_STATUSBAR
@@ -3638,6 +3684,7 @@ gtk_status_icon_set_has_tooltip
 gtk_status_icon_get_has_tooltip
 gtk_status_icon_set_title
 gtk_status_icon_get_title
+gtk_status_icon_set_name
 gtk_status_icon_set_visible
 gtk_status_icon_get_visible
 gtk_status_icon_set_blinking
@@ -4172,11 +4219,15 @@ gtk_toggle_button_get_type
 <TITLE>GtkToolShell</TITLE>
 GtkToolShell
 GtkToolShellIface
+gtk_tool_shell_get_ellipsize_mode
 gtk_tool_shell_get_icon_size
 gtk_tool_shell_get_orientation
 gtk_tool_shell_get_relief_style
 gtk_tool_shell_get_style
+gtk_tool_shell_get_text_alignment
+gtk_tool_shell_get_text_orientation
 gtk_tool_shell_rebuild_menu
+gtk_tool_shell_get_text_size_group
 
 <SUBSECTION Standard>
 GTK_IS_TOOL_SHELL
@@ -4263,15 +4314,19 @@ gtk_tool_item_set_visible_vertical
 gtk_tool_item_get_visible_vertical
 gtk_tool_item_set_is_important
 gtk_tool_item_get_is_important
+gtk_tool_item_get_ellipsize_mode
 gtk_tool_item_get_icon_size
 gtk_tool_item_get_orientation
 gtk_tool_item_get_toolbar_style
 gtk_tool_item_get_relief_style
+gtk_tool_item_get_text_alignment
+gtk_tool_item_get_text_orientation
 gtk_tool_item_retrieve_proxy_menu_item
 gtk_tool_item_get_proxy_menu_item
 gtk_tool_item_set_proxy_menu_item
 gtk_tool_item_rebuild_menu
 gtk_tool_item_toolbar_reconfigured
+gtk_tool_item_get_text_size_group
 
 <SUBSECTION Standard>
 GTK_TYPE_TOOL_ITEM
@@ -4436,6 +4491,79 @@ GTK_TOOLTIPS_GET_CLASS
 gtk_tooltips_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtktoolitemgroup</FILE>
+<TITLE>GtkToolItemGroup</TITLE>
+GtkToolItemGroup
+gtk_tool_item_group_get_collapsed
+gtk_tool_item_group_get_drop_item
+gtk_tool_item_group_get_ellipsize
+gtk_tool_item_group_get_item_position
+gtk_tool_item_group_get_n_items
+gtk_tool_item_group_get_label
+gtk_tool_item_group_get_label_widget
+gtk_tool_item_group_get_nth_item
+gtk_tool_item_group_get_header_relief
+gtk_tool_item_group_insert
+gtk_tool_item_group_new
+gtk_tool_item_group_set_collapsed
+gtk_tool_item_group_set_ellipsize
+gtk_tool_item_group_set_item_position
+gtk_tool_item_group_set_label
+gtk_tool_item_group_set_label_widget
+gtk_tool_item_group_set_header_relief
+<SUBSECTION Standard>
+GtkToolItemGroupClass
+GTK_TOOL_ITEM_GROUP
+GTK_IS_TOOL_ITEM_GROUP
+GTK_TYPE_TOOL_ITEM_GROUP
+GTK_TOOL_ITEM_GROUP_CLASS
+GTK_IS_TOOL_ITEM_GROUP_CLASS
+GTK_TOOL_ITEM_GROUP_GET_CLASS
+<SUBSECTION Private>
+gtk_tool_item_group_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtktoolpalette</FILE>
+<TITLE>GtkToolPalette</TITLE>
+GtkToolPalette
+gtk_tool_palette_new
+gtk_tool_palette_get_exclusive
+gtk_tool_palette_set_exclusive
+gtk_tool_palette_get_expand
+gtk_tool_palette_set_expand
+gtk_tool_palette_get_group_position
+gtk_tool_palette_set_group_position
+gtk_tool_palette_get_icon_size
+gtk_tool_palette_set_icon_size
+gtk_tool_palette_unset_icon_size
+gtk_tool_palette_get_style
+gtk_tool_palette_set_style
+gtk_tool_palette_unset_style
+gtk_tool_palette_add_drag_dest
+gtk_tool_palette_get_drag_item
+gtk_tool_palette_get_drag_target_group
+gtk_tool_palette_get_drag_target_item
+gtk_tool_palette_get_drop_group
+gtk_tool_palette_get_drop_item
+GtkToolPaletteDragTargets
+gtk_tool_palette_set_drag_source
+gtk_tool_palette_get_hadjustment
+gtk_tool_palette_get_vadjustment
+<SUBSECTION Standard>
+GtkToolPaletteClass
+GTK_TOOL_PALETTE
+GTK_IS_TOOL_PALETTE
+GTK_TYPE_TOOL_PALETTE
+GTK_TOOL_PALETTE_CLASS
+GTK_IS_TOOL_PALETTE_CLASS
+GTK_TOOL_PALETTE_GET_CLASS
+<SUBSECTION Private>
+gtk_tool_palette_get_type
+GtkToolPalettePrivate
+</SECTION>
+
 <SECTION>
 <FILE>gtktooltip</FILE>
 <TITLE>GtkTooltip</TITLE>
@@ -4445,6 +4573,7 @@ gtk_tooltip_set_text
 gtk_tooltip_set_icon
 gtk_tooltip_set_icon_from_stock
 gtk_tooltip_set_icon_from_icon_name
+gtk_tooltip_set_icon_from_gicon
 gtk_tooltip_set_custom
 gtk_tooltip_trigger_tooltip_query
 gtk_tooltip_set_tip_area
@@ -5105,6 +5234,23 @@ GtkCellRendererSpinPrivate
 gtk_cell_renderer_spin_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkcellrendererspinner</FILE>
+<TITLE>GtkCellRendererSpinner</TITLE>
+GtkCellRendererSpinner
+gtk_cell_renderer_spinner_new
+<SUBSECTION Standard>
+GTK_TYPE_CELL_RENDERER_SPINNER
+GTK_CELL_RENDERER_SPINNER
+GTK_CELL_RENDERER_SPINNER_CLASS
+GTK_IS_CELL_RENDERER_SPINNER
+GTK_IS_CELL_RENDERER_SPINNER_CLASS
+GTK_CELL_RENDERER_SPINNER_GET_CLASS
+<SUBSECTION Private>
+GtkCellRendererSpinnerPrivate
+gtk_cell_renderer_spinner_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkcellrendererpixbuf</FILE>
 <TITLE>GtkCellRendererPixbuf</TITLE>
@@ -5279,6 +5425,7 @@ gtk_viewport_set_hadjustment
 gtk_viewport_set_vadjustment
 gtk_viewport_set_shadow_type
 gtk_viewport_get_shadow_type
+gtk_viewport_get_bin_window
 <SUBSECTION Standard>
 GTK_VIEWPORT
 GTK_IS_VIEWPORT
@@ -5539,6 +5686,7 @@ gtk_widget_send_expose
 gtk_widget_style_get
 gtk_widget_style_get_property
 gtk_widget_style_get_valist
+gtk_widget_style_attach
 gtk_widget_get_accessible
 gtk_widget_child_focus
 gtk_widget_child_notify
@@ -5597,11 +5745,17 @@ gtk_widget_set_visible
 gtk_widget_has_default
 gtk_widget_has_focus
 gtk_widget_has_grab
+gtk_widget_has_rc_style
 gtk_widget_is_drawable
 gtk_widget_is_toplevel
 gtk_widget_set_window
 gtk_widget_set_receives_default
 gtk_widget_get_receives_default
+gtk_widget_set_realized
+gtk_widget_get_realized
+gtk_widget_set_mapped
+gtk_widget_get_mapped
+gtk_widget_get_requisition
 
 <SUBSECTION>
 gtk_requisition_copy
@@ -5709,6 +5863,7 @@ gtk_window_get_urgency_hint
 gtk_window_get_accept_focus
 gtk_window_get_focus_on_map
 gtk_window_get_group
+gtk_window_get_window_type
 gtk_window_move
 gtk_window_parse_geometry
 gtk_window_reshow_with_initial_size
@@ -5724,6 +5879,8 @@ gtk_window_set_icon_name
 gtk_window_set_auto_startup_notification
 gtk_window_get_opacity
 gtk_window_set_opacity
+gtk_window_get_mnemonics_visible
+gtk_window_set_mnemonics_visible
 <SUBSECTION Standard>
 GTK_WINDOW
 GTK_IS_WINDOW
@@ -5928,6 +6085,7 @@ gtk_paint_polygon
 gtk_paint_shadow
 gtk_paint_shadow_gap
 gtk_paint_slider
+gtk_paint_spinner
 gtk_paint_string
 gtk_paint_tab
 gtk_paint_vline
@@ -6745,6 +6903,7 @@ gtk_printer_has_details
 gtk_printer_request_details
 gtk_printer_get_capabilities
 gtk_printer_get_default_page_size
+gtk_printer_get_hard_margins
 GtkPrinterFunc
 gtk_enumerate_printers
 
@@ -6929,8 +7088,10 @@ gtk_paper_size_to_key_file
 
 <SUBSECTION Standard>
 GTK_TYPE_PAPER_SIZE
+
 <SUBSECTION Private>
 gtk_paper_size_get_type
+gtk_custom_paper_unix_dialog_get_type
 </SECTION>
 
 
@@ -6989,6 +7150,7 @@ gtk_print_context_get_dpi_y
 gtk_print_context_get_pango_fontmap
 gtk_print_context_create_pango_context
 gtk_print_context_create_pango_layout
+gtk_print_context_get_hard_margins
 
 <SUBSECTION Standard>
 GTK_TYPE_PRINT_CONTEXT

docs/reference/gtk/gtk.types

@@ -29,6 +29,7 @@ gtk_cell_renderer_get_type
 gtk_cell_renderer_pixbuf_get_type
 gtk_cell_renderer_progress_get_type
 gtk_cell_renderer_spin_get_type
+gtk_cell_renderer_spinner_get_type
 gtk_cell_renderer_text_get_type
 gtk_cell_renderer_toggle_get_type
 gtk_cell_view_get_type
@@ -103,6 +104,7 @@ gtk_misc_get_type
 gtk_mount_operation_get_type
 gtk_notebook_get_type
 gtk_object_get_type
+gtk_offscreen_window_get_type
 gtk_old_editable_get_type
 gtk_option_menu_get_type
 gtk_orientable_get_type
@@ -146,6 +148,7 @@ gtk_settings_get_type
 gtk_size_group_get_type
 gtk_socket_get_type
 gtk_spin_button_get_type
+gtk_spinner_get_type
 gtk_statusbar_get_type
 gtk_status_icon_get_type
 gtk_style_get_type
@@ -166,6 +169,8 @@ gtk_toggle_tool_button_get_type
 gtk_toolbar_get_type
 gtk_tool_button_get_type
 gtk_tool_item_get_type
+gtk_tool_item_group_get_type
+gtk_tool_palette_get_type
 gtk_tooltips_get_type
 gtk_tree_drag_dest_get_type
 gtk_tree_drag_source_get_type

docs/reference/gtk/migrating-GtkComboBox.sgml

@@ -20,7 +20,7 @@
     editable case. 
     The selection of the display style — menu or list —
     is no longer done at the API level, but has been made themeable via
-    the style property #GtkComboBox:appearance.
+    the style property #GtkComboBox:appears-as-list.
   </para>
 
   <section id="migrating-GtkOptionMenu">
@@ -28,7 +28,7 @@
     
     <para>
       Here is an example of a simple, but typical use of 
-      #GtkOptionMenu:
+      #GtkOptionMenu<!---->:
       <informalexample><programlisting>
 GtkWidget *option_menu, *menu, *menu_item;
 
@@ -47,12 +47,12 @@ gtk_widget_show (menu_item);
 
 gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
       </programlisting></informalexample>
-      In order to react to the user's selection, connect to the "changed"
+      In order to react to the user's selection, connect to the #GtkOptionMenu::changed
       signal on the option menu and use gtk_option_menu_get_history()
       to retrieve the index of the selected item.
     </para>
     <para>
-      And here is how it would be done with a #GtkComboBox:
+      And here is how it would be done with a #GtkComboBox<!---->:
       <informalexample><programlisting>
 GtkWidget *combo_box;
 
@@ -129,7 +129,7 @@ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
     <title>Migrating from GtkCombo to GtkComboBoxEntry</title>
 
     <para>
-      Here is an example of a simple, but typical use of a #GtkCombo:
+      Here is an example of a simple, but typical use of a #GtkCombo<!---->:
       <informalexample><programlisting>
 GtkWidget *combo;
 GList *items = NULL;
@@ -141,13 +141,13 @@ items = g_list_append (items, "Third Item");
 combo = gtk_combo_new (<!-- -->);
 gtk_combo_set_popdown_strings (GTK_COMBO (combo), items);
       </programlisting></informalexample>
-      In order to react to the user's selection, connect to the "changed"
+      In order to react to the user's selection, connect to the #GtkCombo::changed
       signal on the combo and use 
       <literal>gtk_entry_get_text (GTK_ENTRY (combo->entry))</literal>
       to retrieve the selected text.
     </para>
     <para>
-      And here is how it would be done using #GtkComboBoxEntry:
+      And here is how it would be done using #GtkComboBoxEntry<!---->:
       <informalexample><programlisting>
 combo_box = gtk_combo_box_entry_new_text (<!-- -->);
 
@@ -155,7 +155,7 @@ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "First Item");
 gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Second Item");
 gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Third Item");
       </programlisting></informalexample>
-      In order to react to the user's selection, connect to the "changed"
+      In order to react to the user's selection, connect to the #GtkComboBox::changed
       signal on the combo and use 
       <literal>gtk_entry_get_text (GTK_ENTRY (GTK_BIN (combo_box)->child))</literal>
       to retrieve the selected text.

docs/reference/gtk/running.sgml

@@ -184,6 +184,10 @@ additional environment variables.
       <term>printing</term>
       <listitem><para>Printing support</para></listitem>
     </varlistentry>
+    <varlistentry>
+      <term>builder</term>
+      <listitem><para>GtkBuilder support</para></listitem>
+    </varlistentry>
 
   </variablelist>
   The special value <literal>all</literal> can be used to turn on all 
@@ -335,8 +339,33 @@ nevertheless.
       <term>xim</term>
       <listitem><para>Information about XIM support</para></listitem>
     </varlistentry>
+    <varlistentry>
+      <term>nograbs</term>
+      <listitem><para>Turn off all pointer and keyboard grabs</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>multihead</term>
+      <listitem><para>Information related to multiple screens</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>xinerama</term>
+      <listitem><para>Simulate a multi-monitor setup</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>cursor</term>
+      <listitem><para>Information about cursor objects (only win32)</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>draw</term>
+      <listitem><para>Information about drawing operations (only win32)</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>eventloop</term>
+      <listitem><para>Information about event loop operation (mostly Quartz)</para></listitem>
+    </varlistentry>
+
   </variablelist>
-  The special value <literal>all</literal> can be used to turn on all 
+  The special value <literal>all</literal> can be used to turn on all
   debug options.
   </para>
 </formalpara>

docs/reference/gtk/tmpl/filesystem.sgml

@@ -1,106 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Filesystem utilities
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkMountOperation ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkMountOperation:is-showing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMountOperation:parent ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMountOperation:screen ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_mount_operation_new ##### -->
-<para>
-
-</para>
-
-@parent: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_is_showing ##### -->
-<para>
-
-</para>
-
-@op: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_set_parent ##### -->
-<para>
-
-</para>
-
-@op: 
-@parent: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_get_parent ##### -->
-<para>
-
-</para>
-
-@op: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_set_screen ##### -->
-<para>
-
-</para>
-
-@op: 
-@screen: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_get_screen ##### -->
-<para>
-
-</para>
-
-@op: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_show_uri ##### -->
-<para>
-
-</para>
-
-@screen: 
-@uri: 
-@timestamp: 
-@error: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkaboutdialog.sgml

@@ -1,475 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAboutDialog
-
-<!-- ##### SECTION Short_Description ##### -->
-Display information about an application
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkAboutDialog offers a simple way to display information about
-a program like its logo, name, copyright, website and license. It is
-also possible to give credits to the authors, documenters, translators
-and artists who have worked on the program. An about dialog is typically
-opened when the user selects the <literal>About</literal> option from 
-the <literal>Help</literal> menu. All parts of the dialog are optional.
-</para>
-<para>
-About dialog often contain links and email addresses. #GtkAboutDialog 
-supports this by offering global hooks, which are called when the user
-clicks on a link or email address, see gtk_about_dialog_set_email_hook()
-and gtk_about_dialog_set_url_hook(). Email addresses in the 
-authors, documenters and artists properties are recognized by looking for
-<literal>&lt;user@<!-- -->host&gt;</literal>, URLs are 
-recognized by looking for <literal>http://url</literal>, with 
-<literal>url</literal> extending to the next space, tab or line break.
-</para>
-<para id="gtk-about-dialog-hook-setup">
-Since 2.18 #GtkAboutDialog provides default website and email hooks that use
-gtk_show_uri().
-</para>
-<para>
-If you want provide your own hooks overriding the default ones, it is important
-to do so before setting the website and email URL properties, like this:
-</para>
-<informalexample><programlisting>
-gtk_about_dialog_set_url_hook (GTK_ABOUT_DIALOG (dialog), launch_url, NULL, NULL);
-gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (dialog), app_url);
-</programlisting></informalexample>
-<para>
-To disable the default hooks, you can pass %NULL as the hook func. Then,
-the #GtkAboutDialog widget will not display the website or the
-email addresses as clickable.
-</para>
-<para>
-To make constructing a #GtkAboutDialog as convenient as possible, you can
-use the function gtk_show_about_dialog() which constructs and shows a dialog 
-and keeps it around so that it can be shown again.
-</para>
-<para>
-Note that GTK+ sets a default title of <literal>_("About &percnt;s")</literal> 
-on the dialog window (where &percnt;s is replaced by the name of the 
-application, but in order to ensure proper translation of the title, 
-applications should set the title property explicitly when constructing 
-a #GtkAboutDialog, as shown in the following example:
-</para>
-<informalexample><programlisting>
-gtk_show_about_dialog (NULL, 
-                       "program-name", "ExampleCode",
-                       "logo", example_logo,
-                       "title" _("About ExampleCode"),
-                       NULL);
-</programlisting></informalexample>
-<para>
-Note that prior to GTK+ 2.12, the #GtkAboutDialog:program-name property
-was called "name". This was changed to avoid the conflict with the
-#GtkWidget:name property.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GTK_STOCK_ABOUT
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAboutDialog ##### -->
-<para>
-The <structname>GtkAboutDialog</structname> struct contains
-only private fields and should not be directly accessed.
-</para>
-
-
-<!-- ##### ARG GtkAboutDialog:artists ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:authors ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:comments ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:copyright ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:documenters ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:license ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:logo ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:logo-icon-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:program-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:translator-credits ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:version ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:website ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:website-label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAboutDialog:wrap-license ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_about_dialog_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_name ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_name ##### -->
-<para>
-
-</para>
-
-@about: 
-@name: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_program_name ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_program_name ##### -->
-<para>
-
-</para>
-
-@about: 
-@name: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_version ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_version ##### -->
-<para>
-
-</para>
-
-@about: 
-@version: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_copyright ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_copyright ##### -->
-<para>
-
-</para>
-
-@about: 
-@copyright: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_comments ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_comments ##### -->
-<para>
-
-</para>
-
-@about: 
-@comments: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_license ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_license ##### -->
-<para>
-
-</para>
-
-@about: 
-@license: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_wrap_license ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_wrap_license ##### -->
-<para>
-
-</para>
-
-@about: 
-@wrap_license: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_website ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_website ##### -->
-<para>
-
-</para>
-
-@about: 
-@website: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_website_label ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_website_label ##### -->
-<para>
-
-</para>
-
-@about: 
-@website_label: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_authors ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_authors ##### -->
-<para>
-
-</para>
-
-@about: 
-@authors: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_artists ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_artists ##### -->
-<para>
-
-</para>
-
-@about: 
-@artists: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_documenters ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_documenters ##### -->
-<para>
-
-</para>
-
-@about: 
-@documenters: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_translator_credits ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_translator_credits ##### -->
-<para>
-
-</para>
-
-@about: 
-@translator_credits: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_logo ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_logo ##### -->
-<para>
-
-</para>
-
-@about: 
-@logo: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_logo_icon_name ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_logo_icon_name ##### -->
-<para>
-
-</para>
-
-@about: 
-@icon_name: 
-
-
-<!-- ##### USER_FUNCTION GtkAboutDialogActivateLinkFunc ##### -->
-<para>
-The type of a function which is called when a URL or email
-link is activated. 
-</para>
-
-@about: the #GtkAboutDialog in which the link was activated
-@link_: the URL or email address to which the activated link points
-@data: user data that was passed when the function was registered
-  with gtk_about_dialog_set_email_hook() or 
-  gtk_about_dialog_set_url_hook()
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_email_hook ##### -->
-<para>
-
-</para>
-
-@func: 
-@data: 
-@destroy: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_about_dialog_set_url_hook ##### -->
-<para>
-
-</para>
-
-@func: 
-@data: 
-@destroy: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_show_about_dialog ##### -->
-<para>
-
-</para>
-
-@parent: 
-@first_property_name: 
-@Varargs: 
-
-

docs/reference/gtk/tmpl/gtkaccelgroup.sgml

@@ -1,327 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Accelerator Groups
-
-<!-- ##### SECTION Short_Description ##### -->
-Groups of global keyboard accelerators for an entire GtkWindow
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkAccelGroup represents a group of keyboard accelerators,
-typically attached to a toplevel #GtkWindow (with
-gtk_window_add_accel_group()). Usually you won't need to create a
-#GtkAccelGroup directly; instead, when using #GtkItemFactory, GTK+
-automatically sets up the accelerators for your menus in the item
-factory's #GtkAccelGroup.
-</para>
-
-<para>
-Note that <firstterm>accelerators</firstterm> are different from
-<firstterm>mnemonics</firstterm>. Accelerators are shortcuts for
-activating a menu item; they appear alongside the menu item they're a
-shortcut for. For example "Ctrl+Q" might appear alongside the "Quit"
-menu item. Mnemonics are shortcuts for GUI elements such as text
-entries or buttons; they appear as underlined characters. See
-gtk_label_new_with_mnemonic(). Menu items can have both accelerators
-and mnemonics, of course.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-gtk_window_add_accel_group(), gtk_accel_map_change_entry(),
-gtk_item_factory_new(), gtk_label_new_with_mnemonic()
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAccelGroup ##### -->
-<para>
-An object representing and maintaining a group of accelerators.
-</para>
-
-
-<!-- ##### SIGNAL GtkAccelGroup::accel-activate ##### -->
-<para>
-
-</para>
-
-@accelgroup: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkAccelGroup::accel-changed ##### -->
-<para>
-
-</para>
-
-@accelgroup: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-<!-- ##### ARG GtkAccelGroup:is-locked ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAccelGroup:modifier-mask ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_accel_group_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### MACRO gtk_accel_group_ref ##### -->
-<para>
-Deprecated equivalent of g_object_ref().
-</para>
-
-@Returns: the accel group that was passed in
-
-
-<!-- ##### MACRO gtk_accel_group_unref ##### -->
-<para>
-Deprecated equivalent of g_object_unref().
-</para>
-
-
-
-<!-- ##### FUNCTION gtk_accel_group_connect ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@accel_key: 
-@accel_mods: 
-@accel_flags: 
-@closure: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_connect_by_path ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@accel_path: 
-@closure: 
-
-
-<!-- ##### USER_FUNCTION GtkAccelGroupActivate ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@acceleratable: 
-@keyval: 
-@modifier: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION GtkAccelGroupFindFunc ##### -->
-<para>
-
-</para>
-
-@key: 
-@closure: 
-@data: 
-@Returns: 
-@Since: 2.2
-
-
-<!-- ##### FUNCTION gtk_accel_group_disconnect ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@closure: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_disconnect_key ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@accel_key: 
-@accel_mods: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_query ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@accel_key: 
-@accel_mods: 
-@n_entries: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_activate ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@accel_quark: 
-@acceleratable: 
-@accel_key: 
-@accel_mods: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_lock ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_unlock ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_get_is_locked ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_from_accel_closure ##### -->
-<para>
-
-</para>
-
-@closure: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_get_modifier_mask ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_groups_activate ##### -->
-<para>
-
-</para>
-
-@object: 
-@accel_key: 
-@accel_mods: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_groups_from_object ##### -->
-<para>
-
-</para>
-
-@object: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_group_find ##### -->
-<para>
-
-</para>
-
-@accel_group: 
-@find_func: 
-@data: 
-@Returns: 
-
-
-<!-- ##### STRUCT GtkAccelKey ##### -->
-<para>
-
-</para>
-
-@accel_key: 
-@accel_mods: 
-@accel_flags: 
-
-<!-- ##### FUNCTION gtk_accelerator_valid ##### -->
-<para>
-
-</para>
-
-@keyval: 
-@modifiers: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accelerator_parse ##### -->
-<para>
-
-</para>
-
-@accelerator: 
-@accelerator_key: 
-@accelerator_mods: 
-
-
-<!-- ##### FUNCTION gtk_accelerator_name ##### -->
-<para>
-
-</para>
-
-@accelerator_key: 
-@accelerator_mods: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accelerator_get_label ##### -->
-<para>
-
-</para>
-
-@accelerator_key: 
-@accelerator_mods: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accelerator_set_default_mod_mask ##### -->
-<para>
-
-</para>
-
-@default_mod_mask: 
-
-
-<!-- ##### FUNCTION gtk_accelerator_get_default_mod_mask ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkaccellabel.sgml

@@ -1,158 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAccelLabel
-
-<!-- ##### SECTION Short_Description ##### -->
-A label which displays an accelerator key on the right of the text
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkAccelLabel widget is a subclass of #GtkLabel that also displays an
-accelerator key on the right of the label text, e.g. 'Ctl+S'.
-It is commonly used in menus to show the keyboard short-cuts for commands.
-</para>
-<para>
-The accelerator key to display is not set explicitly.
-Instead, the #GtkAccelLabel displays the accelerators which have been added to
-a particular widget. This widget is set by calling
-gtk_accel_label_set_accel_widget().
-</para>
-<para>
-For example, a #GtkMenuItem widget may have an accelerator added to emit the
-"activate" signal when the 'Ctl+S' key combination is pressed.
-A #GtkAccelLabel is created and added to the #GtkMenuItem, and
-gtk_accel_label_set_accel_widget() is called with the #GtkMenuItem as the
-second argument. The #GtkAccelLabel will now display 'Ctl+S' after its label.
-</para>
-<para>
-Note that creating a #GtkMenuItem with gtk_menu_item_new_with_label() (or
-one of the similar functions for #GtkCheckMenuItem and #GtkRadioMenuItem)
-automatically adds a #GtkAccelLabel to the #GtkMenuItem and calls
-gtk_accel_label_set_accel_widget() to set it up for you.
-</para>
-<para>
-A #GtkAccelLabel will only display accelerators which have %GTK_ACCEL_VISIBLE
-set (see #GtkAccelFlags).
-A #GtkAccelLabel can display multiple accelerators and even signal names,
-though it is almost always used to display just one accelerator key.
-</para>
-
-<example>
-<title>Creating a simple menu item with an accelerator key.</title>
-<programlisting>
-  GtkWidget *save_item;
-  GtkAccelGroup *accel_group;
-
-  /* Create a GtkAccelGroup and add it to the window. */
-  accel_group = gtk_accel_group_new (<!-- -->);
-  gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-  /* Create the menu item using the convenience function. */
-  save_item = gtk_menu_item_new_with_label ("Save");
-  gtk_widget_show (save_item);
-  gtk_container_add (GTK_CONTAINER (menu), save_item);
-
-  /* Now add the accelerator to the GtkMenuItem. Note that since we called
-     gtk_menu_item_new_with_label(<!-- -->) to create the GtkMenuItem the
-     GtkAccelLabel is automatically set up to display the GtkMenuItem
-     accelerators. We just need to make sure we use GTK_ACCEL_VISIBLE here. */
-  gtk_widget_add_accelerator (save_item, "activate", accel_group,
-                              GDK_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-</programlisting>
-</example>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term><link linkend="gtk-keyboard-accelerators">Keyboard Accelerators</link>
-</term>
-<listitem><para>installing and using keyboard short-cuts.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>#GtkItemFactory</term>
-<listitem><para>an easier way to create menus.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAccelLabel ##### -->
-<para>
-The #GtkAccelLabel-struct struct contains private data only, and
-should be accessed using the functions below.
-</para>
-
-
-<!-- ##### ARG GtkAccelLabel:accel-closure ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAccelLabel:accel-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_accel_label_new ##### -->
-<para>
-Creates a new #GtkAccelLabel.
-</para>
-
-@string: the label string. Must be non-%NULL.
-@Returns: a new #GtkAccelLabel.
-
-
-<!-- ##### FUNCTION gtk_accel_label_set_accel_closure ##### -->
-<para>
-
-</para>
-
-@accel_label: 
-@accel_closure: 
-
-
-<!-- ##### FUNCTION gtk_accel_label_get_accel_widget ##### -->
-<para>
-
-</para>
-
-@accel_label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_label_set_accel_widget ##### -->
-<para>
-
-</para>
-
-@accel_label: 
-@accel_widget: 
-
-
-<!-- ##### FUNCTION gtk_accel_label_get_accel_width ##### -->
-<para>
-Returns the width needed to display the accelerator key(s).
-This is used by menus to align all of the #GtkMenuItem widgets, and shouldn't
-be needed by applications.
-</para>
-
-@accel_label: a #GtkAccelLabel.
-@Returns: the width needed to display the accelerator key(s).
-
-
-<!-- ##### FUNCTION gtk_accel_label_refetch ##### -->
-<para>
-Recreates the string representing the accelerator keys.
-This should not be needed since the string is automatically updated whenever
-accelerators are added or removed from the associated widget.
-</para>
-
-@accel_label: a #GtkAccelLabel.
-@Returns: always returns %FALSE.
-
-

docs/reference/gtk/tmpl/gtkaccessible.sgml

@@ -1,33 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAccessible
-
-<!-- ##### SECTION Short_Description ##### -->
-Accessibility support for widgets
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAccessible ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_accessible_connect_widget_destroyed ##### -->
-<para>
-
-</para>
-
-@accessible: 
-
-

docs/reference/gtk/tmpl/gtkaction.sgml

@@ -70,6 +70,11 @@ and should not be accessed directly.
 
 </para>
 
+<!-- ##### ARG GtkAction:always-show-image ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkAction:gicon ##### -->
 <para>
 
@@ -337,6 +342,24 @@ and should not be accessed directly.
 @proxy: 
 
 
+<!-- ##### FUNCTION gtk_action_get_always_show_image ##### -->
+<para>
+
+</para>
+
+@action: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_action_set_always_show_image ##### -->
+<para>
+
+</para>
+
+@action: 
+@always_show: 
+
+
 <!-- ##### FUNCTION gtk_action_get_accel_path ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkactivatable.sgml

@@ -1,98 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkActivatable
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkActivatable ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkActivatable:related-action ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkActivatable:use-action-appearance ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GtkActivatableIface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@update: 
-@sync_action_properties: 
-
-<!-- ##### FUNCTION gtk_activatable_do_set_related_action ##### -->
-<para>
-
-</para>
-
-@activatable: 
-@action: 
-
-
-<!-- ##### FUNCTION gtk_activatable_get_related_action ##### -->
-<para>
-
-</para>
-
-@activatable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_activatable_get_use_action_appearance ##### -->
-<para>
-
-</para>
-
-@activatable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_activatable_sync_action_properties ##### -->
-<para>
-
-</para>
-
-@activatable: 
-@action: 
-
-
-<!-- ##### FUNCTION gtk_activatable_set_related_action ##### -->
-<para>
-
-</para>
-
-@activatable: 
-@action: 
-
-
-<!-- ##### FUNCTION gtk_activatable_set_use_action_appearance ##### -->
-<para>
-
-</para>
-
-@activatable: 
-@use_appearance: 
-
-

docs/reference/gtk/tmpl/gtkbindings.sgml

@@ -156,6 +156,7 @@ a #GtkBindingEntry.
 @signals: 	action signals of this entry
 
 <!-- ##### STRUCT GtkBindingSignal ##### -->
+<anchor id="keybinding-signals"/>
 <para>
 A #GtkBindingSignal stores the necessary information to activate a widget
 in response to a key press via a signal emission.

docs/reference/gtk/tmpl/gtkbuildable.sgml

@@ -41,10 +41,8 @@ a GtkBuilder UI definition.
 
 @g_iface: the parent class
 @set_name: Stores the name attribute given in the GtkBuilder UI definition.
-  #GtkWidget maps this to the #GtkWidget:name property, and 
-  gtk_buildable_set_name() has a fallback implementation that stores
-  the name as object data. Implement this method if your object
-  has some notion of "name" and it makes sense to map the XML name
+  #GtkWidget stores the name as object data. Implement this method if your
+  object has some notion of "name" and it makes sense to map the XML name
   attribute to it.
 @get_name: The getter corresponding to @set_name. Implement this
   if you implement @set_name.

docs/reference/gtk/tmpl/gtkbuilder.sgml

@@ -116,6 +116,12 @@ allows the application to retrieve them from the builder with
 gtk_builder_get_object(). An id is also necessary to use the
 object as property value in other parts of the UI definition.
 </para>
+<note><para>Prior to 2.20, GtkBuilder was setting the "name"
+property of constructed widgets to the "id" attribute. In GTK+
+2.20 or newer, you have to use gtk_buildable_get_name() instead
+of gtk_widget_get_name() to obtain the "id", or set the "name"
+property in your UI definition.
+</para></note>
 <para>
 Setting properties of objects is pretty straightforward with
 the &lt;property&gt; element: the "name" attribute specifies

docs/reference/gtk/tmpl/gtkbutton.sgml

@@ -195,6 +195,7 @@ Emits a #GtkButton::pressed signal to the given #GtkButton.
 </para>
 
 @button: The #GtkButton you want to send the signal to.
+@Deprecated: 2.20: Use the #GtkWidget::button-press-event signal.
 
 
 <!-- ##### FUNCTION gtk_button_released ##### -->
@@ -203,6 +204,7 @@ Emits a #GtkButton::released signal to the given #GtkButton.
 </para>
 
 @button: The #GtkButton you want to send the signal to.
+@Deprecated: 2.20: Use the #GtkWidget::button-release-event signal.
 
 
 <!-- ##### FUNCTION gtk_button_clicked ##### -->
@@ -219,6 +221,7 @@ Emits a #GtkButton::enter signal to the given #GtkButton.
 </para>
 
 @button: The #GtkButton you want to send the signal to.
+@Deprecated: 2.20: Use the #GtkWidget::enter-notify-event signal.
 
 
 <!-- ##### FUNCTION gtk_button_leave ##### -->
@@ -227,6 +230,7 @@ Emits a #GtkButton::leave signal to the given #GtkButton.
 </para>
 
 @button: The #GtkButton you want to send the signal to.
+@Deprecated: 2.20: Use the #GtkWidget::leave-notify-event signal.
 
 
 <!-- ##### FUNCTION gtk_button_set_relief ##### -->

docs/reference/gtk/tmpl/gtkcelleditable.sgml

@@ -38,6 +38,11 @@ to be usable when editing the contents of a #GtkTreeView cell.
 
 @celleditable: the object which received the signal.
 
+<!-- ##### ARG GtkCellEditable:editing-canceled ##### -->
+<para>
+
+</para>
+
 <!-- ##### STRUCT GtkCellEditableIface ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcurve.sgml

@@ -5,17 +5,6 @@ GtkCurve
 Allows direct editing of a curve
 
 <!-- ##### SECTION Long_Description ##### -->
-<note>
-<para>
- This widget is considered too specialized/little-used for
- GTK+, and will in the future be moved to some other package.  If
- your application needs this widget, feel free to use it, as the
- widget does work and is useful in some applications; it's just not
- of general interest. However, we are not accepting new features for
- the widget, and it will eventually move out of the GTK+
- distribution.
-</para>
-</note>
 <para>
 The #GtkCurve widget allows the user to edit a curve covering a range of
 values. It is typically used to fine-tune color balances in graphics
@@ -28,6 +17,9 @@ connected together into a smooth curve. In linear mode the user places points
 on the curve which are connected by straight lines. In free mode the user can
 draw the points of the curve freely, and they are not connected at all.
 </para>
+<para>
+As of GTK+ 2.20, #GtkCurve has been deprecated since it is too specialized.
+</para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
@@ -92,6 +84,7 @@ Creates a new #GtkCurve.
 </para>
 
 @Returns: a new #GtkCurve.
+@Deprecated: 2.20: Don't use this widget anymore.
 
 
 <!-- ##### FUNCTION gtk_curve_reset ##### -->
@@ -102,6 +95,7 @@ The curve type is not changed.
 </para>
 
 @curve: a #GtkCurve.
+@Deprecated: 2.20: Don't use this widget anymore.
 
 
 <!-- ##### FUNCTION gtk_curve_set_gamma ##### -->
@@ -115,6 +109,7 @@ FIXME: Needs a more precise definition of gamma.
 
 @curve: a #GtkCurve.
 @gamma_: the gamma value.
+@Deprecated: 2.20: Don't use this widget anymore.
 
 
 <!-- ##### FUNCTION gtk_curve_set_range ##### -->
@@ -128,6 +123,7 @@ The curve is also reset with a call to gtk_curve_reset().
 @max_x: the maximum x value.
 @min_y: the minimum y value.
 @max_y: the maximum y value.
+@Deprecated: 2.20: Don't use this widget anymore.
 
 
 <!-- ##### FUNCTION gtk_curve_get_vector ##### -->
@@ -138,6 +134,7 @@ Returns a vector of points representing the curve.
 @curve: a #GtkCurve.
 @veclen: the number of points to calculate.
 @vector: returns the points.
+@Deprecated: 2.20: Don't use this widget anymore.
 
 
 <!-- ##### FUNCTION gtk_curve_set_vector ##### -->
@@ -149,6 +146,7 @@ The curve type is set to %GTK_CURVE_TYPE_FREE.
 @curve: a #GtkCurve.
 @veclen: the number of points.
 @vector: the points on the curve.
+@Deprecated: 2.20: Don't use this widget anymore.
 
 
 <!-- ##### FUNCTION gtk_curve_set_curve_type ##### -->
@@ -160,5 +158,6 @@ curve will be changed as little as possible.
 
 @curve: a #GtkCurve.
 @type: the type of the curve.
+@Deprecated: 2.20: Don't use this widget anymore.
 
 

docs/reference/gtk/tmpl/gtkdialog.sgml

@@ -368,6 +368,16 @@ directly, but into the @vbox and @action_area, as described above.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_dialog_get_widget_for_response ##### -->
+<para>
+
+</para>
+
+@dialog: 
+@response_id: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_dialog_get_action_area ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkdnd.sgml

@@ -348,17 +348,14 @@ a widget.
 
 <!-- ##### FUNCTION gtk_drag_source_set ##### -->
 <para>
-Sets up a widget so that GTK+ will start a drag
-operation when the user clicks and drags on the
-widget. The widget must have a window.
+
 </para>
 
-@widget: a #GtkWidget
-@start_button_mask: the bitmask of buttons that can start the drag
-@targets: the table of targets that the drag will support
-@n_targets: the number of items in @targets
-@actions: the bitmask of possible actions for a drag from this
- widget.
+@widget:
+@start_button_mask:
+@targets:
+@n_targets:
+@actions:
 
 
 <!-- ##### FUNCTION gtk_drag_source_set_icon ##### -->

docs/reference/gtk/tmpl/gtkdrawingarea.sgml

@@ -56,7 +56,7 @@ gboolean
 expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
   gdk_draw_arc (widget->window,
-                widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                widget->style->fg_gc[gtk_widget_get_state (widget)],
                 TRUE,
                 0, 0, widget->allocation.width, widget->allocation.height,
                 0, 64 * 360);

docs/reference/gtk/tmpl/gtkentry.sgml

@@ -161,6 +161,14 @@ The #GtkEntry-struct struct contains only private data.
 @entry: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL GtkEntry::preedit-changed ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1: 
+
 <!-- ##### SIGNAL GtkEntry::toggle-overwrite ##### -->
 <para>
 
@@ -1011,3 +1019,22 @@ Specifies the side of the entry at which an icon is placed.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_entry_get_icon_window ##### -->
+<para>
+
+</para>
+
+@entry: 
+@icon_pos: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_entry_get_text_window ##### -->
+<para>
+
+</para>
+
+@entry: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkgamma.sgml

@@ -5,17 +5,6 @@ GtkGammaCurve
 A subclass of GtkCurve for editing gamma curves
 
 <!-- ##### SECTION Long_Description ##### -->
-<note>
-<para>
- This widget is considered too specialized/little-used for
- GTK+, and will in the future be moved to some other package.  If
- your application needs this widget, feel free to use it, as the
- widget does work and is useful in some applications; it's just not
- of general interest. However, we are not accepting new features for
- the widget, and it will eventually move out of the GTK+
- distribution.
-</para>
-</note>
 <para>
 The #GtkGammaCurve widget is a variant of #GtkCurve specifically for
 editing gamma curves, which are used in graphics applications such as the
@@ -28,6 +17,9 @@ mouse just like a #GtkCurve widget. On the right of the curve it also displays
 free), and the other 2 set the curve to a particular gamma value, or reset it
 to a straight line.
 </para>
+<para>
+As of GTK+ 2.20, #GtkGammaCurve has been deprecated since it is too specialized.
+</para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
@@ -50,5 +42,6 @@ Creates a new #GtkGammaCurve.
 </para>
 
 @Returns: a new #GtkGammaCurve.
+@Deprecated: 2.20: Don't use this widget anymore.
 
 

docs/reference/gtk/tmpl/gtkicontheme.sgml

@@ -9,7 +9,7 @@ Looking up icons by name
 #GtkIconTheme provides a facility for looking up icons by name
 and size. The main reason for using a name rather than simply
 providing a filename is to allow different icons to be used
-depending on what <firstterm>icon theme</firstterm> is selecetd
+depending on what <firstterm>icon theme</firstterm> is selected
 by the user. The operation of icon themes on Linux and Unix
 follows the <ulink
 url="http://www.freedesktop.org/Standards/icon-theme-spec">Icon

docs/reference/gtk/tmpl/gtkimage.sgml

@@ -1,518 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkImage
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget displaying an image
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkImage widget displays an image. Various kinds of object 
-can be displayed as an image; most typically, you would load a 
-#GdkPixbuf ("pixel buffer") from a file, and then display that. 
-There's a convenience function to do this, gtk_image_new_from_file(),
-used as follows:
-<informalexample><programlisting>
-  GtkWidget *image;
-  image = gtk_image_new_from_file ("myfile.png");
-</programlisting></informalexample>
-If the file isn't loaded successfully, the image will contain a
-"broken image" icon similar to that used in many web browsers.
-If you want to handle errors in loading the file yourself, 
-for example by displaying an error message, then load the image with
-gdk_pixbuf_new_from_file(), then create the #GtkImage with 
-gtk_image_new_from_pixbuf().
-</para>
-<para>
-The image file may contain an animation, if so the #GtkImage will 
-display an animation (#GdkPixbufAnimation) instead of a static image.
-</para>
-<para>
-#GtkImage is a subclass of #GtkMisc, which implies that you can 
-align it (center, left, right) and add padding to it, using 
-#GtkMisc methods.
-</para>
-<para>
-#GtkImage is a "no window" widget (has no #GdkWindow of its own), 
-so by default does not receive events. If you want to receive events
-on the image, such as button clicks, place the image inside a 
-#GtkEventBox, then connect to the event signals on the event box.
-<example>
-<title>Handling button press events on a 
-<structname>GtkImage</structname>.</title>
-<programlisting>
-  static gboolean
-  button_press_callback (GtkWidget      *event_box, 
-                         GdkEventButton *event,
-                         gpointer        data)
-  {
-    g_print ("Event box clicked at coordinates &percnt;f,&percnt;f\n", 
-             event->x, event->y);
-
-    /* Returning TRUE means we handled the event, so the signal 
-     * emission should be stopped (don't call any further 
-     * callbacks that may be connected). Return FALSE
-     * to continue invoking callbacks.
-     */
-    return TRUE;
-  }
-
-  static GtkWidget*
-  create_image (void)
-  {
-    GtkWidget *image;
-    GtkWidget *event_box;
-
-    image = gtk_image_new_from_file ("myfile.png");
-
-    event_box = gtk_event_box_new (<!-- -->);
-
-    gtk_container_add (GTK_CONTAINER (event_box), image);
-
-    g_signal_connect (G_OBJECT (event_box), 
-                      "button_press_event",
-                      G_CALLBACK (button_press_callback),
-                      image);
-
-    return image;
-  }
-</programlisting>
-</example>
-</para>
-<para>
-When handling events on the event box, keep in mind that coordinates
-in the image may be different from event box coordinates due to 
-the alignment and padding settings on the image (see #GtkMisc). 
-The simplest way to solve this is to set the alignment to 0.0
-(left/top), and set the padding to zero. Then the origin of 
-the image will be the same as the origin of the event box.
-</para>
-
-<para>
-Sometimes an application will want to avoid depending on external data
-files, such as image files. GTK+ comes with a program to avoid this,
-called <application>gdk-pixbuf-csource</application>. This program
-allows you to convert an image into a C variable declaration, which
-can then be loaded into a #GdkPixbuf using
-gdk_pixbuf_new_from_inline().
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GdkPixbuf
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkImage ##### -->
-<para>
-This struct contain private data only and should be accessed by the functions
-below.
-</para>
-
-
-<!-- ##### ARG GtkImage:file ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:gicon ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:icon-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:icon-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:icon-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:mask ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixbuf ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixbuf-animation ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixel-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixmap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:stock ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:storage-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GtkImageType ##### -->
-<para>
-Describes the image data representation used by a #GtkImage. If you
-want to get the image from the widget, you can only get the
-currently-stored representation. e.g.  if the
-gtk_image_get_storage_type() returns #GTK_IMAGE_PIXBUF, then you can
-call gtk_image_get_pixbuf() but not gtk_image_get_stock().  For empty
-images, you can request any storage type (call any of the "get"
-functions), but they will all return %NULL values.
-</para>
-
-@GTK_IMAGE_EMPTY: there is no image displayed by the widget
-@GTK_IMAGE_PIXMAP: the widget contains a #GdkPixmap
-@GTK_IMAGE_IMAGE: the widget contains a #GdkImage
-@GTK_IMAGE_PIXBUF: the widget contains a #GdkPixbuf
-@GTK_IMAGE_STOCK: the widget contains a stock icon name (see <xref linkend="gtk-Stock-Items"/>)
-@GTK_IMAGE_ICON_SET: the widget contains a #GtkIconSet
-@GTK_IMAGE_ANIMATION: the widget contains a #GdkPixbufAnimation
-@GTK_IMAGE_ICON_NAME: the widget contains a named icon. 
-  This image type was added in GTK+ 2.6
-@GTK_IMAGE_GICON: the widget contains a #GIcon.
-  This image type was added in GTK+ 2.14
-
-<!-- ##### FUNCTION gtk_image_get_icon_set ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon_set: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_image ##### -->
-<para>
-
-</para>
-
-@image: 
-@gdk_image: 
-@mask: 
-
-
-<!-- ##### FUNCTION gtk_image_get_pixbuf ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_get_pixmap ##### -->
-<para>
-
-</para>
-
-@image: 
-@pixmap: 
-@mask: 
-
-
-<!-- ##### FUNCTION gtk_image_get_stock ##### -->
-<para>
-
-</para>
-
-@image: 
-@stock_id: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_animation ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_get_icon_name ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon_name: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_gicon ##### -->
-<para>
-
-</para>
-
-@image: 
-@gicon: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_storage_type ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_file ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_icon_set ##### -->
-<para>
-
-</para>
-
-@icon_set: 
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_image ##### -->
-<para>
-
-</para>
-
-@image: 
-@mask: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_pixbuf ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_pixmap ##### -->
-<para>
-
-</para>
-
-@pixmap: 
-@mask: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_stock ##### -->
-<para>
-
-</para>
-
-@stock_id: 
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_animation ##### -->
-<para>
-
-</para>
-
-@animation: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_icon_name ##### -->
-<para>
-
-</para>
-
-@icon_name: 
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_gicon ##### -->
-<para>
-
-</para>
-
-@icon: 
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_file ##### -->
-<para>
-
-</para>
-
-@image: 
-@filename: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_icon_set ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon_set: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_image ##### -->
-<para>
-
-</para>
-
-@image: 
-@gdk_image: 
-@mask: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_pixbuf ##### -->
-<para>
-
-</para>
-
-@image: 
-@pixbuf: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_pixmap ##### -->
-<para>
-
-</para>
-
-@image: 
-@pixmap: 
-@mask: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_stock ##### -->
-<para>
-
-</para>
-
-@image: 
-@stock_id: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_animation ##### -->
-<para>
-
-</para>
-
-@image: 
-@animation: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_icon_name ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon_name: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_gicon ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_clear ##### -->
-<para>
-
-</para>
-
-@image: 
-
-
-<!-- ##### FUNCTION gtk_image_new ##### -->
-<para>
-
-</para>
-
-@Returns: the #GtkImage
-<!-- # Unused Parameters # -->
-@mask: a #GdkBitmap that indicates which parts of the image should be transparent.
-
-
-<!-- ##### FUNCTION gtk_image_set ##### -->
-<para>
-Sets the #GtkImage.
-</para>
-
-@image: a #GtkImage
-@val: a #GdkImage
-@mask: a #GdkBitmap that indicates which parts of the image should be transparent.
-
-
-<!-- ##### FUNCTION gtk_image_get ##### -->
-<para>
-Gets the #GtkImage.
-</para>
-
-@image: a #GtkImage
-@val: return location for a #GdkImage
-@mask: a #GdkBitmap that indicates which parts of the image should be transparent.
-
-
-<!-- ##### FUNCTION gtk_image_set_pixel_size ##### -->
-<para>
-
-</para>
-
-@image: 
-@pixel_size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_pixel_size ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkinputdialog.sgml

@@ -5,15 +5,6 @@ GtkInputDialog
 Configure devices for the XInput extension
 
 <!-- ##### SECTION Long_Description ##### -->
-<para>
- NOTE this widget is considered too specialized/little-used for
- GTK+, and will in the future be moved to some other package.  If
- your application needs this widget, feel free to use it, as the
- widget does work and is useful in some applications; it's just not
- of general interest. However, we are not accepting new features for
- the widget, and it will eventually move out of the GTK+
- distribution.
-</para>
 
 <para>
 #GtkInputDialog displays a dialog which allows the user
@@ -32,6 +23,9 @@ No actions are bound to these by default.
 The changes that the user makes take effect
 immediately. 
 </para>
+<para>
+As of GTK+ 2.20, #GtkInputDialog has been deprecated since it is too specialized.
+</para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
@@ -55,6 +49,8 @@ to #GDK_MODE_ENABLED.
 
 @inputdialog: the object which received the signal.
 @deviceid: The ID of the newly disabled device.
+<!-- # Unused Parameters # -->
+@Deprecated: 2.20: Don't use this widget anymore.
 
 <!-- ##### SIGNAL GtkInputDialog::enable-device ##### -->
 <para>
@@ -65,6 +61,8 @@ mode of a device from #GDK_MODE_DISABLED to a
 
 @inputdialog: the object which received the signal.
 @deviceid: The ID of the newly enabled device.
+<!-- # Unused Parameters # -->
+@Deprecated: 2.20: Don't use this widget anymore.
 
 <!-- ##### FUNCTION gtk_input_dialog_new ##### -->
 <para>
@@ -72,5 +70,6 @@ Creates a new #GtkInputDialog.
 </para>
 
 @Returns: the new #GtkInputDialog.
+@Deprecated: 2.20: Don't use this widget anymore.
 
 

docs/reference/gtk/tmpl/gtknotebook.sgml

@@ -26,9 +26,14 @@ The GtkNoteboopk implementation of the GtkBuildable interface
 supports placing children into tabs by specifying "tab" as the
 "type" attribute of a <child> element. Note that the content
 of the tab must be created before the tab can be filled.
-A tab child can be specified without specifying a <child> 
+A tab child can be specified without specifying a <child>
 type attribute.
 </para>
+<para>
+To add a child widget in the notebooks action area, specify
+"action-start" or "action-end" as the "type" attribute of the &lt;child&gt;
+element.
+</para>
 <example>
 <title>A UI definition fragment with GtkNotebook</title>
 <programlisting><![CDATA[
@@ -256,7 +261,8 @@ Emitted when the user or a function changes the current page.
 
 <!-- ##### ARG GtkNotebook:tab-pack ##### -->
 <para>
-
+ Deprecated: 2.20: The tab packing functionality of children should not
+ be used anymore and support will be removed in the future.
 </para>
 
 <!-- ##### ARG GtkNotebook:arrow-spacing ##### -->
@@ -749,6 +755,26 @@ Deprecated compatibility macro.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_notebook_set_action_widget ##### -->
+<para>
+
+</para>
+
+@notebook: 
+@widget: 
+@pack_type: 
+
+
+<!-- ##### FUNCTION gtk_notebook_get_action_widget ##### -->
+<para>
+
+</para>
+
+@notebook: 
+@pack_type: 
+@Returns: 
+
+
 <!-- ##### USER_FUNCTION GtkNotebookWindowCreationFunc ##### -->
 <para>
 A function used by GtkNotebook when a detachable tab is dropped

docs/reference/gtk/tmpl/gtkobject.sgml

@@ -113,18 +113,16 @@ if all references are released.
 
 <!-- ##### MACRO GTK_OBJECT_TYPE ##### -->
 <para>
-Gets the type of an object.
+
 </para>
 
-@object: a #GtkObject.
 
 
 <!-- ##### MACRO GTK_OBJECT_TYPE_NAME ##### -->
 <para>
-Gets the name of an objects type.
+
 </para>
 
-@object: a #GtkObject.
 
 
 <!-- ##### ENUM GtkObjectFlags ##### -->

docs/reference/gtk/tmpl/gtkplug.sgml

@@ -1,126 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkPlug
-
-<!-- ##### SECTION Short_Description ##### -->
-Toplevel for embedding into other processes
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Together with #GtkSocket, #GtkPlug provides the ability
-to embed widgets from one process into another process
-in a fashion that is transparent to the user. One
-process creates a #GtkSocket widget and, passes the
-ID of that widgets window to the other process, 
-which then creates a #GtkPlug with that window ID.
-Any widgets contained in the #GtkPlug then will appear
-inside the first applications window.
-</para>
-
-<note>
-<para>
-The #GtkPlug and #GtkSocket widgets are currently not available 
-on all platforms supported by GTK+.
-</para>
-</note>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkSocket</term>
-<listitem><para>the widget that a #GtkPlug plugs into.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkPlug ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkPlug::embedded ##### -->
-<para>
-
-</para>
-
-@plug: the object which received the signal.
-
-<!-- ##### ARG GtkPlug:embedded ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPlug:socket-window ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_plug_construct ##### -->
-<para>
-</para>
-
-@plug: 
-@socket_id: 
-
-
-<!-- ##### FUNCTION gtk_plug_construct_for_display ##### -->
-<para>
-
-</para>
-
-@plug: 
-@display: 
-@socket_id: 
-
-
-<!-- ##### FUNCTION gtk_plug_new ##### -->
-<para>
-</para>
-
-@socket_id: the window ID of the socket, or 0.
-@Returns: the new #GtkPlug widget.
-
-
-<!-- ##### FUNCTION gtk_plug_new_for_display ##### -->
-<para>
-
-</para>
-
-@display: 
-@socket_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_plug_get_id ##### -->
-<para>
-
-</para>
-
-@plug: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_plug_get_embedded ##### -->
-<para>
-
-</para>
-
-@plug: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_plug_get_socket_window ##### -->
-<para>
-
-</para>
-
-@plug: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkprintcontext.sgml

@@ -184,3 +184,16 @@ Printing support was added in GTK+ 2.10.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_print_context_get_hard_margins ##### -->
+<para>
+
+</para>
+
+@context: 
+@top: 
+@bottom: 
+@left: 
+@right: 
+@Returns: 
+
+