2.12.5

svn path=/branches/gtk-2-12/; revision=19328

ChangeLog.pre-1-2

@@ -7981,7 +7981,7 @@ Thu Jun  4 02:20:42 1998  Tim Janik  <timj@gtk.org>
 	* gtk/gtkwidget.h:
 	* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
 	the emission of the "add-accelerator" signal on a widget. this is
-	usefull to prevent accelerator installation on certain widgets.
+	useful to prevent accelerator installation on certain widgets.
 
 	* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
 	labels left justified, by setting their alignment. stop accelerator

ChangeLog.pre-2-0

@@ -17108,7 +17108,7 @@ Tue Jan 16 13:13:13 GMT 2001  Tony Gale <gale@gtk.org>
 	Use fb_mem, fb_stride, fb_width, fb_height.
 	Added recompute_rowstride to reset the rowstride of all windows.
 	Added gdk_fb_recompute_all() which recomputes rootwindow size,
-	window abs positions and window rowstrides. Usefull when the
+	window abs positions and window rowstrides. Useful when the
 	rotation has changed.
 
 Thu Jan 11 13:16:50 GMT 2001  Tony Gale <gale@gtk.org>

HACKING

@@ -1,55 +1,59 @@
 If you want to hack on the GTK+ project, you'll need to have
 the following packages installed:
 
-	- GNU autoconf 2.52
-	- GNU automake 1.4
-	- GNU libtool 1.4
-	- indent (GNU indent 1.9.1 is known good)
-	- GNU gettext 10.40
+        - GNU autoconf 2.54
+        - GNU automake 1.7
+        - GNU libtool 1.4
+        - indent (GNU indent 1.9.1 is known good)
+        - GNU gettext 10.40
 
 These should be available by ftp from ftp.gnu.org or any of the
 fine GNU mirrors.  Beta software can be found at alpha.gnu.org.
 
-In order to get CVS gtk+ installed on your system, you need to have
-the most recent CVS version of glib, pango, and atk installed as well.
+Up-to-date instructions about developing GNOME applications and libraries
+can be found here:
+
+        http://developer.gnome.org
+
+including information about using Subversion with GNOME:
+
+        http://developer.gnome.org/tools/svn.html
+
+In order to get SVN gtk+ installed on your system, you need to have
+the most recent SVN versions of glib, pango, and atk installed as well.
 The installation process of these libraries is similar to that of gtk+, but
 needs to be fulfilled prior to installation of gtk+.
 
-To compile a CVS version of gtk+ on your system, you will need to take
+If at all possible, please use SVN to get the latest development version of
+gtk+ and glib.  You can do the following to get glib and gtk+ from SVN:
+
+        $ svn checkout http://svn.gnome.org/svn/glib/trunk glib
+        $ svn checkout http://svn.gnome.org/svn/pango/trunk pango
+        $ svn checkout http://svn.gnome.org/svn/atk/trunk atk
+        $ svn checkout http://svn.gnome.org/svn/gtk+/trunk gtk+
+
+To compile the SVN version of gtk+ on your system, you will need to take
 several steps to setup the tree for compilation.  You can do all these
 steps at once by running:
 
-        cvsroot/gtk+# ./autogen.sh
+        gtk+$ ./autogen.sh
    
 Basically this does the following for you:
 
-  	cvsroot/gtk+# aclocal; automake; autoconf
+        gtk+$ aclocal; automake; autoconf
 
-        The above commands create the "configure" script.  Now you
-	can run the configure script in cvsroot/gtk+ to create all
-	the Makefiles.
+The above commands create the `configure' script.  Now you
+run the `configure' script in `gtk+/' to create all Makefiles.  
+More information about that in `INSTALL'.
 
-Before running autogen.sh or configure, make sure you have libtool 
+Before running `autogen.sh' or `configure', make sure you have libtool 
 in your path.  
 
 Note that autogen.sh runs configure for you.  If you wish to pass
-options like --prefix=/usr to configure you can give those options
-to autogen.sh and they will be passed on to configure.
-
-If at all possible, please use CVS to get the latest development version of
-gtk+ and glib.  You can do the following to get glib and gtk+ from cvs:
-
-   $ export CVSROOT=':pserver:anonymous@cvs.gnome.org:/cvs/gnome'
-   $ cvs login
-     (there is no password, just hit return)
-   $ cvs -z3 checkout glib
-   $ cvs -z3 checkout pango
-   $ cvs -z3 checkout atk
-   $ cvs -z3 checkout gtk+
-
-For information about submitting patches and commiting changes
-to CVS, see the README and README.cvs-commits files. In particular, 
-don't, under any circumstances, commit anything to CVS before
-reading and understanding README.cvs-commmits.
-
+options like `--prefix=/usr' to `configure' you can give those options
+to `autogen.sh' and they will be passed on to `configure'.
 
+For information about submitting patches and committing changes
+to SVN, see the `README' and `README.commits' files. In particular, 
+don't, under any circumstances, commit anything to SVN before
+reading and understanding `README.commmits'.

INSTALL

@@ -4,7 +4,7 @@ Prerequisites
 GTK+ requires the following packages:
 
  - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ 2.10.2 requires at least GLib 2.12, 
+   location as GTK+. GTK+ 2.12.5 requires at least GLib 2.12, 
    Pango 1.13, ATK 1.9 and cairo 1.2.
 
  - The TIFF, PNG, and JPEG image loading libraries. You most
@@ -15,11 +15,13 @@ GTK+ requires the following packages:
     http://www.libpng.org/
     http://www.ijg.org/
 
+    libtiff must be version 3.6.0 or higher.
+
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-2.10.2.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.10.2			   # change to the toplevel directory
+  % gzip -cd gtk+-2.12.5.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.12.5			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
   % make				   # build GTK+
   [ Become root if necessary ]

INSTALL.in

@@ -15,6 +15,8 @@ GTK+ requires the following packages:
     http://www.libpng.org/
     http://www.ijg.org/
 
+    libtiff must be version 3.6.0 or higher.
+
 Simple install procedure
 ========================
 

MAINTAINERS

@@ -1,5 +1,10 @@
-Email: mclasen@redhat.com
-Email: timj@gtk.org
+Matthias Clasen
+E-mail: mclasen@redhat.com
+Userid: matthiasc
+
+Tim Janik
+E-mail: timj@gtk.org
+Userid: timj
 
 Note that a lot of people are contributing to GTK+, and some parts of it 
 are technically maintained by other people. The people listed above are

Makefile.am

@@ -17,9 +17,10 @@ EXTRA_DIST =			\
 	ChangeLog.pre-2-4	\
 	ChangeLog.pre-2-6	\
 	ChangeLog.pre-2-8	\
+	ChangeLog.pre-2-10	\
 	ChangeLog.gtk-async-file-chooser	\
 	ChangeLog.gtk-printing	\
-	README.cvs-commits	\
+	README.commits	\
 	README.win32		\
 	config.h.win32		\
 	makefile.msc	\
@@ -134,7 +135,11 @@ gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
 	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gtk+-unix-print-2.0.pc
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+
+if OS_UNIX
+pkgconfig_DATA += gtk+-unix-print-2.0.pc
+endif
 
 DISTCLEANFILES =				\
 	gtk+-unix-print-2.0.pc			\

README

@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.10.2. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.12.5. GTK+ is a multi-platform toolkit for
 creating graphical user interfaces. Offering a complete set of widgets,
 GTK+ is suitable for projects ranging from small one-off projects to
 complete application suites.
@@ -27,6 +27,117 @@ Installation
 See the file 'INSTALL'
 
 
+Release notes for 2.12
+======================
+
+* gtk_about_dialog_get/set_name() were deprecated in favour of
+  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
+  "program-name" property instead of the conflicting "name" property.
+
+* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
+
+* Support for Windows 9x/ME has officially been removed. It hasn't worked
+  since 2.6 anyway.
+
+* The GtkTextBufferTargetInfo enumeration values have been changed from
+  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
+  ANSI C limits.
+
+* A change in the handling of _NET_WM_USER_TIME properties on toplevel
+  windows can cause deadlock problems with window managers that are using
+  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
+  by this. The problem has been fixed in metacity 2.18.1.
+
+* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
+  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
+  and gtk_text_layout_cursors_changed(), which should be used in place of
+  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
+  is due to marks moved or changed selection; new GtkTextLineDisplay structure
+  member. Source compatibility is preserved; binary compatibility may break
+  only if GtkTextLineDisplay structure was created on stack or as a part
+  of another structure (in particular GnomeCanvas and its clones do not need
+  recompiling).
+
+* Another new signal has been added to GtkNotebook. The new signal
+  is called create-window, so this name can no longer be used for signals
+  in objects derived from GtkNotebook.
+
+* The gtk_notebook_set/get_group_id() functions were found to be insufficient
+  and have been deprecated in favour of gtk_notebook_set/get_group().
+
+* The move-focus signal has been moved to GtkWidget, to unify the 
+  various implementations of this signal in specific widgets. Great care 
+  has been taken to make sure that all code using this signal continues
+  to work.
+
+* An unused and hardly visible GtkFrame has been removed from the menu 
+  widget hierarchy when GtkComboBox::appears-as-list style property is 
+  set. Any RC file applying a different style to any widget below the 
+  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
+  account that the frame no longer exists.
+
+* The external print preview application used by GtkPrintOperationPreview 
+  is now passed the print settings on the command line with the 
+  --print-settings parameter pointing to a temp file containing the 
+  settings. The preview application assumes ownership of the file and 
+  should delete it once it does not need it anymore. The --print-settings 
+  commandline option is understood by Evince 0.9.0 and newer. To use a 
+  different print preview application, change the gtk-print-preview-command 
+  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
+
+* GtkMenuShell is now defined as an abstract type. It was already 
+  documented as an abstract class, and there is little reason to 
+  instantiate it.
+
+* The GtkTooltips struct (this is the old tooltips API) is now considered
+  private. Code that used to access this struct, in particular the
+  tips_data_list field, will need to change. All of the old tooltips
+  API has been deprecated in favour of a new implementation and
+  API. This affects all of the gtk_tooltips_ functions, and functions 
+  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
+  and gtk_menu_tool_button_set_arrow_tooltip().
+  
+* The memory management of the GtkRecentManager object has been changed,
+  as using the screen didn't guarantee that the singleton instance was
+  correctly destroyed. The screen-related functions have been deprecated,
+  and should not be used anymore; the GtkRecentManager instance returned by
+  the gtk_recent_manager_get_default() function is guaranteed to be valid
+  for the entire lifetime of an application.
+
+* A number of interfaces that have been superseded by newer interfaces for 
+  a long time have finally been deprecated. This includes 
+  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
+
+* The various coordinate systems in use in GtkTreeView widgets have
+  been clarified in the documentation, and in the cause of doing so, 
+  the functions gtk_tree_view_widget_to_tree_coords() and
+  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
+  favour of a new family of gtk_tree_view_convert_ functions.
+
+* gtk_menu_item_remove_submenu() has been deprecated in favour of
+  gtk_menu_item_set_submenu (..., NULL).
+
+* gtk_default_draw_check() has been fixed to really decrease the
+  indicator size by one pixel to ensure an odd size instead of
+  accidentially increasing it.
+  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
+  not subtract 1 from the size passed to gtk_paint_option(), which
+  was just a workaround for above off-by-two for even sizes (theme
+  engines now get the real indicator size passed).
+  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
+  has been changed to 13 to be consistent with GtkCheckButton.
+  The only visible change with default settings is that the indicator in
+  GtkCellRendererToggle has changed its size from 11 to 13 and is now
+  consistent with menus and toggle buttons.
+
+* GTK+ has always required that gtk_init() (or a variant thereof) is
+  called before any other GTK+ function. Some applications call functions
+  like gtk_clipboard_get() to check if they need to call gtk_init(),
+  anyway. A change in GLib 2.14 has recently broken this unsupported
+  practise. It is worth pointing out that calling gtk_init() twice
+  does no harm.
+
+
 Release notes for 2.10
 ======================
 

README.commits

@@ -1,4 +1,4 @@
-GTK+ is part of the GNOME CVS repository. At the current time, any
+GTK+ is part of the GNOME Subversion repository. At the current time, any
 person with write access to the GNOME repository, can make changes to
 GTK+. This is a good thing, in that it encourages many people to work
 on GTK+, and progress can be made quickly. However, GTK+ is a fairly

README.in

@@ -27,6 +27,117 @@ Installation
 See the file 'INSTALL'
 
 
+Release notes for 2.12
+======================
+
+* gtk_about_dialog_get/set_name() were deprecated in favour of
+  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
+  "program-name" property instead of the conflicting "name" property.
+
+* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
+
+* Support for Windows 9x/ME has officially been removed. It hasn't worked
+  since 2.6 anyway.
+
+* The GtkTextBufferTargetInfo enumeration values have been changed from
+  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
+  ANSI C limits.
+
+* A change in the handling of _NET_WM_USER_TIME properties on toplevel
+  windows can cause deadlock problems with window managers that are using
+  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
+  by this. The problem has been fixed in metacity 2.18.1.
+
+* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
+  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
+  and gtk_text_layout_cursors_changed(), which should be used in place of
+  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
+  is due to marks moved or changed selection; new GtkTextLineDisplay structure
+  member. Source compatibility is preserved; binary compatibility may break
+  only if GtkTextLineDisplay structure was created on stack or as a part
+  of another structure (in particular GnomeCanvas and its clones do not need
+  recompiling).
+
+* Another new signal has been added to GtkNotebook. The new signal
+  is called create-window, so this name can no longer be used for signals
+  in objects derived from GtkNotebook.
+
+* The gtk_notebook_set/get_group_id() functions were found to be insufficient
+  and have been deprecated in favour of gtk_notebook_set/get_group().
+
+* The move-focus signal has been moved to GtkWidget, to unify the 
+  various implementations of this signal in specific widgets. Great care 
+  has been taken to make sure that all code using this signal continues
+  to work.
+
+* An unused and hardly visible GtkFrame has been removed from the menu 
+  widget hierarchy when GtkComboBox::appears-as-list style property is 
+  set. Any RC file applying a different style to any widget below the 
+  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
+  account that the frame no longer exists.
+
+* The external print preview application used by GtkPrintOperationPreview 
+  is now passed the print settings on the command line with the 
+  --print-settings parameter pointing to a temp file containing the 
+  settings. The preview application assumes ownership of the file and 
+  should delete it once it does not need it anymore. The --print-settings 
+  commandline option is understood by Evince 0.9.0 and newer. To use a 
+  different print preview application, change the gtk-print-preview-command 
+  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
+
+* GtkMenuShell is now defined as an abstract type. It was already 
+  documented as an abstract class, and there is little reason to 
+  instantiate it.
+
+* The GtkTooltips struct (this is the old tooltips API) is now considered
+  private. Code that used to access this struct, in particular the
+  tips_data_list field, will need to change. All of the old tooltips
+  API has been deprecated in favour of a new implementation and
+  API. This affects all of the gtk_tooltips_ functions, and functions 
+  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
+  and gtk_menu_tool_button_set_arrow_tooltip().
+  
+* The memory management of the GtkRecentManager object has been changed,
+  as using the screen didn't guarantee that the singleton instance was
+  correctly destroyed. The screen-related functions have been deprecated,
+  and should not be used anymore; the GtkRecentManager instance returned by
+  the gtk_recent_manager_get_default() function is guaranteed to be valid
+  for the entire lifetime of an application.
+
+* A number of interfaces that have been superseded by newer interfaces for 
+  a long time have finally been deprecated. This includes 
+  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
+
+* The various coordinate systems in use in GtkTreeView widgets have
+  been clarified in the documentation, and in the cause of doing so, 
+  the functions gtk_tree_view_widget_to_tree_coords() and
+  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
+  favour of a new family of gtk_tree_view_convert_ functions.
+
+* gtk_menu_item_remove_submenu() has been deprecated in favour of
+  gtk_menu_item_set_submenu (..., NULL).
+
+* gtk_default_draw_check() has been fixed to really decrease the
+  indicator size by one pixel to ensure an odd size instead of
+  accidentially increasing it.
+  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
+  not subtract 1 from the size passed to gtk_paint_option(), which
+  was just a workaround for above off-by-two for even sizes (theme
+  engines now get the real indicator size passed).
+  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
+  has been changed to 13 to be consistent with GtkCheckButton.
+  The only visible change with default settings is that the indicator in
+  GtkCellRendererToggle has changed its size from 11 to 13 and is now
+  consistent with menus and toggle buttons.
+
+* GTK+ has always required that gtk_init() (or a variant thereof) is
+  called before any other GTK+ function. Some applications call functions
+  like gtk_clipboard_get() to check if they need to call gtk_init(),
+  anyway. A change in GLib 2.14 has recently broken this unsupported
+  practise. It is worth pointing out that calling gtk_init() twice
+  does no harm.
+
+
 Release notes for 2.10
 ======================
 

README.win32

@@ -1,45 +1,82 @@
-The Win32 backend in GTK+ is not as stable or correct as the X11
-one. 
+The Win32 backend in GTK+ is not as stable or correct as the X11 one.
 
 For prebuilt runtime and developer packages see
-http://www.gimp.org/win32/downloads.html .
-
-There is also a gtk-1-3-win32-production branch of GTK+ that was
-branched off from before the addition of the no-flicker and other
-functionality that was new in GTK+ 2.0.0. The vesion number used for
-that branch is 1.3.0. It corresponds most closely to GTK 1.2.7 on
-Unix. For new code, you shouldn't be using that.
+http://ftp.gnome.org/pub/gnome/binaries/win32/
 
 Building GTK+ on Win32
 ======================
 
-There are two ways to build GTK+ for win32.
+First you obviously need developer packages for the compile-time
+dependencies: Pango, atk, glib, gettext-runtime, libiconv, libpng,
+zlib, libtiff at least. See
+http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
 
-1) Use the autoconf-generated configure script, and the resulting
-Makefiles (which use libtool and gcc to do the compilation). I use
-this myself, but it can be hard to setup correctly.
+After installing the dependencies, there are two ways to build GTK+
+for win32.
 
-Personally I run configure with:
-CC='gcc -mpentium -fnative-struct' CPPFLAGS='-I/target/include' CFLAGS=-O2 LDFLAGS='-L/target/lib' ./configure --disable-static --prefix=/target --with-gdktarget=win32 --with-wintab=/src/wtkit126 --with-ie55=/src/workshop/ie55_lib --host=i386-pc-mingw32
+1) GNU tools, ./configure && make install
+-----------------------------------------
 
-Then, in theory, you can just say "make", like on Unix. In reality,
-there are a few hickups that require manual intervention, and it's
-best to run make separately in each subdirectory. At least for me,
-when libtool creates an .exe file, it puts the real .exe in the .libs
-directory, and leaves a wrapper .exe in the work directory. For some
-reason that wrapper doesn't work for me, it doesn't do anything. So, I
-always do a "cp .libs/*.exe ." after running a make that has produced
-some exes.
+This requires you have mingw and MSYS.
 
-Another issue is with the gdk-pixbuf.loaders file. It's probably best
-to do a "make install" in the gdk-pixbuf directory, and let that set
-up a mostly correct gdk-pixbuf.loaders in the target directory. Then
-copy that back to the source directory. It's needed in gtk/stock-icons
-where make runs gdk-pixbuf-csource.
+Use the configure script, and the resulting Makefiles (which use
+libtool and gcc to do the compilation). I use this myself, but it can
+be hard to setup correctly.
 
-Etc, you get the idea. It can be a bit of a pain.
+The full script I run to build GTK+ 2.10 unpacked from a source
+distribution is as below. This is from bulding GTK+ 2.10.9, slightly
+edited to make it match this 2.11 development branch. Actually I don't
+use any script like this to build the development branch, as I don't
+distribute any binaries from development branches.
 
-2) Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
+MOD=gtk+
+VER=2.10.9
+THIS=$MOD-$VER
+HEX=`echo $THIS | md5sum | cut -d' ' -f1`
+TARGET=c:/devel/target/$HEX
+DEPS="`/devel/src/tml/latest.sh glib atk cairo pango`"
+sed -e 's/need_relink=yes/need_relink=no # no way --tml/' <ltmain.sh >ltmain.temp && mv ltmain.temp ltmain.sh
+usedev
+usemsvs6
+MY_PKG_CONFIG_PATH=""
+for D in $DEPS; do
+    PATH=/devel/dist/$D/bin:$PATH
+    MY_PKG_CONFIG_PATH=/devel/dist/$D/lib/pkgconfig:$MY_PKG_CONFIG_PATH
+done
+PKG_CONFIG_PATH=$MY_PKG_CONFIG_PATH:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3 -mthreads' CPPFLAGS='-I/opt/gnu/include -I/opt/gnuwin32/include -I/opt/misc/include' LDFLAGS='-L/opt/gnu/lib -L/opt/gnuwin32/lib -L/opt/misc/lib -Wl,--enable-auto-image-base' LIBS=-lintl CFLAGS=-O2 ./configure --with-gdktarget=win32 --enable-debug=yes --disable-gtk-doc --disable-static --prefix=$TARGET &&
+libtoolcacheize &&
+unset MY_PKG_CONFIG_PATH &&
+PATH=/devel/target/$HEX/bin:.libs:$PATH make install &&
+(cd $TARGET/bin; strip --strip-unneeded *.dll *.exe) &&
+(cd $TARGET/lib/gtk-2.0/2.10.0/loaders; strip --strip-unneeded *.dll) &&
+(cd $TARGET/lib/gtk-2.0/2.10.0/immodules; strip --strip-unneeded *.dll) &&
+(cd $TARGET/lib/gtk-2.0/2.10.0/engines; strip --strip-unneeded *.dll) &&
+PATH=$TARGET/bin:$PATH gdk-pixbuf-query-loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
+grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp &&
+mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
+grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/etc/gtk-2.0/gtk.immodules >$TARGET/etc/gtk-2.0/gtk.immodules.temp &&
+mv $TARGET/etc/gtk-2.0/gtk.immodules.temp $TARGET/etc/gtk-2.0/gtk.immodules &&
+./gtk-zip.sh &&
+(cd /devel/src/tml && zip /tmp/$MOD-dev-$VER.zip make/$THIS.make) &&
+manifestify /tmp/$MOD*-$VER.zip
+
+You should not just copy the above blindly. There are some things in
+the script that are very specific to *my* build setup on *my* current
+machine. For instance the "latest.sh" script, the "usedev" and
+"usemsvs6" shell functions, the /devel/dist folder. The above script
+is really just meant for reference, to give an idea. You really need
+to understand what things like PKG_CONFIG_PATH are and set them up
+properly after installing the dependencies before building GTK+.
+
+As you see above, after running configure, one can just say "make
+install", like on Unix. A post-build fix is needed, running
+gdk-pixbuf-query-loaders once more to get a correct gdk-pixbuf.loaders
+file.
+
+2) Microsoft's tools
+--------------------
+
+Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
 makefile.msc in gdk and gtk. Be prepared to manually edit various
 makefile.msc files, and the makefile snippets in build/win32.
 
@@ -47,10 +84,10 @@ Alternative 1 also generates Microsoft import libraries (.lib), if you
 have lib.exe available. It might also work for cross-compilation from
 Unix.
 
-Note that I use method 1 myself. Hans Breuer has been taking care of
-the MSVC makefiles. At times, we disagree a bit about various issues,
-and for instance the makefile.msc files will not produce identically
-named DLLs and import libraries as the "autoconfiscated" makefiles and
+I use method 1 myself. Hans Breuer has been taking care of the MSVC
+makefiles. At times, we disagree a bit about various issues, and for
+instance the makefile.msc files might not produce identically named
+DLLs and import libraries as the "autoconfiscated" makefiles and
 libtool do. If this bothers you, you will have to fix the makefiles.
 
 Using GTK+ on Win32
@@ -72,22 +109,9 @@ all. Possible ways to fix this are being investigated.
 Wintab
 ======
 
-The tablet support uses the Wintab API. The Wintab development kit can
-be downloaded from http://www.pointing.com. Pass the --with-wintab
-flag to configure if you use that. If you use nmake and you don't care
-for Wintab, undefine HAVE_WINTAB in config.h.win32 and remove
-references to the wntab32x library from the makefile before building.
+The tablet support uses the Wintab API. The Wintab development kit is
+no longer required. The wintab.h header file is bundled with GTK+
+sources. Unfortunately it seems that only Wacom tablets come with
+support for the Wintab API nowadays.
 
-ActiveIMM
-=========
-
-If you want to build a GTK+ that supports ActiveIMM (the Input Method
-Manager for non-EastAsia locales that can be used on Win9x/NT4), you
-need the dimm.h header file. That is somewhat difficult to find, but
-http://msdn.microsoft.com/downloads/samples/internet/wizard/ seems to
-be a good place to look nowadays. If you use "autoconfiscated" build,
-pass the --with-ie55 flag to configure specifying the location of the
-ie55_lib directory created by downloading the IE5.5 headers and libs
-from the above URL.
-
---Tor Lillqvist <tml@iki.fi>
+--Tor Lillqvist <tml@iki.fi>, <tml@novell.com>

acconfig.h

@@ -19,7 +19,6 @@
 #undef GTK_COMPILED_WITH_DEBUGGING
 
 #undef HAVE_CATGETS
-#undef HAVE_DIMM_H
 #undef HAVE_GETTEXT
 #undef HAVE_IPC_H
 #undef HAVE_LC_MESSAGES
@@ -27,6 +26,8 @@
 #undef HAVE_PWD_H
 #undef HAVE_SHM_H
 #undef HAVE_STPCPY
+#undef HAVE_SYS_SYSINFO_H
+#undef HAVE_SYS_SYSTEMINFO_H
 #undef HAVE_XSHM_H
 #undef HAVE_SHAPE_EXT
 #undef HAVE_SOLARIS_XINERAMA
@@ -34,7 +35,6 @@
 #undef HAVE_SYS_TIME_H
 #undef HAVE_XFREE_XINERAMA
 #undef HAVE_XINERAMA
-#undef HAVE_WINTAB
 #undef HAVE_XCONVERTCASE
 #undef HAVE_XFT
 
@@ -46,6 +46,8 @@
 
 #undef USE_GMODULE
 #undef USE_MMX
+#undef USE_MEDIALIB
+#undef USE_MEDIALIB25
 
 /* Define to use XKB extension */
 #undef HAVE_XKB

config.h.win32.in

@@ -40,7 +40,6 @@
 #endif /* _MSC_VER */
 /* #undef HAVE_XFREE_XINERAMA */
 /* #undef HAVE_XINERAMA */
-#define HAVE_WINTAB 1
 /* #undef HAVE_XCONVERTCASE */
 /* #undef HAVE_XFT */
 
@@ -89,7 +88,7 @@
 #define ENABLE_NLS 1
 
 /* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "UNUSED"
+#define GTK_LOCALEDIR "UNUSED/share/locale"
 
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1

configure.in

@@ -11,11 +11,11 @@ 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], [10])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_minor_version], [12])
+m4_define([gtk_micro_version], [5])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [3])
+m4_define([gtk_interface_age], [5])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 # This is the X.Y used in -lgtk-FOO-X.Y
@@ -31,8 +31,8 @@ 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.12.0])
-m4_define([pango_required_version], [1.12.0])
+m4_define([glib_required_version], [2.13.5])
+m4_define([pango_required_version], [1.17.3])
 m4_define([atk_required_version], [1.9.0])
 m4_define([cairo_required_version], [1.2.0])
 
@@ -135,6 +135,24 @@ dnl Initialize libtool
 AC_PROG_CC
 AM_DISABLE_STATIC
 
+dnl 
+dnl Check for a working C++ compiler, but do not bail out, if none is found.
+dnl We use this for an automated test for C++ header correctness.
+dnl 
+AC_CHECK_PROGS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
+AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
+
+gtk_save_cxxflags="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -x objective-c++"
+AC_TRY_COMPILE([@interface Foo @end],,OBJC=yes,OBJC=no)
+AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" == "yes")
+CXXFLAGS="$gtk_save_cxxflags"
+AC_LANG_RESTORE
+
 if test "$os_win32" = "yes"; then
   if test x$enable_static = xyes -o x$enable_static = x; then
     AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
@@ -199,6 +217,10 @@ AC_ARG_ENABLE(xkb,
               [AC_HELP_STRING([--enable-xkb],
                               [support XKB [default=maybe]])],,
               [enable_xkb="maybe"])
+AC_ARG_ENABLE(xinerama,
+              [AC_HELP_STRING([--enable-xinerama],
+	                      [support xinerama extension if available [default=yes]])],,
+              [enable_xinerama="yes"])
 AC_ARG_ENABLE(rebuilds,
               [AC_HELP_STRING([--disable-rebuilds],
                               [disable all source autogeneration rules])],,
@@ -211,26 +233,19 @@ AC_ARG_ENABLE(visibility,
 AC_ARG_WITH(xinput,
             [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
 
-AC_ARG_WITH(wintab,
-            [AC_HELP_STRING([--with-wintab=DIRECTORY],
-                            [use Wintab API with win32 backend])])
-AC_ARG_WITH(ie55,
-            [AC_HELP_STRING([--with-ie55=DIRECTORY],
-                            [IE5.5 libs and headers (for Active IMM)])])
-
 if test "$platform_win32" = yes; then
   gdktarget=win32
 else
   gdktarget=x11
 fi
 
-AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/linux-fb/win32/quartz/directfb]] select non-default GDK target],
+AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
 	gdktarget=$with_gdktarget)
 
 AC_SUBST(gdktarget)
 case $gdktarget in
-  x11|linux-fb|win32|quartz|directfb) ;;
-  *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb, quartz, directfb or win32.]);;
+  x11|win32|quartz|directfb) ;;
+  *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
 esac
 
 gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
@@ -239,19 +254,9 @@ gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
 AC_SUBST(gdktargetlib)
 AC_SUBST(gtktargetlib)
 
-AC_ARG_ENABLE(shadowfb,
-              [AC_HELP_STRING([--disable-shadowfb],
-                              [disable shadowfb support for linux-fb])],,
-              [enable_shadowfb=yes])
-
-AC_ARG_ENABLE(fbmanager,
-              [AC_HELP_STRING([--enable-fbmanager],
-                              [enable framebuffer manager support (GtkFB)])],,
-              enable_fbmanager=no)
-	
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
+  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" 
 else
   if test "x$enable_debug" = "xno"; then
     GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
@@ -260,6 +265,7 @@ else
   fi
 fi
 
+
 if test "x$enable_visibility" = "xno"; then
   GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
 fi
@@ -370,7 +376,8 @@ AC_ARG_ENABLE(explicit-deps,
 AC_MSG_CHECKING([Whether to write dependencies into .pc files])
 case $enable_explicit_deps in
   auto)
-    deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh`
+    export SED
+    deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
       enable_explicit_deps=yes  
     else
@@ -402,7 +409,8 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-AC_CHECK_FUNCS(lstat mkstemp flockfile)
+AC_CHECK_FUNCS(lstat mkstemp flockfile getc_unlocked)
+AC_CHECK_FUNCS(localtime_r)
 
 # _NL_TIME_FIRST_WEEKDAY is an enum and not a define
 AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
@@ -469,7 +477,7 @@ fi
 # sure that both po/ and po-properties/ have .po files that correspond
 # to your language.  If you only add one to po/, the build will break
 # in po-properties/.
-ALL_LINGUAS="af am ar az az_IR be bg bn bn_IN br bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu hy ia id is it ja ka ko ku li lt lv mi mk ml mn mr ms nb ne nl nn nso or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sr@ije sv ta te th tk tr tt uk ur uz uz@Latn vi wa xh yi zh_CN zh_HK zh_TW"
+ALL_LINGUAS="af am ang ar as az az_IR be be@latin bg bn bn_IN br bs ca cs cy da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu hy ia id io is it ja ka ko ku li lt lv mi mk ml mn mr ms nb ne nl nn nso oc or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sr@ije sv ta te th tk tr tt uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
 AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
@@ -570,72 +578,18 @@ LIBS=$gtk_save_LIBS
 AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
 AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
 AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
+AC_CHECK_HEADERS(ftw.h, AC_DEFINE(HAVE_FTW_H))
 
-if test "${with_ie55+set}" = set && test $with_ie55 != no; then
-  AC_MSG_CHECKING([for dimm.h])
-  saved_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -idirafter $with_ie55/Include"
-  AC_TRY_COMPILE([/* The w32api imm.h clashes a bit with the IE5.5 dimm.h */
-#ifdef __GNUC__
-#define IMEMENUITEMINFOA hidden_IMEMENUITEMINFOA
-#define IMEMENUITEMINFOW hidden_IMEMENUITEMINFOW
-#endif
-#include <windows.h>
-#include <objbase.h>
-#include <imm.h>
-#ifdef __GNUC__
-#undef IMEMENUITEMINFOA
-#undef IMEMENUITEMINFOW
-#endif
-#include <dimm.h>
-],
-   [],
-   [AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING([for IE55 uuid.lib])
-    if test -f $with_ie55/Lib/uuid.lib ; then
-      AC_MSG_RESULT(yes)
-      have_ie55=yes
-      AC_DEFINE(HAVE_DIMM_H)
-      IE55_UUID_LIB="$with_ie55/Lib/uuid.lib"
-      AC_SUBST(IE55_UUID_LIB)
-    else
-      AC_MSG_RESULT(no)
-      CFLAGS="$saved_CFLAGS"
-      have_ie55=no
-    fi
-    ],
-   [AC_MSG_RESULT(no)
-    CFLAGS="$saved_CFLAGS"
-    have_ie55=no])
+AC_MSG_CHECKING([for GNU ftw extensions])
+AC_TRY_COMPILE([#define _XOPEN_SOURCE 500
+#define _GNU_SOURCE
+#include <ftw.h>], [int flags = FTW_ACTIONRETVAL;], gtk_ok=yes, gtk_ok=no)
+if test $gtk_ok = yes; then
+    AC_MSG_RESULT([yes])
+    AC_DEFINE(HAVE_GNU_FTW,1,[Have GNU ftw])
+else
+    AC_MSG_RESULT([no])
 fi
-AM_CONDITIONAL(HAVE_IE55, test x$have_ie55 = xyes)
-
-if test "${with_wintab+set}" = set && test $with_wintab != no; then
-  AC_MSG_CHECKING([for wintab.h])
-  saved_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -I$with_wintab/include"
-  AC_TRY_COMPILE([#include <windows.h>
-#include <wintab.h>], 
-   [],
-   [AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING([for wntab32x.lib])
-    if test -f $with_wintab/lib/i386/wntab32x.lib ; then
-      AC_MSG_RESULT(yes)
-      have_wintab=yes
-      AC_DEFINE(HAVE_WINTAB)
-      WINTAB_LIB="$with_wintab/lib/i386/wntab32x.lib"
-      AC_SUBST(WINTAB_LIB)
-    else
-      AC_MSG_RESULT(no)
-      CFLAGS="$saved_cflags"
-      have_wintab=no
-    fi
-    ],
-   [AC_MSG_RESULT(no)
-    CFLAGS="$saved_cflags"
-    have_wintab=no])
-fi
-AM_CONDITIONAL(HAVE_WINTAB, test x$have_wintab = xyes)
 
 saved_cflags="$CFLAGS"
 saved_ldflags="$LDFLAGS"
@@ -727,6 +681,10 @@ if test $gtk_uxtheme_h = yes; then
 fi
 AC_MSG_RESULT($gtk_uxtheme_h)
 
+# Checks for gdkspawn
+AC_CHECK_HEADERS(crt_externs.h)
+AC_CHECK_FUNCS(_NSGetEnviron)
+
 
 ##################################################
 # Checks for gdk-pixbuf
@@ -802,7 +760,7 @@ AC_ARG_WITH(libtiff,
 
 dnl Test for libtiff
   if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
-    AC_CHECK_LIB(tiff, TIFFReadScanline,
+    AC_CHECK_LIB(tiff, TIFFReadRGBAImageOriented,
       [AC_CHECK_HEADER(tiffio.h,
         TIFF='tiff'; LIBTIFF='-ltiff',
         AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
@@ -914,14 +872,13 @@ AC_MSG_CHECKING(pixbuf loaders to build)
 dnl due to an autoconf bug, commas in the first arg to
 dnl AC_HELP_STRING cause problems.
 dnl AC_HELP_STRING([--with-included-loaders=LOADER1 LOADER2 ...],
-dnl                [build the specified loaders into gdk-pixbuf (only used if module loading disabled)])
+dnl                [build the specified loaders into gdk-pixbuf])
 AC_ARG_WITH(included_loaders,
 [  --with-included-loaders=LOADER1,LOADER2,...
-                          build the specified loaders into gdk-pixbuf (only
-                          used if module loading disabled)])
+                          build the specified loaders into gdk-pixbuf])
 
 if $dynworks; then 
-        :
+   :
 else
    ## if the option was specified, leave it; otherwise disable included loaders
    if test x$with_included_loaders = xno; then
@@ -929,7 +886,7 @@ else
    fi
 fi
 
-all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,tga,pcx"
+all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,xbm,tga,pcx"
 included_loaders=""
 # If no loaders specified, include all
 if test "x$with_included_loaders" = xyes ; then
@@ -951,13 +908,29 @@ for loader in $included_loaders; do
    AC_MSG_ERROR([the specified loader $loader does not exist])
  fi
 
- INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libpixbufloader-static-$loader.la"
+ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
  INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader"
+ eval INCLUDE_$loader=yes
 done
 IFS="$gtk_save_ifs"
 AC_SUBST(INCLUDED_LOADER_OBJ)
 AC_SUBST(INCLUDED_LOADER_DEFINE)
 
+AM_CONDITIONAL(INCLUDE_PNG, [test x"$INCLUDE_png" = xyes])
+AM_CONDITIONAL(INCLUDE_BMP, [test x"$INCLUDE_bmp" = xyes])
+AM_CONDITIONAL(INCLUDE_WBMP, [test x"$INCLUDE_wbmp" = xyes])
+AM_CONDITIONAL(INCLUDE_GIF, [test x"$INCLUDE_gif" = xyes])
+AM_CONDITIONAL(INCLUDE_ICO, [test x"$INCLUDE_ico" = xyes])
+AM_CONDITIONAL(INCLUDE_ANI, [test x"$INCLUDE_ani" = xyes])
+AM_CONDITIONAL(INCLUDE_JPEG, [test x"$INCLUDE_jpeg" = xyes])
+AM_CONDITIONAL(INCLUDE_PNM, [test x"$INCLUDE_pnm" = xyes])
+AM_CONDITIONAL(INCLUDE_RAS, [test x"$INCLUDE_ras" = xyes])
+AM_CONDITIONAL(INCLUDE_TIFF, [test x"$INCLUDE_tiff" = xyes])
+AM_CONDITIONAL(INCLUDE_XPM, [test x"$INCLUDE_xpm" = xyes])
+AM_CONDITIONAL(INCLUDE_XBM, [test x"$INCLUDE_xbm" = xyes])
+AM_CONDITIONAL(INCLUDE_TGA, [test x"$INCLUDE_tga" = xyes])
+AM_CONDITIONAL(INCLUDE_PCX, [test x"$INCLUDE_pcx" = xyes])
+
 AC_HEADER_SYS_WAIT
 
 AC_TYPE_SIGNAL
@@ -981,6 +954,32 @@ else
   STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
 fi
 
+# Checks to see whether we should include mediaLib
+# support.
+#
+AC_CHECK_HEADER(sys/systeminfo.h, AC_DEFINE(HAVE_SYS_SYSTEMINFO_H))
+AC_CHECK_HEADER(sys/sysinfo.h, AC_DEFINE(HAVE_SYS_SYSINFO_H))
+
+AC_MSG_CHECKING(for mediaLib 2.3)
+use_mlib25=no
+# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
+# patch requires.
+AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no)
+if test $use_mlib = yes; then
+    AC_DEFINE(USE_MEDIALIB)
+    MEDIA_LIB=-lmlib
+
+    AC_MSG_CHECKING(for mediaLib 2.5)
+    # Check for a mediaLib 2.5 function since that is what is needed for
+    # gdk_rgb_convert integration.
+    AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no)
+    if test $use_mlib25 = yes; then
+        AC_DEFINE(USE_MEDIALIB25)
+    fi
+fi
+AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes)
+AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
+
 # Checks to see if we should compile in MMX support (there will be
 # a runtime test when the code is actually run to see if it should
 # be used - this just checks if we can compile it.)
@@ -1032,7 +1031,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
 
 if test $cross_compiling = yes; then
   AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
-  if test x$GDK_PIXBUF_CSOURCE = xno; then
+  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+  if test x$GTK_UPDATE_ICON_CACHE = xno; then
     REBUILD_PNGS=#
   fi
 fi
@@ -1042,24 +1042,17 @@ if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
      AC_MSG_ERROR([
 *** gtkbuiltincache.h is not in the tree, and cannot be built
 *** because you don't have libpng, or (when cross-compiling) you 
-*** don't have a prebuilt gdk-pixbuf-csource on the host system.])
+*** don't have a prebuilt gtk-update-icon-cache on the build system.])
 fi
 
 AC_SUBST(REBUILD_PNGS)
 
 GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0"
-GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
+GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
 GDK_PIXBUF_EXTRA_CFLAGS= 
 GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
 
-AC_SUBST(GDK_PIXBUF_PACKAGES)
-AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
-AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
-AC_SUBST(GDK_PIXBUF_DEP_LIBS)
-AC_SUBST(GDK_PIXBUF_DEP_CFLAGS)
-
-
 ########################################
 # Windowing system checks
 ########################################
@@ -1243,12 +1236,12 @@ if test "x$gdktarget" = "xx11"; then
     fi
   fi
 
-  # Check for Xinerama extension (Solaris impl or Xfree impl)
-
-  gtk_save_cppflags="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $x_cflags"
+  if test "x$enable_xinerama" = "xyes"; then
+    # Check for Xinerama extension (Solaris impl or Xfree impl)
+    gtk_save_cppflags="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $x_cflags"
   
-  case "$host" in
+    case "$host" in
       *-*-solaris*)
           # Check for solaris
 	  AC_MSG_CHECKING(for Xinerama support on Solaris)
@@ -1291,8 +1284,9 @@ if test "x$gdktarget" = "xx11"; then
             AC_MSG_RESULT(no)
          fi
          ;;
-  esac
-
+    esac
+  fi
+  
   # set up things for XInput
 
   if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
@@ -1343,6 +1337,25 @@ if test "x$gdktarget" = "xx11"; then
     AC_DEFINE(HAVE_XFIXES, 1, Have the XFIXES X extension)
     
     X_PACKAGES="$X_PACKAGES xfixes"
+    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
+  fi
+
+  # Checks for Xcomposite extension
+
+  if $PKG_CONFIG --exists xcomposite ; then
+    AC_DEFINE(HAVE_XCOMPOSITE, 1, Have the XCOMPOSITE X extension)
+
+    X_PACKAGES="$X_PACKAGES xcomposite"
+    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite"
+  fi
+
+  # Checks for Xdamage extension
+
+  if $PKG_CONFIG --exists xdamage ; then
+    AC_DEFINE(HAVE_XDAMAGE, 1, Have the XDAMAGE X extension)
+
+    X_PACKAGES="$X_PACKAGES xdamage"
+    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage"
   fi
 
   if $have_base_x_pc ; then
@@ -1362,14 +1375,7 @@ else
 fi
 
 if test "x$gdktarget" = "xwin32"; then
-  # We start off with the libraries from Pango
-
-  if test x$have_wintab = xyes; then
-    GDK_WIN32_EXTRA_CFLAGS="-I $with_wintab/include"
-    AC_SUBST(GDK_WIN32_EXTRA_CFLAGS)
-  fi
-
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -Wl,-luuid"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
   AM_CONDITIONAL(USE_WIN32, true)
 else
   AM_CONDITIONAL(USE_WIN32, false)
@@ -1391,36 +1397,19 @@ AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_CFLAGS)
 AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
 AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
-if test "x$gdktarget" = "xlinux-fb"; then
-  if test x$enable_shadowfb = xyes ; then
-    AC_DEFINE(ENABLE_SHADOW_FB)
-  fi
-
-  if test x$enable_fbmanager = xyes ; then
-    AC_DEFINE(ENABLE_FB_MANAGER)
-    AM_CONDITIONAL(ENABLE_FB_MANAGER, true)
-  else
-    AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
-  fi
-  
-  AM_CONDITIONAL(USE_LINUX_FB, true)
-else
-  AM_CONDITIONAL(USE_LINUX_FB, false)
-  AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
-fi
-
 if test "x$gdktarget" = "xdirectfb"; then
   DIRECTFB_REQUIRED_VERSION=0.9.24
   AC_MSG_CHECKING(for DirectFB)
 
-  if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then
+  if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
       AC_MSG_RESULT(found)
       GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS"
       GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS"
   else
       AC_MSG_ERROR([
-*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest
-*** version of DirectFB is always available from http://www.directfb.org/.
+*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend 
+*** are required. The latest version of DirectFB is always available 
+*** from http://www.directfb.org/.
   ])
   fi
 
@@ -1529,12 +1518,31 @@ if test x"$os_win32" = xyes; then
   GTK_EXTRA_CFLAGS="$msnative_struct"
 fi
 
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
+PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
+CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
+
+if test $enable_explicit_deps != yes ; then
+  GDK_PIXBUF_EXTRA_LIBS=
+fi
+
+AC_SUBST(GDK_PIXBUF_PACKAGES)
+AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
+AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
+AC_SUBST(GDK_PIXBUF_DEP_LIBS)
+AC_SUBST(GDK_PIXBUF_DEP_CFLAGS)
+
 AC_SUBST(GTK_PACKAGES)
 AC_SUBST(GTK_EXTRA_LIBS)
 AC_SUBST(GTK_EXTRA_CFLAGS)
 AC_SUBST(GTK_DEP_LIBS)
 AC_SUBST(GTK_DEP_CFLAGS)
 
+AC_SUBST(GLIB_PREFIX)
+AC_SUBST(ATK_PREFIX)
+AC_SUBST(PANGO_PREFIX)
+AC_SUBST(CAIRO_PREFIX)
 
 AC_SUBST(GTK_DEBUG_FLAGS)
 AC_SUBST(GTK_XIM_FLAGS)
@@ -1545,12 +1553,12 @@ AC_SUBST(GTK_XIM_FLAGS)
 
 AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
 if test "x$CUPS_CONFIG" != "xno"; then
-  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-  CUPS_LIBS=`cups-config --libs`
+  CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+  CUPS_LIBS=`$CUPS_CONFIG --libs`
 
-  CUPS_API_VERSION=`cups-config --api-version`
-  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
-  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
+  CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
+  CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
+  CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
 
   if test $CUPS_API_MAJOR -gt 1 -o \
           $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
@@ -1561,9 +1569,25 @@ if test "x$CUPS_CONFIG" != "xno"; then
   AC_SUBST(CUPS_API_MINOR)
   AC_SUBST(CUPS_CFLAGS)
   AC_SUBST(CUPS_LIBS)
+
+  AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
 fi
 AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
 
+gtk_save_cflags="$CFLAGS"
+CFLAGS="$CUPS_CFLAGS"
+AC_TRY_COMPILE([#include <cups/http.h>],
+               [http_t http; char *s = http.authstring;],
+               [AC_DEFINE(HAVE_HTTP_AUTHSTRING,[],[Define if cups http_t authstring field is accessible])],)
+CFLAGS="$gtk_save_cflags"
+
+AC_SUBST(HAVE_HTTP_AUTHSTRING)
+
+gtk_save_libs="$LIBS"
+LIBS="$CUPS_LIBS"
+AC_CHECK_FUNCS(httpGetAuthString)
+LIBS="$gtk_save_libs"
+
 gtk_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
 			  
@@ -1580,6 +1604,13 @@ fi
 CPPFLAGS="$gtk_save_cppflags"
      
 			  	
+AC_ARG_ENABLE(test-print-backend,
+              [AC_HELP_STRING([--enable-test-print-backend],
+                              [build test print backend])],,
+              [enable_test_print_backend=no])
+AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
+
+
 ################################################################
 # Strip -export-dynamic from the link lines of various libraries
 ################################################################
@@ -1593,6 +1624,7 @@ CPPFLAGS="$gtk_save_cppflags"
 #
 # We are using gmodule-no-export now, but I'm leaving the stripping
 # code in place for now, since pango and atk still require gmodule.
+export SED
 export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
 if test -n "$export_dynamic"; then
   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
@@ -1606,7 +1638,7 @@ fi
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
-GTK_DOC_CHECK([1.4])
+GTK_DOC_CHECK([1.6])
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
@@ -1684,10 +1716,6 @@ if test "x$gdktarget" = "xx11" ; then
 elif test "x$gdktarget" = "xwin32" ; then
   gdk_windowing='
 #define GDK_WINDOWING_WIN32'
-elif test "x$gdktarget" = "xlinux-fb" ; then
-  gdk_windowing='
-#define GDK_WINDOWING_FB
-#define GDK_NATIVE_WINDOW_POINTER'
 elif test "x$gdktarget" = "xquartz" ; then
   gdk_windowing='
 #define GDK_WINDOWING_QUARTZ'
@@ -1750,7 +1778,6 @@ gdk/x11/Makefile
 gdk/win32/Makefile
 gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
-gdk/linux-fb/Makefile
 gdk/quartz/Makefile
 gdk/directfb/Makefile
 gtk/Makefile
@@ -1770,6 +1797,7 @@ modules/printbackends/Makefile
 modules/printbackends/cups/Makefile
 modules/printbackends/lpr/Makefile
 modules/printbackends/file/Makefile
+modules/printbackends/test/Makefile
 perf/Makefile
 contrib/Makefile
 contrib/gdk-pixbuf-xlib/Makefile
@@ -1780,9 +1808,3 @@ AC_OUTPUT
 
 echo "configuration:
         target: $gdktarget"
-
-if test "x$gdktarget" = "xlinux-fb"; then
-  echo "Warning: The linux-fb GDK target is unmaintained"
-  echo "         and may not work or even compile"
-fi
-

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,3 +1,60 @@
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.4 ===
+
+2007-12-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.3 ===
+
+2007-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.2 ===
+
+2007-10-16  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.12.1 ===
+
+2007-09-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.0 ===
+
+2007-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.6 ===
+
+2007-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.5 ===
+
+2007-06-19  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.11.4 ===
+
+2007-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.3 ===
+
+2007-06-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.2 ===
+
+2007-06-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.1 ===
+
+2007-05-24   Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.0 ===
+
+2006-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-xlib.c: Apply a cleanup patch by
+	Kjartan	Maraas  (#341812)
+
 2006-08-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.10.2 ===

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

@@ -152,7 +152,6 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int xx, yy;
 	int width, height;
 	int bpl;
-	guint8 *s;
 	register guint8 data;
 	guint8 *o;
 	guint8 *srow = image->data, *orow = pixels;
@@ -167,7 +166,6 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	bpl = image->bytes_per_line;
 
 	for (yy = 0; yy < height; yy++) {
-		s = srow;
 		o = orow;
 
 		for (xx = 0; xx < width; xx ++) {
@@ -191,7 +189,6 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int xx, yy;
 	int width, height;
 	int bpl;
-	guint8 *s;
 	register guint8 data;
 	guint8 *o;
 	guint8 *srow = image->data, *orow = pixels;
@@ -221,7 +218,6 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	}
 
 	for (yy = 0; yy < height; yy++) {
-		s = srow;
 		o = orow;
 
 		for (xx = 0; xx < width; xx ++) {
@@ -988,7 +984,6 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 	int width, height;
 	int bpl;
 	guint8 *srow = image->data, *orow = pixels;
-	guint8 *s;
 	guint8 *o;
 	guint32 pixel;
 	Visual *v;
@@ -1011,7 +1006,6 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 		 red_prec, green_prec, blue_prec));
 
 	for (yy = 0; yy < height; yy++) {
-		s = srow;
 		o = orow;
 		for (xx = 0; xx < width; xx++) {
 			pixel = XGetPixel (image, xx, yy);

demos/gtk-demo/Makefile.am

@@ -7,6 +7,7 @@ democodedir=$(datadir)/gtk-2.0/demo
 demos =						\
 	appwindow.c				\
 	assistant.c				\
+	builder.c				\
 	button_box.c				\
 	changedisplay.c				\
 	clipboard.c				\
@@ -31,6 +32,7 @@ demos =						\
 	sizegroup.c				\
 	stock_browser.c				\
 	textview.c				\
+	textscroll.c				\
 	tree_store.c				\
 	ui_manager.c
 
@@ -59,7 +61,8 @@ bin_PROGRAMS = gtk-demo
 BUILT_SOURCES = demos.h
 
 EXTRA_DIST = 		\
-	$(IMAGEFILES)
+	$(IMAGEFILES)	\
+	demo.ui
 
 demos.h: @REBUILD@ $(demos) geninclude.pl
 	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
@@ -72,6 +75,7 @@ gtk_demo_SOURCES = 		\
 
 gtk_demo_DEPENDENCIES = $(DEPS)
 gtk_demo_LDADD = $(LDADDS)
+gtk_demo_LDFLAGS = -export-dynamic
 
 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -88,6 +92,6 @@ IMAGEFILES=	alphatest.png		\
 		gnu-keys.png		\
 		gtk-logo-rgb.gif		
 
-democode_DATA = $(demos) $(IMAGEFILES)
+democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 
 DISTCLEANFILES = demos.h

demos/gtk-demo/appwindow.c

@@ -141,6 +141,7 @@ about_cb (GtkAction *action,
 			 "authors", authors,
 			 "documenters", documentors,
 			 "logo", transparent,
+                         "title", "About GTK+ Code Demos",
 			 NULL);
 
   g_object_unref (transparent);
@@ -156,7 +157,7 @@ typedef struct
   GtkActionClass parent_class;
 } ToolMenuActionClass;
 
-G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION);
+G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION)
 
 static void
 tool_menu_action_class_init (ToolMenuActionClass *class)
@@ -329,7 +330,7 @@ register_stock_icons (void)
       factory = gtk_icon_factory_new ();
       gtk_icon_factory_add_default (factory);
 
-      /* demo_find_file() looks in the the current directory first,
+      /* demo_find_file() looks in the current directory first,
        * so you can run gtk-demo without installing GTK, then looks
        * in the location where the file is installed.
        */
@@ -467,6 +468,7 @@ do_appwindow (GtkWidget *do_widget)
 				  "stock-id", GTK_STOCK_OPEN,
 				  NULL);
       gtk_action_group_add_action (action_group, open_action);
+      g_object_unref (open_action);
       gtk_action_group_add_actions (action_group, 
 				    entries, n_entries, 
 				    window);

demos/gtk-demo/builder.c

@@ -0,0 +1,64 @@
+/* Builder
+ *
+ * Demonstrates an interface loaded from a XML description.
+ */
+
+#include <gtk/gtk.h>
+#include "demo-common.h"
+
+void
+quit_activate (GtkAction *action)
+{
+}
+
+void
+about_activate (GtkAction *action)
+{
+  GtkWidget *about_dlg;
+
+  about_dlg = gtk_about_dialog_new ();
+  gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (about_dlg), "GtkBuilder demo");
+  gtk_dialog_run (GTK_DIALOG (about_dlg));
+  gtk_widget_destroy (about_dlg);
+}
+
+GtkWidget *
+do_builder (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkBuilder *builder;
+  GError *err = NULL;
+  gchar *filename;
+  
+  if (!window)
+    {
+      builder = gtk_builder_new ();
+      filename = demo_find_file ("demo.ui", NULL);
+      gtk_builder_add_from_file (builder, filename, &err);
+      g_free (filename);
+      if (err)
+	{
+	  g_error ("ERROR: %s\n", err->message);
+	  return NULL;
+	}
+      gtk_builder_connect_signals (builder, NULL);
+      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (gtk_widget_destroyed), &window);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show_all (window);
+    }
+  else
+    {	 
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+
+  return window;
+}

demos/gtk-demo/changedisplay.c

@@ -300,6 +300,8 @@ display_changed_cb (GtkTreeSelection  *selection,
   GtkTreeModel *model;
   GtkTreeIter iter;
 
+  if (info->current_display)
+    g_object_unref (info->current_display);
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     gtk_tree_model_get (model, &iter,
 			DISPLAY_COLUMN_DISPLAY, &info->current_display,
@@ -320,6 +322,8 @@ screen_changed_cb (GtkTreeSelection  *selection,
   GtkTreeModel *model;
   GtkTreeIter iter;
 
+  if (info->current_screen)
+    g_object_unref (info->current_screen);
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     gtk_tree_model_get (model, &iter,
 			SCREEN_COLUMN_SCREEN, &info->current_screen,
@@ -562,6 +566,14 @@ destroy_info (ChangeDisplayInfo *info)
   g_slist_free (tmp_list);
 
   g_object_unref (info->size_group);
+  g_object_unref (info->display_model);
+  g_object_unref (info->screen_model);
+
+  if (info->current_display)
+    g_object_unref (info->current_display);
+  if (info->current_screen)
+    g_object_unref (info->current_screen);
+
   g_free (info);
 }
 

demos/gtk-demo/combobox.c

@@ -74,6 +74,7 @@ create_stock_icon_store (void)
 			      PIXBUF_COL, pixbuf,
 			      TEXT_COL, label,
 			      -1);
+	  g_object_unref (pixbuf);
 	  g_free (label);
 	}
       else
@@ -245,11 +246,87 @@ fill_combo_entry (GtkWidget *entry)
   gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Three");
 }
 
+
+/* A simple validating entry */
+
+#define TYPE_MASK_ENTRY             (mask_entry_get_type ())
+#define MASK_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MASK_ENTRY, MaskEntry))
+#define MASK_ENTRY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TYPE_MASK_ENTRY, MaskEntryClass))
+#define IS_MASK_ENTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MASK_ENTRY))
+#define IS_MASK_ENTRY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TYPE_MASK_ENTRY))
+#define MASK_ENTRY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TYPE_MASK_ENTRY, MaskEntryClass))
+
+
+typedef struct _MaskEntry MaskEntry;
+struct _MaskEntry
+{
+  GtkEntry entry;
+  gchar *mask;
+};
+
+typedef struct _MaskEntryClass MaskEntryClass;
+struct _MaskEntryClass
+{
+  GtkEntryClass parent_class;
+};
+
+
+static void mask_entry_editable_init (GtkEditableClass *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
+			 G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+						mask_entry_editable_init));
+
+
+static void
+mask_entry_set_background (MaskEntry *entry)
+{
+  static const GdkColor error_color = { 0, 65535, 60000, 60000 };
+
+  if (entry->mask)
+    {
+      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
+	{
+	  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &error_color);
+	  return;
+	}
+    }
+
+  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+}
+
+
+static void
+mask_entry_changed (GtkEditable *editable)
+{
+  mask_entry_set_background (MASK_ENTRY (editable));
+}
+
+
+static void
+mask_entry_init (MaskEntry *entry)
+{
+  entry->mask = NULL;
+}
+
+
+static void
+mask_entry_class_init (MaskEntryClass *klass)
+{ }
+
+
+static void
+mask_entry_editable_init (GtkEditableClass *iface)
+{
+  iface->changed = mask_entry_changed;
+}
+
+
 GtkWidget *
 do_combobox (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
-  GtkWidget *vbox, *frame, *box, *combo;
+  GtkWidget *vbox, *frame, *box, *combo, *entry;
   GtkTreeModel *model;
   GtkCellRenderer *renderer;
   GtkTreePath *path;
@@ -342,7 +419,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_tree_path_free (path);
     gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
 
-    /* A GtkComboBoxEntry 
+    /* A GtkComboBoxEntry with validation.
      */
     frame = gtk_frame_new ("Editable");
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
@@ -355,6 +432,12 @@ do_combobox (GtkWidget *do_widget)
     fill_combo_entry (combo);
     gtk_container_add (GTK_CONTAINER (box), combo);
     
+    entry = g_object_new (TYPE_MASK_ENTRY, NULL);
+    MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
+     
+    gtk_container_remove (GTK_CONTAINER (combo), GTK_BIN (combo)->child);
+    gtk_container_add (GTK_CONTAINER (combo), entry);
+  
   }
 
   if (!GTK_WIDGET_VISIBLE (window))

demos/gtk-demo/demo.ui

@@ -0,0 +1,232 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<interface>
+    <object class="GtkListStore" id="liststore1">
+      <columns>
+        <column type="gchararray"/>
+        <column type="gchararray"/>
+        <column type="gint"/>
+        <column type="gchararray"/>
+      </columns>
+      <data>
+        <row>
+          <col id="0">John</col>
+          <col id="1">Doe</col>
+          <col id="2">25</col>
+          <col id="3">This is the John Doe row</col>
+        </row>
+        <row>
+          <col id="0">Mary</col>
+          <col id="1">Dole</col>
+          <col id="2">50</col>
+          <col id="3">This is the Mary Dole row</col>
+        </row>
+      </data>
+    </object>
+    <object class="GtkUIManager" id="uimanager">
+        <child>
+            <object class="GtkActionGroup" id="DefaultActions">
+                <child>
+                    <object class="GtkAction" id="Copy">
+                        <property name="name">Copy</property>
+                        <property name="tooltip" translatable="yes">Copy selected object into the clipboard</property>
+                        <property name="stock_id">gtk-copy</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="Cut">
+                        <property name="name">Cut</property>
+                        <property name="tooltip" translatable="yes">Cut selected object into the clipboard</property>
+                        <property name="stock_id">gtk-cut</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="EditMenu">
+                        <property name="name">EditMenu</property>
+                        <property name="label" translatable="yes">_Edit</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="FileMenu">
+                        <property name="name">FileMenu</property>
+                        <property name="label" translatable="yes">_File</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="New">
+                        <property name="name">New</property>
+                        <property name="tooltip" translatable="yes">Create a new file</property>
+                        <property name="stock_id">gtk-new</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="Open">
+                        <property name="name">Open</property>
+                        <property name="tooltip" translatable="yes">Open a file</property>
+                        <property name="stock_id">gtk-open</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="Paste">
+                        <property name="name">Paste</property>
+                        <property name="tooltip" translatable="yes">Paste object from the Clipboard</property>
+                        <property name="stock_id">gtk-paste</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="Quit">
+                        <property name="name">Quit</property>
+                        <property name="tooltip" translatable="yes">Quit the program</property>
+                        <property name="stock_id">gtk-quit</property>
+                        <signal handler="quit_activate" name="activate"/>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="Save">
+                        <property name="name">Save</property>
+                        <property name="is_important">True</property>
+                        <property name="tooltip" translatable="yes">Save a file</property>
+                        <property name="stock_id">gtk-save</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="SaveAs">
+                        <property name="name">SaveAs</property>
+                        <property name="tooltip" translatable="yes">Save with a different name</property>
+                        <property name="stock_id">gtk-save-as</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="HelpMenu">
+                        <property name="name">HelpMenu</property>
+                        <property name="label" translatable="yes">_Help</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkAction" id="About">
+                        <property name="name">About</property>
+                        <property name="stock_id">gtk-about</property>
+                        <signal handler="about_activate" name="activate"/>
+                    </object>
+                    <accelerator key="F1"/>
+                </child>
+            </object>
+        </child>
+        <ui>
+          <menubar name="menubar1">
+            <menu action="FileMenu" name="FileMenu">
+              <menuitem action="New" name="New"/>
+              <menuitem action="Open" name="Open"/>
+              <menuitem action="Save" name="Save"/>
+              <menuitem action="SaveAs" name="SaveAs"/>
+              <separator/>
+              <menuitem action="Quit" name="Quit"/>
+            </menu>
+            <menu action="EditMenu">
+              <menuitem action="Copy" name="Copy"/>
+              <menuitem action="Cut" name="Cut"/>
+              <menuitem action="Paste" name="Paste"/>
+            </menu>
+            <menu action="HelpMenu" name="HelpMenu">
+              <menuitem action="About" name="About"/>
+            </menu>
+          </menubar>
+          <toolbar name="toolbar1">
+            <toolitem action="New" name="New"/>
+            <toolitem action="Open" name="Open"/>
+            <toolitem action="Save" name="Save"/>
+            <separator/>
+            <toolitem action="Copy" name="Copy"/>
+            <toolitem action="Cut" name="Cut"/>
+            <toolitem action="Paste" name="Paste"/>
+          </toolbar>
+        </ui>
+    </object>
+
+    <object class="GtkWindow" id="window1">
+        <property name="default_height">250</property>
+        <property name="default_width">440</property>
+        <property name="title">builder</property>
+        <child>
+            <object class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <child>
+                    <object constructor="uimanager" class="GtkMenuBar" id="menubar1">
+                        <property name="visible">True</property>
+                    </object>
+                    <packing>
+                        <property name="expand">False</property>
+                    </packing>
+                </child>
+                <child>
+                    <object constructor="uimanager" class="GtkToolbar" id="toolbar1">
+                        <property name="visible">True</property>
+                    </object>
+                    <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                    </packing>
+                </child>
+                <child>
+                    <object class="GtkScrolledWindow" id="scrolledwindow1">
+                      <property name="hscrollbar_policy">automatic</property>
+                      <property name="shadow_type">in</property>
+                      <property name="visible">True</property>
+                      <property name="vscrollbar_policy">automatic</property>
+                      <child>
+                        <object class="GtkTreeView" id="treeview1">
+                          <property name="visible">True</property>
+                          <property name="model">liststore1</property>
+                          <property name="tooltip-column">3</property>
+                          <child>
+                            <object class="GtkTreeViewColumn" id="column1">
+                              <property name="title">Name</property>
+                              <child>
+                                <object class="GtkCellRendererText" id="renderer1"/>
+                                <attributes>
+                                  <attribute name="text">0</attribute>
+                                </attributes>
+                              </child>
+                            </object>
+                          </child>
+                          <child>
+                            <object class="GtkTreeViewColumn" id="column2">
+                              <property name="title">Surname</property>
+                              <child>
+                                <object class="GtkCellRendererText" id="renderer2"/>
+                                <attributes>
+                                  <attribute name="text">1</attribute>
+                                </attributes>
+                              </child>
+                            </object>
+                          </child>
+                          <child>
+                            <object class="GtkTreeViewColumn" id="column3">
+                              <property name="title">Age</property>
+                              <child>
+                                <object class="GtkCellRendererText" id="renderer3"/>
+                                <attributes>
+                                  <attribute name="text">2</attribute>
+                                </attributes>
+                              </child>
+                            </object>
+                          </child>
+                        </object>
+                      </child>
+                    </object>
+                    <packing>
+                        <property name="position">2</property>
+                    </packing>
+                </child>
+                <child>
+                    <object class="GtkStatusbar" id="statusbar1">
+                        <property name="visible">True</property>
+                    </object>
+                    <packing>
+                        <property name="expand">False</property>
+                        <property name="position">3</property>
+                    </packing>
+                </child>
+            </object>
+        </child>
+    </object>
+</interface>

demos/gtk-demo/drawingarea.c

@@ -218,6 +218,16 @@ checkerboard_expose (GtkWidget	    *da,
   return TRUE;
 }
 
+static void
+close_window (void)
+{
+  window = NULL;
+
+  if (pixmap)
+    g_object_unref (pixmap);
+  pixmap = NULL;
+}
+
 GtkWidget *
 do_drawingarea (GtkWidget *do_widget)
 {
@@ -233,7 +243,7 @@ do_drawingarea (GtkWidget *do_widget)
 			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
 
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
@@ -309,14 +319,9 @@ do_drawingarea (GtkWidget *do_widget)
     }
 
   if (!GTK_WIDGET_VISIBLE (window))
-    {
       gtk_widget_show_all (window);
-    }
   else
-    {
       gtk_widget_destroy (window);
-      window = NULL;
-    }
 
   return window;
 }

demos/gtk-demo/hypertext.c

@@ -165,9 +165,9 @@ event_after (GtkWidget *text_view,
   return FALSE;
 }
 
-gboolean hovering_over_link = FALSE;
-GdkCursor *hand_cursor = NULL;
-GdkCursor *regular_cursor = NULL;
+static gboolean hovering_over_link = FALSE;
+static GdkCursor *hand_cursor = NULL;
+static GdkCursor *regular_cursor = NULL;
 
 /* Looks at all tags covering the position (x, y) in the text view, 
  * and if one of them is a link, change the cursor to the "hands" cursor
@@ -179,12 +179,9 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
                            gint            y)
 {
   GSList *tags = NULL, *tagp = NULL;
-  GtkTextBuffer *buffer;
   GtkTextIter iter;
   gboolean hovering = FALSE;
 
-  buffer = gtk_text_view_get_buffer (text_view);
-
   gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
   
   tags = gtk_text_iter_get_tags (&iter);

demos/gtk-demo/iconview.c

@@ -37,7 +37,7 @@ load_pixbufs (GError **error)
   if (file_pixbuf)
     return TRUE; /* already loaded earlier */
 
-  /* demo_find_file() looks in the the current directory first,
+  /* demo_find_file() looks in the current directory first,
    * so you can run gtk-demo without installing GTK, then looks
    * in the location where the file is installed.
    */
@@ -243,6 +243,18 @@ home_clicked (GtkToolItem *item,
 			    TRUE);
 }
 
+static void close_window(void)
+{
+  gtk_widget_destroy (window);
+  window = NULL;
+
+  g_object_unref (file_pixbuf);
+  file_pixbuf = NULL;
+
+  g_object_unref (folder_pixbuf);
+  folder_pixbuf = NULL;
+}
+
 GtkWidget *
 do_iconview (GtkWidget *do_widget)
 {
@@ -258,7 +270,7 @@ do_iconview (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");
 
       g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (close_window), NULL);
 
       error = NULL;
       if (!load_pixbufs (&error))

demos/gtk-demo/images.c

@@ -184,7 +184,7 @@ progressive_timeout (gpointer data)
       gchar *error_message = NULL;
       GError *error = NULL; 
 
-      /* demo_find_file() looks in the the current directory first,
+      /* demo_find_file() looks in the current directory first,
        * so you can run gtk-demo without installing GTK, then looks
        * in the location where the file is installed.
        */
@@ -255,7 +255,7 @@ start_progressive_loading (GtkWidget *image)
    * The timeout simply simulates a slow data source by inserting
    * pauses in the reading process.
    */
-  load_timeout = g_timeout_add (150,
+  load_timeout = gdk_threads_add_timeout (150,
 				progressive_timeout,
 				image);
 }
@@ -352,7 +352,7 @@ do_images (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (align), frame);
       gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
 
-      /* demo_find_file() looks in the the current directory first,
+      /* demo_find_file() looks in the current directory first,
        * so you can run gtk-demo without installing GTK, then looks
        * in the location where the file is installed.
        */

demos/gtk-demo/main.c

@@ -575,6 +575,8 @@ load_file (const gchar *filename)
 	}
     }
 
+  fclose (file);
+  
   fontify ();
 
   g_string_free (buffer, TRUE);
@@ -782,6 +784,8 @@ create_tree (void)
 
   gtk_widget_grab_focus (tree_view);
 
+   g_object_unref (model);
+
   return box;
 }
 
@@ -865,7 +869,7 @@ main (int argc, char **argv)
   
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
-  g_signal_connect (window, "destroy",
+  g_signal_connect_after (window, "destroy",
 		    G_CALLBACK (gtk_main_quit), NULL);
 
   hbox = gtk_hbox_new (FALSE, 0);
@@ -881,13 +885,15 @@ main (int argc, char **argv)
 			    create_text (&info_buffer, FALSE),
 			    gtk_label_new_with_mnemonic ("_Info"));
 
+  tag = gtk_text_buffer_create_tag (info_buffer, "title",
+                                    "font", "Sans 18",
+                                    NULL);
+   g_object_unref (info_buffer);
+
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 			    create_text (&source_buffer, TRUE),
 			    gtk_label_new_with_mnemonic ("_Source"));
 
-  tag = gtk_text_buffer_create_tag (info_buffer, "title",
-                                    "font", "Sans 18",
-                                    NULL);
 
   tag = gtk_text_buffer_create_tag (source_buffer, "comment",
 				    "foreground", "DodgerBlue",
@@ -910,6 +916,7 @@ main (int argc, char **argv)
 				    "weight", PANGO_WEIGHT_BOLD,
  				    "foreground", "DarkGoldenrod4",
                                     NULL);
+   g_object_unref (source_buffer);
   
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);

demos/gtk-demo/panes.c

@@ -24,13 +24,13 @@ toggle_resize (GtkWidget *widget,
   resize = is_child1 ? paned->child1_resize : paned->child2_resize;
   shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
 
-  gtk_widget_ref (child);
+  g_object_ref (child);
   gtk_container_remove (GTK_CONTAINER (child->parent), child);
   if (is_child1)
     gtk_paned_pack1 (paned, child, !resize, shrink);
   else
     gtk_paned_pack2 (paned, child, !resize, shrink);
-  gtk_widget_unref (child);
+  g_object_unref (child);
 }
 
 void
@@ -44,13 +44,13 @@ toggle_shrink (GtkWidget *widget,
   resize = is_child1 ? paned->child1_resize : paned->child2_resize;
   shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
 
-  gtk_widget_ref (child);
+  g_object_ref (child);
   gtk_container_remove (GTK_CONTAINER (child->parent), child);
   if (is_child1)
     gtk_paned_pack1 (paned, child, resize, !shrink);
   else
     gtk_paned_pack2 (paned, child, resize, !shrink);
-  gtk_widget_unref (child);
+  g_object_unref (child);
 }
 
 GtkWidget *

demos/gtk-demo/pixbufs.c

@@ -61,7 +61,7 @@ load_pixbufs (GError **error)
   if (background)
     return TRUE; /* already loaded earlier */
 
-  /* demo_find_file() looks in the the current directory first,
+  /* demo_find_file() looks in the current directory first,
    * so you can run gtk-demo without installing GTK, then looks
    * in the location where the file is installed.
    */
@@ -187,7 +187,9 @@ timeout (gpointer data)
 			       : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
     }
 
+  GDK_THREADS_ENTER ();
   gtk_widget_queue_draw (da);
+  GDK_THREADS_LEAVE ();
 
   frame_num++;
   return TRUE;

demos/gtk-demo/printing.c

@@ -61,8 +61,9 @@ draw_page (GtkPrintOperation *operation,
   PrintData *data = (PrintData *)user_data;
   cairo_t *cr;
   PangoLayout *layout;
-  gdouble width, text_height;
-  gint line, i, layout_height;
+  gint text_width, text_height;
+  gdouble width;
+  gint line, i;
   PangoFontDescription *desc;
   gchar *page_str;
 
@@ -85,21 +86,25 @@ draw_page (GtkPrintOperation *operation,
   pango_font_description_free (desc);
 
   pango_layout_set_text (layout, data->filename, -1);
-  pango_layout_set_width (layout, width);
-  pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
-			      
-  pango_layout_get_size (layout, NULL, &layout_height);
-  text_height = (gdouble)layout_height / PANGO_SCALE;
+  pango_layout_get_pixel_size (layout, &text_width, &text_height);
 
-  cairo_move_to (cr, width / 2,  (HEADER_HEIGHT - text_height) / 2);
+  if (text_width > width)
+    {
+      pango_layout_set_width (layout, width);
+      pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_START);
+      pango_layout_get_pixel_size (layout, &text_width, &text_height);
+    }
+
+  cairo_move_to (cr, (width - text_width) / 2,  (HEADER_HEIGHT - text_height) / 2);
   pango_cairo_show_layout (cr, layout);
 
   page_str = g_strdup_printf ("%d/%d", page_nr + 1, data->num_pages);
   pango_layout_set_text (layout, page_str, -1);
   g_free (page_str);
-  pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
-			      
-  cairo_move_to (cr, width - 2, (HEADER_HEIGHT - text_height) / 2);
+
+  pango_layout_set_width (layout, -1);
+  pango_layout_get_pixel_size (layout, &text_width, &text_height);
+  cairo_move_to (cr, width - text_width - 4, (HEADER_HEIGHT - text_height) / 2);
   pango_cairo_show_layout (cr, layout);
   
   g_object_unref (layout);

demos/gtk-demo/textscroll.c

@@ -0,0 +1,200 @@
+/* Text Widget/Automatic scrolling
+ *
+ * This example demonstrates how to use the gravity of 
+ * GtkTextMarks to keep a text view scrolled to the bottom
+ * while appending text.
+ */
+
+#include <gtk/gtk.h>
+#include "demo-common.h"
+
+/* Scroll to the end of the buffer.
+ */
+static gboolean
+scroll_to_end (GtkTextView *textview)
+{
+  GtkTextBuffer *buffer;
+  GtkTextIter iter;
+  GtkTextMark *mark;
+  char *spaces;
+  static int count;
+
+  buffer = gtk_text_view_get_buffer (textview);
+  
+  /* Get "end" mark. It's located at the end of buffer because 
+   * of right gravity
+   */
+  mark = gtk_text_buffer_get_mark (buffer, "end");
+  gtk_text_buffer_get_iter_at_mark (buffer, &iter, mark);
+
+  /* and insert some text at its position, the iter will be 
+   * revalidated after insertion to point to the end of inserted text
+   */
+  spaces = g_strnfill (count++, ' ');
+  gtk_text_buffer_insert (buffer, &iter, "\n", -1);
+  gtk_text_buffer_insert (buffer, &iter, spaces, -1);
+  gtk_text_buffer_insert (buffer, &iter,
+                          "Scroll to end scroll to end scroll "
+                          "to end scroll to end ",
+                          -1);
+  g_free (spaces);
+
+  /* Now scroll the end mark onscreen.
+   */
+  gtk_text_view_scroll_mark_onscreen (textview, mark);
+
+  /* Emulate typewriter behavior, shift to the left if we 
+   * are far enough to the right.
+   */
+  if (count > 150)
+    count = 0;
+
+  return TRUE;
+}
+
+/* Scroll to the bottom of the buffer.
+ */
+static gboolean
+scroll_to_bottom (GtkTextView *textview)
+{
+  GtkTextBuffer *buffer;
+  GtkTextIter iter;
+  GtkTextMark *mark;
+  char *spaces;
+  static int count;
+
+  buffer = gtk_text_view_get_buffer (textview);
+  
+  /* Get end iterator */
+  gtk_text_buffer_get_end_iter (buffer, &iter);
+
+  /* and insert some text at it, the iter will be revalidated
+   * after insertion to point to the end of inserted text
+   */
+  spaces = g_strnfill (count++, ' ');
+  gtk_text_buffer_insert (buffer, &iter, "\n", -1);
+  gtk_text_buffer_insert (buffer, &iter, spaces, -1);
+  gtk_text_buffer_insert (buffer, &iter,
+                          "Scroll to bottom scroll to bottom scroll "
+                          "to bottom scroll to bottom",
+                          -1);
+  g_free (spaces);
+
+  /* Move the iterator to the beginning of line, so we don't scroll 
+   * in horizontal direction 
+   */
+  gtk_text_iter_set_line_offset (&iter, 0);
+  
+  /* and place the mark at iter. the mark will stay there after we
+   * insert some text at the end because it has right gravity.
+   */
+  mark = gtk_text_buffer_get_mark (buffer, "scroll");
+  gtk_text_buffer_move_mark (buffer, mark, &iter);
+  
+  /* Scroll the mark onscreen.
+   */
+  gtk_text_view_scroll_mark_onscreen (textview, mark);
+
+  /* Shift text back if we got enough to the right.
+   */
+  if (count > 40)
+    count = 0;
+
+  return TRUE;
+}
+
+static guint
+setup_scroll (GtkTextView *textview,
+              gboolean     to_end)
+{
+  GtkTextBuffer *buffer;
+  GtkTextIter iter;
+
+  buffer = gtk_text_view_get_buffer (textview);
+  gtk_text_buffer_get_end_iter (buffer, &iter);
+
+  if (to_end)
+  {
+    /* If we want to scroll to the end, including horizontal scrolling,
+     * then we just create a mark with right gravity at the end of the 
+     * buffer. It will stay at the end unless explicitely moved with 
+     * gtk_text_buffer_move_mark.
+     */
+    gtk_text_buffer_create_mark (buffer, "end", &iter, FALSE);
+    
+    /* Add scrolling timeout. */
+    return g_timeout_add (50, (GSourceFunc) scroll_to_end, textview);
+  }
+  else
+  {
+    /* If we want to scroll to the bottom, but not scroll horizontally, 
+     * then an end mark won't do the job. Just create a mark so we can 
+     * use it with gtk_text_view_scroll_mark_onscreen, we'll position it
+     * explicitely when needed. Use left gravity so the mark stays where 
+     * we put it after inserting new text.
+     */
+    gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE);
+    
+    /* Add scrolling timeout. */
+    return g_timeout_add (100, (GSourceFunc) scroll_to_bottom, textview);
+  }
+}
+
+static void
+remove_timeout (GtkWidget *window,
+                gpointer   timeout)
+{
+  g_source_remove (GPOINTER_TO_UINT (timeout));
+}
+
+static void
+create_text_view (GtkWidget *hbox,
+                  gboolean   to_end)
+{
+  GtkWidget *swindow;
+  GtkWidget *textview;
+  guint timeout;
+
+  swindow = gtk_scrolled_window_new (NULL, NULL);
+  gtk_box_pack_start_defaults (GTK_BOX (hbox), swindow);
+  textview = gtk_text_view_new ();
+  gtk_container_add (GTK_CONTAINER (swindow), textview);
+
+  timeout = setup_scroll (GTK_TEXT_VIEW (textview), to_end);
+
+  /* Remove the timeout in destroy handler, so we don't try to
+   * scroll destroyed widget. 
+   */
+  g_signal_connect (textview, "destroy",
+                    G_CALLBACK (remove_timeout),
+                    GUINT_TO_POINTER (timeout));
+}
+
+GtkWidget *
+do_textscroll (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *hbox;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
+      
+      hbox = gtk_hbox_new (TRUE, 6);
+      gtk_container_add (GTK_CONTAINER (window), hbox);
+
+      create_text_view (hbox, TRUE);
+      create_text_view (hbox, FALSE);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+      gtk_widget_show_all (window);
+  else
+      gtk_widget_destroy (window);
+
+  return window;
+}

demos/gtk-demo/textview.c

@@ -155,7 +155,7 @@ insert_text (GtkTextBuffer *buffer)
   GtkTextChildAnchor *anchor;
   char *filename;
 
-  /* demo_find_file() looks in the the current directory first,
+  /* demo_find_file() looks in the current directory first,
    * so you can run gtk-demo without installing GTK, then looks
    * in the location where the file is installed.
    */
@@ -350,7 +350,7 @@ insert_text (GtkTextBuffer *buffer)
   anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
   gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
   
-  gtk_text_buffer_insert (buffer, &iter, "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text (doesn't work in GTK 2, but planned), tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);
+  gtk_text_buffer_insert (buffer, &iter, "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text, tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);
 
   /* Apply word_wrap tag to whole buffer */
   gtk_text_buffer_get_bounds (buffer, &start, &end);

demos/gtk-demo/ui_manager.c

@@ -183,10 +183,12 @@ do_ui_manager (GtkWidget *do_widget)
 
       ui = gtk_ui_manager_new ();
       gtk_ui_manager_insert_action_group (ui, actions, 0);
+      g_object_unref (actions);
       gtk_window_add_accel_group (GTK_WINDOW (window), 
 				  gtk_ui_manager_get_accel_group (ui));
       gtk_window_set_title (GTK_WINDOW (window), "UI Manager");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
+
       
       if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error))
 	{
@@ -223,6 +225,7 @@ do_ui_manager (GtkWidget *do_widget)
       gtk_widget_grab_default (button);
 
       gtk_widget_show_all (window);
+      g_object_unref (ui);
     }
   else
     {

demos/pixbuf-demo.c

@@ -225,7 +225,7 @@ main (int argc, char **argv)
 
 	gtk_container_add (GTK_CONTAINER (window), da);
 
-	timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
+	timeout_id = gdk_threads_add_timeout (FRAME_DELAY, timeout, NULL);
 
 	gtk_widget_show_all (window);
 	gtk_main ();

demos/testanimation.c

@@ -301,7 +301,7 @@ start_progressive_loading (GtkWidget *image)
    * The timeout simply simulates a slow data source by inserting
    * pauses in the reading process.
    */
-  lc->load_timeout = g_timeout_add (100,
+  lc->load_timeout = gdk_threads_add_timeout (100,
                                     progressive_timeout,
                                     image);
 }

demos/testpixbuf-drawable.c

@@ -66,7 +66,7 @@ configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
    return FALSE;
 }
 
-extern void pixbuf_init ();
+extern void pixbuf_init (void);
 
 int
 main (int argc, char **argv)

demos/testpixbuf.c

@@ -358,11 +358,11 @@ expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
 static void
 config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
 {
+#if 0
 	GdkPixbuf *pixbuf;
     
 	pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
 
-#if 0
 	if (((event->width) != gdk_pixbuf_get_width (pixbuf)) ||
 	    ((event->height) != gdk_pixbuf_get_height (pixbuf)))
 		gdk_pixbuf_scale (pixbuf, event->width, event->height);
@@ -504,7 +504,7 @@ progressive_updated_callback (GdkPixbufLoader* loader, guint x, guint y, guint w
 
 static int readlen = 4096;
 
-extern void pixbuf_init ();
+extern void pixbuf_init (void);
 
 void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
 {
@@ -628,7 +628,7 @@ main (int argc, char **argv)
 
 			status.readlen = readlen;
 
-                        status.timeout = g_timeout_add (100, update_timeout, &status);
+                        status.timeout = gdk_threads_add_timeout (100, update_timeout, &status);
                 }
 #endif
 	}

docs/README.linux-fb

@@ -32,7 +32,7 @@ Freetype can be found at ftp://ftp.freetype.org
 
 Hardware requirements:
 ----------------------
-You need a graphics card with an availible framebuffer driver that can
+You need a graphics card with an available framebuffer driver that can
 run in 8, 16, 24 or 32 bpp. I use the matroxfb driver, but i.e. vesafb
 should work too. You also need a supported mouse. Currently supported
 is ps2 mouse, ms serial mouse and fidmour touchscreen.
@@ -44,7 +44,7 @@ First build and install glib and pango as usual, in that order.
 Then configure Gtk by running configure (or autogen.sh if running from
 cvs) with --with-gdktarget=linux-fb.
 
-Then compile as ususal: make; make install
+Then compile as usual: make; make install
 
 Fonts:
 ------
@@ -124,7 +124,7 @@ GDK_MOUSE_TYPE:
  Default is ps2.
 
 GDK_KEYBOARD_TYPE:
- Specify keyboard type. Currently suppored is
+ Specify keyboard type. Currently supported is
   xlate - normal tty mode keyboard.
     Quite limited, cannot detect key up/key down events. Doesn't
     handle ctrl/alt/shift for all keys. This is the default driver,

docs/developers.txt

@@ -6,7 +6,7 @@ programming for/with Gtk, having the spirit of a developers FAQ.
 It is also the correct place to list up things that programmers should
 care about in general.
 
-In the hope that this text might be usefull to someone,
+In the hope that this text might be useful to someone,
 
         - Tim Janik <timj@gimp.org>
           1998/02/11
@@ -43,7 +43,7 @@ GDK_SELECTION_CLEAR     GtkWidget::selection_clear_event
 GDK_FOCUS_CHANGE        GtkWidget::focus_in_event
                         GtkWidget::focus_out_event
 
-Events that are asured to have a valid GdkEvent.any.window field are
+Events that are assured to have a valid GdkEvent.any.window field are
 
 GDK_EXPOSE		GtkWidget::expose_event
 
@@ -61,7 +61,7 @@ Writing Gdk functions
 ---------------------
 
 When writing Gdk functions that operate on GdkWindow structures in any
-maeningfull sense, that is casting to a GdkWindowPrivate structure for
+meaningful sense, that is casting to a GdkWindowPrivate structure for
 access to fields other then GdkWindow.user_data, the programmer is
 recommended to check for the GdkWindowPrivate.destroyed field to be ==
 FALSE, especially if the GdkWindowPrivate.xwindow field is used.

docs/dnd_internals.txt

@@ -112,7 +112,7 @@ Retrieves the selection that will be used to communicate
 the data for the drag context (valid on both source
 and dest sides)
 
-Cursors and window heirarchies
+Cursors and window hierarchies
 ==============================
 
 The DND code, when possible (and it isn't possible over
@@ -123,7 +123,7 @@ the cursor is in _ourselves_ so we can ignore the
 drag icon properly. (Oh for OutputOnly windows!)
 
 To avoid obscene amounts of server traffic (which are only
-slighly observerable locally, but would really kill a
+slightly observable locally, but would really kill a
 session over a slow link), the code in GDK does
 XGetWindowAttributes for every child of the root window at
 the beginning of the drag, then selects with

docs/faq/gtk-faq.sgml

@@ -1636,7 +1636,7 @@ int main(int argc, char *argv[])
   gtk_container_set_border_width(GTK_CONTAINER (window), 10);
 #endif
 
-  /* add a button to do something usefull */
+  /* add a button to do something useful */
   button = gtk_button_new_with_label("Fork me!");
           
   g_signal_connect(G_OBJECT (button), "clicked",
@@ -2815,7 +2815,7 @@ the Label widget, which can be done using:</para>
 GtkTooltips in itself is not a GtkWidget (though a GtkObject)
 and as such is not attempted to match any widget styles.</para>
 
-<para>So, you resource file should look something like:</para>
+<para>So, your resource file should look something like:</para>
 
 <programlisting role="C">
 style "postie"

docs/focus_tracking.txt

@@ -97,7 +97,7 @@ F2, F3: together these are exactly the cases where we get
 
 F4: we get an LeaveNotify with the focus flag set. An
   LeaveNotify with a focus flag set will also be sent if 
-  F==W, so we have to to explicity test for that case
+  F==W, so we have to to explicitly test for that case
   using has_focus_window(W).
 
 

docs/generation.txt

@@ -107,7 +107,7 @@ makeenums.pl can be run into two modes:
 
  2) Generate the enumeration portion of gtk.defs.
 
-The enumearation portion is added to the boxed type 
+The enumeration portion is added to the boxed type 
 declarations in gtk-boxed.defs to create gtk.defs.
 
 The makeetypes.awk program takes the gtk.defs file, and
@@ -162,7 +162,7 @@ The possible types are:
 	     GtkDestroyNotify Notify)
 
 Some of these types map to multiple return values - these
-are marked above with the return types in parantheses.
+are marked above with the return types in parentheses.
 
 NOTES
 =====
@@ -170,7 +170,7 @@ NOTES
 When autogenerating GTK+ files, the autogenerated
 files are often rebuild resulting in the same result.
 
-To prevent unecessary rebuilds of the entire directory, some files
+To prevent unnecessary rebuilds of the entire directory, some files
 that multiple other source files depend on are not actually written
 to directly.  Instead, an intermediate file is written, which
 is then compared to the old file, and only if it is different

docs/gtk-config.txt

@@ -1,7 +1,7 @@
 CONFIGURING PACKAGES TO WORK WITH GTK
 -------------------------------------
 
-Compiling a program succesfully against the GTK, GDK, and GLIB
+Compiling a program successfully against the GTK, GDK, and GLIB
 libraries can require a large number of command line options
 to your compiler and linker that are hard to guess correctly.
 The additional libraries required may, for example, depend on the

docs/refcounting.txt

@@ -22,10 +22,10 @@ GtkObjects also provide the following functions:
 GdkWindow
 ---------
 
-A GdkWindow has to be explicitely destroyed with gdk_window_destroy.
+A GdkWindow has to be explicitly destroyed with gdk_window_destroy.
 This will send out a request to destroy this window and all its
 children, and will decrement the ref_count of the GdkWindow by one.
-Thus, it releases the inital reference created by gdk_window_new.
+Thus, it releases the initial reference created by gdk_window_new.
 
 All GdkWindows are kept in a hash table to translate from their XId to
 the actual structure and the pointer in the hash table is reflected in
@@ -62,7 +62,7 @@ GdkVisual
 ---------
 
 There are no *_new or *_destroy functions and the *_ref and *_unref
-functions are noops.  GdkVisuals are static structures and thus do not
+functions are no-ops.  GdkVisuals are static structures and thus do not
 need reference counting.  The ref counting functions are only there
 for extra defensive programming.
 
@@ -220,13 +220,13 @@ Then, when the user wants to get rid of the window:
   /* The GdkWindow of `window' and all its child GdkWindows are
    * destroyed.
    *
-   * window is unregistered from the loplevel list and its ref_count
-   * drops to zero.  The destroy code of `window' destroyes `option_menu'.
+   * window is unregistered from the toplevel list and its ref_count
+   * drops to zero.  The destroy code of `window' destroys `option_menu'.
    *
    * The destroy code of `option_menu' causes the `menu' to be detached
    * from it and its reference count drops to zero.
    *
-   * The destroy code of `menu' destroyes `menu_item'.
+   * The destroy code of `menu' destroys `menu_item'.
    *
    * The destruction of `menu_item' removes it from its parent, the
    * menu_item->ref_count drops to zero and `menu_item' is finalized (freed).
@@ -241,7 +241,7 @@ Taking care of proper referencing
 
 There are some cases where referencing of widgets from outside the toolkit
 (on the application side) is needed.
-Once the application performes an operation on a widget that will cause
+Once the application performs an operation on a widget that will cause
 its reference count to drop, if it wants to take further actions on the
 widget, it needs to hold a reference to it.
 

docs/reference/ChangeLog

@@ -1,3 +1,590 @@
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.4 ===
+
+2007-12-30  Johannes Schmid <jhs@gnome.org>
+
+	* gtk/tmpl/gtknotebook.sgml:
+	Fix method names (gtk_notebook_popup_enable vs. 
+	gtk_notebook_enable_popup)
+
+2007-12-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.3 ===
+
+2007-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.2 ===
+
+2007-11-19  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkaboutdialog.sgml: Add some hints about
+	program-name vs name.  (#496689, Thomas Wood)
+
+2007-11-19  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbuilder.sgml: Small correction to the
+	informational DTD.  (#496277, Nicolas Joseph)
+
+2007-10-16  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.12.1 ===
+
+2007-10-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-docs.sgml: Move GtkFileSelection to deprecated
+	section.  (#476920, Matthew Barnes)
+
+2007-10-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtktreemodel.sgml: Document GtkTreeModelForeach 
+	parameters. (#4777074, Ross Burton)
+
+2007-10-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkpaned.sgml: Mention behaviour with a single child.
+	(#477447, Juri Pakaste)
+
+2007-10-01 20:21:28  Tim Janik  <timj@imendio.com>
+
+	* gtk/tmpl/gtkmenu.sgml: reworded push_in description with Owen's
+	help, fixes bug #482034.
+
+2007-09-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.0 ===
+
+2007-09-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/migrating-GtkBuilder.sgml: Add a paragraph about
+	using gtk-builder-convert.
+
+2007-09-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkprintunixdialog.sgml: Additions
+
+2007-09-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf/porting-from-imlib.sgml:
+	* gdk/tmpl/rgb.sgml: Remove references to deprecated
+	functions.  (#460207, Guillaume Cottenceau)
+
+2007-09-06  Matthias Clasen  <mclasen@redhat.com>
+	
+	* gdk/tmpl/windows.sgml: Correct the example widget for
+	child windows.  (#473463, Andrew Cowie)
+
+2007-09-03  Behdad Esfahbod  <behdad@gnome.org>
+
+	* gtk/gtk-sections.txt: Remove duplicate
+	gtk_print_operation_get_error().  (#473340, Yeti)
+
+2007-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.6 ===
+
+2007-07-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add more tooltip convenience functions.
+	
+2007-07-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add icon view tooltip convenience functions.
+
+Thu Jul 12 18:12:04 2007  Tim Janik  <timj@imendio.com>
+
+	* gdk/tmpl/threads.sgml: clarify section about gdk_threads_enter/
+	gdk_threads_leave to be reworded in terms of events and to mention
+	availability of gdk_threads_add_idle_full().
+
+2007-07-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbindings.sgml: Add a paragraph about 
+	keybinding signals.
+
+2007-07-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkrange.sgml:
+	* gtk/tmpl/gtkbox.sgml:
+	* gtk/tmpl/gtksignal.sgml:
+	* gtk/tmpl/gtkaboutdialog.sgml:
+	* gtk/tmpl/gtkbindings.sgml:
+	* gtk/tmpl/gtklabel.sgml:
+	* gtk/tmpl/gtkstatusbar.sgml: Small additions and corrections.
+
+2007-07-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Additions
+
+	* gtk/tmpl/gtkplug.sgml:
+	* gtk/tmpl/gtksocket.sgml: Move docs inline
+
+2007-07-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Updates
+
+2007-07-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/migrating-GtkTooltip.sgml: Migration chapter
+	for tooltips.
+
+	* gtk/gtk-docs.sgml: Include it, and move GtkTooltips
+	chapter to "Deprecated".
+
+	* gtk/Makefile.am: Glue
+
+	* gtk/tmpl/gtktooltip.sgml: Add more content from
+	Kris' "tooltips in 5 minutes" mail.
+
+2007-07-10  Matthias Clasen  <mclasen@redhat.com>
+	
+	* gdk/tmpl/colors.sgml: Remov references to deprecated
+	api.  (#455666, Guillaume Cottenceau)
+
+2007-07-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/migrating-GtkBuilder.sgml: Add some stuff
+	* gtk/gtk-builder-convert.xml: Updates
+
+2007-07-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf/tmpl/scaling.sgml: Remove uses of deprecated api 
+	in example.  (#454835, Guillaume Cottenceau)
+
+2007-07-09  Johan Dahlin,,,  <jdahlin@lozenge>
+
+	* gtk/tmpl/gtkactiongroup.sgml: Document <accelerator> element
+
+Mon Jul  9 10:32:39 2007  Tim Janik  <timj@imendio.com>
+
+	* gdk/tmpl/threads.sgml: applied docu clarification patch from Bjoern
+	Lindqvist, #454700.
+
+2007-07-08  Johan Dahlin  <jdahlin@async.com.br>
+
+	* gtk/tmpl/gtkbuilder.sgml: Mention last_modification_time
+
+2007-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbuilder.sgml: Document context and
+	comments for properties.
+
+2007-07-07  Johan Dahlin  <jdahlin@async.com.br>
+
+	* gtk/gtk-builder-convert.xml: Update
+
+2007-04-05  Matthias clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbuilder.sgml: Pixbuf properties
+
+2007-07-04  Johan Dahlin  <jdahlin@async.com.br>
+
+	* gtk/gtk-builder-convert.xml: We support GtkComboBox.items 
+	properties now
+
+Wed Jul  4 00:58:24 2007  Tim Janik  <timj@gtk.org>
+
+	* gdk/tmpl/events.sgml: fixed up motion hint description.
+
+2007-07-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkdrawingarea.sgml: Fix a reference 
+	to a deprecated function.  (#453316, Guillaume Cottenceau)
+
+2007-07-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbuilder.sgml: Some wordsmithing
+	on the memory management explanation, asked for
+	by Murray Cumming.
+
+2007-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.5 ===
+
+2007-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbuilder.sgml: Add detail about
+	ordering constraints of construct-only object properties
+
+2007-07-02  Johan Dahlin  <jdahlin@async.com.br>
+
+	* gtk/tmpl/gtkbuilder.sgml: Updates
+
+2007-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbuilder.sgml: Add more details
+
+2007-07-01  Johan Dahlin  <jdahlin@async.com.br>
+
+	* gtk/tmpl/gtkbuilder.sgml:
+	* gtk/tmpl/gtkexpander.sgml:
+	* gtk/tmpl/gtkframe.sgml:
+	* gtk/tmpl/gtknotebook.sgml:
+	* gtk/tmpl/gtktreemodel.sgml: Improve GtkBuilder DTD,
+	remove treemodel section, add more information about
+	container subclasses child attributes. #452954
+
+2007-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/*.sgml: Document GtkBuilder ui definitions.
+
+2007-07-01  Johan Dahlin  <jdahlin@async.com.br>
+
+	* gtk/gtk-builder-convert.xml: Updates
+
+2007-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbuilder.sgml: Some corrections and additions
+
+	* gtk/tmpl/gtkdialog.sgml: Explain details of GtkDialog
+	as a buildable.
+
+2007-06-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbuilder.sgml:
+	* gtk/tmpl/gtkbuildable.sgml:
+	* gtk/tmpl/gtkuimanager.sgml: Updates
+
+2007-06-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdk-sections.txt: Add gdk_keymap_have_bidi_layouts
+
+2007-06-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/migrating-GtkBuilder.sgml: An empty shell
+	* gtk/Makefile.am:
+	* gtk/gtk-docs.sgml: Integrate it
+
+	* gtk/tmpl/gtkbuildable.sgml: Some additions
+
+Wed Jun 27 11:57:13 2007  Tim Janik  <timj@imendio.com>
+
+	* gtk/tmpl/gtkmenu.sgml: fixed push_in description.
+
+2007-06-25  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/Makefile.am:
+	* gtk/gtk-builder-convert.xml: Add a man page
+	* gtk/gtk-docs.sgml: And include it here
+
+	* gtk/tmpl/gtkscalebutton.sgml:
+	* gtk/tmpl/gtkvolumebutton.sgml:
+	* gtk/tmpl/gtkvscrollbar.sgml:
+	* gtk/tmpl/gtkrange.sgml:
+	* gtk/tmpl/gtkrecentaction.sgml:
+	* gtk/tmpl/gtktooltip.sgml:
+	* gtk/tmpl/gtkvscrollbar.sgml: Additions
+	* gdk/gdk-overrides.txt: Remove GDK_WINDOWING_FB
+
+2007-06-19  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.11.4 ===
+
+2007-06-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-docs.sgml: Move GtkMenuShell to the abstract widgets.
+
+2007-06-17  Jan Arne Petersen  <jpetersen@jpetersen.org>
+
+	* gtk/gtk-docs.sgml: Add GtkTooltip. (#448341)
+
+2007-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.3 ===
+
+2007-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtktreeview.sgml: Fix up cross-references
+
+	* gtk/gtk-sections.txt: 
+	* gtk/Makefile.am: Updates
+
+2007-06-14  Johan Dahlin  <jdahlin@async.com.br>
+
+	* gtk/tmpl/gtktreeview.sgml (linkend): inlinegraphic instead of 
+	inlinegraphics.
+
+2007-06-13  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/tmpl/gtkmenuitem.sgml: remove stuff that has been moved inline.
+
+2007-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdk-sections.txt: Remove GDK_WINDOWING_FB
+	* gtk/Makefile.am:
+	* gtk/gtk-docs.sgml:
+	* gtk/compiling.sgml:
+	* gtk/building.sgml: Remove linux-fb references
+
+2007-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-update-icon-cache.xml: Document --validate
+
+2007-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/text_widget.sgml:
+	* gtk/tree_widget.sgml:
+	* gtk/tmpl/gtkscalebutton.sgml:
+	* gtk/tmpl/gtktextbuffer.sgml:
+	* gtk/tmpl/gtktexttag.sgml:
+	* gtk/tmpl/gtktextview.sgml:
+	* gtk/tmpl/gtktreemodel.sgml:
+	* gtk/tmpl/gtktreeselection.sgml:
+	* gtk/tmpl/gtktreeviewcolumn.sgml:
+	* gtk/tmpl/gtkcellrenderer.sgml:
+	* gtk/tmpl/gtkliststore.sgml:
+	* gtk/tmpl/gtktreestore.sgml:
+	* gtk/tmpl/gtkmenubar.sgml:
+	* gtk/tmpl/gtkbbox.sgml:
+	* gtk/tmpl/gtkseparator.sgml:
+	* gtk/tmpl/gtkgamma.sgml:
+	* gtk/tmpl/gtkhruler.sgml:
+	* gtk/tmpl/gtkvruler.sgml:
+	* gtk/tmpl/gtkrecentchooser.sgml:
+	* gtk/tmpl/gtkvolumebutton.sgml: Clean up short descriptions
+
+2007-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkbindings.sgml:
+	* gtk/tmpl/gtkrc.sgml:
+	* gtk/tmpl/gtkwidget.sgml:
+	* gtk/tmpl/gtkrecentmanager.sgml:
+	* gtk/*.sgml:
+	* gtk/tmpl/gtkstock.sgml:
+	* gtk/gtk-sections.txt: Updates
+
+	* gtk/Makefile.am: Exclude another private header
+
+	* gtk/tmpl/gtkbox.sgml: Move docs inline
+
+2007-06-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add gtk_rc_parse_color_full
+
+2007-06-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.2 ===
+
+2007-06-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.1 ===
+
+2007-06-03   Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/Makefile.am:
+	* gtk/visual_index.xml:
+	* gtk/images/volumebutton.png: Volume button image
+
+2007-06-01   Matthias Clasen  <mclasen@redhat.com>
+	
+	* gdk/gdk-sections.txt: Add new composited window api
+	* gdk/tmpl/windows.sgml: Add composited window example
+
+2007-05-26   Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/migrating*.sgml: Some cleanups
+
+2007-05-26   Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkentry.sgml: Move docs inline
+
+	* gtk/tmpl/gtklinkbutton.sgml:
+	* gtk/tmpl/gtkfilechooser.sgml:
+	* gtk/tmpl/gtkcellrenderer.sgml:
+	* gtk/tmpl/gtkenums.sgml:
+	* gtk/tmpl/gtkcontainer.sgml: Additions
+
+2007-05-26   Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdk-overrides.txt: Remove GdkBitmap
+	* gtk/gtk-sections.txt:
+	* gtk/tmpl/gtkenums.sgml:
+	* gdk/tmpl/rgb.sgml:
+	* gdk/tmpl/gcs.sgml:
+	* gdk/tmpl/pango_interaction.sgml:
+	* gdk/tmpl/windows.sgml: Additions
+
+2007-05-26   Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf/gdk-pixbuf-sections.txt: 
+	* gdk/gdk-sections.txt: Add new api
+
+2007-05-26   Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/*: Get the docs in shape
+
+2007-05-25   Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add new functions
+
+2007-05-24   Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.0 ===
+
+2007-05-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt:
+	* gdk/gdk-sections.txt: Updates
+
+2007-05-20  Bastien Nocera  <hadess@hadess.net>
+
+	* gtk/gtk-docs.sgml: Add missing docs for the
+	volume button
+
+2007-05-20  Bastien Nocera  <hadess@hadess.net>
+
+        * gtk/gtk-sections.txt: Add the GtkVolumeButton widget
+	to the docs
+
+2007-05-20  Bastien Nocera  <hadess@hadess.net>
+
+	* gtk/gtk-docs.sgml:
+	* gtk/gtk-sections.txt: add the GtkScaleButton widget
+	to the docs
+
+2007-05-19  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add gtk_notebook_[gs]et_group
+
+2007-05-18  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add gtk_entry_[gs]et_cursor_hadjustment.
+
+2007-05-18  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add generic icon lookup function
+
+2007-04-29  Dan Winship  <danw@novell.com>
+
+	* gdk/gdk-sections.txt: Add
+	gdk_x11_display_broadcast_startup_message and some other missing
+	startup-notification-related methods
+
+2007-04-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add new functions to serialize/
+	deserialize page setups and print settings.
+
+2007-04-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add gtk_paper_size_get_builtins
+
+2007-04-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add gtk_printer_{has,request}_details
+
+2007-04-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkdnd.sgml: Document GTK_TARGET_OTHER_*
+
+2007-04-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkcomboboxentry.sgml: Mention that the entry
+	can be replaced.
+
+2007-04-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkdialog.sgml: Fix a wrong cross reference.
+	(#431289, Bastian Nocera)
+
+2007-03-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkaboutdialog.sgml: Add a paragraph about setting
+	the title on the dialog.
+
+2007-02-14  Stefan Kost  <ensonic@users.sf.net>
+
+	reviewed by: Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf/Makefile.am:
+	* gdk/Makefile.am:
+	* gtk/Makefile.am: use installation prefixes of dependent libs to
+	crossreference docs (#407146).
+
+2007-01-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/sgml/gtkfilesel.sgml: Add deprecation information.
+
+2007-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkentry.sgml: Expand deprecation notes for
+	gtk_entry_append/prepend_text.  (#394034, Micah Carrick)
+
+2007-01-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf/gdk-pixbuf-sections.txt: Correct the include
+	for GdkPixdata.  (#394000, Samuel Cormier-Iijima)
+
+2007-01-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkstatusbar.sgml: Move docs inline and
+	expand them a bit.
+
+2007-01-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtktextbuffer.sgml: Document rich text
+	serialization functions.  (#347940, Murray Cumming)
+
+2006-12-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkactiongroup.sgml: Document that action
+	labels may be NULL.
+
+2006-12-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add gtk_cell_layout_get_cells.
+
+	* gtk/gtk-docs.sgml: Add a "Since 2.12" index.
+
+2006-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdk-sections.txt: Add new functions.
+	* gdk/gdk-docs.sgml: Add a "Since 2.12" index.
+
+Thu Dec 14 15:48:14 2006  Tim Janik  <timj@imendio.com>
+
+	* gtk/gtk-sections.txt: added new docs.
+
+2006-11-19  Mark McLoughlin  <mark@skynet.ie>
+
+	* gtk/gtk-sections.txt: add gtk_status_icon_(get|set)_screen
+
+Tue Oct 10 16:38:23 2006  Tim Janik  <timj@imendio.com>
+
+	* gtk/tmpl/gtkbindings.sgml: 
+	* gtk/gtkbindings.c: applied patch from Michael Natterer to move to 
+	inline docs. applied wording fixes suggested by Martyn Russell.
+
+Tue Oct 10 15:29:15 2006  Tim Janik  <timj@imendio.com>
+
+	* gtk/tmpl/gtkbindings.sgml: documented GtkBinding*, #358329.
+
+2006-09-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkpagesetup.sgml: Apply a patch
+	to fix some typos.  (#355961, Claudio Saavedra)
+
+2006-09-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/glossary.xml: Add an entry for Ellipsization.
+
+2006-08-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkwidget.sgml: Fix some typos (Mariano Suarez-Alvarez)
+
+2006-08-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdk-sections.txt: Add gdk_window_beep
+
+2006-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/question_index.sgml: Rewrite the answer for
+	automatic scrolling.
+
 2006-08-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.10.2 ===

docs/reference/gdk-pixbuf/Makefile.am

@@ -62,7 +62,9 @@ content_files =				\
 HTML_IMAGES = composite.png
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
+FIXXREF_OPTIONS= --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
+
 
 include $(top_srcdir)/gtk-doc.make
 

docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt

@@ -89,6 +89,7 @@ gdk_pixbuf_copy
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk-pixbuf/gdk-pixdata.h</INCLUDE>
 <FILE>inline</FILE>
 GdkPixdata
 GdkPixdataType
@@ -107,6 +108,7 @@ gdk_pixdata_to_csource
 gdk_pixbuf_add_alpha
 gdk_pixbuf_copy_area
 gdk_pixbuf_saturate_and_pixelate
+gdk_pixbuf_apply_embedded_orientation
 gdk_pixbuf_fill
 </SECTION>
 
@@ -146,7 +148,8 @@ GDK_PIXBUF_SIMPLE_ANIM_CLASS
 GDK_IS_PIXBUF_SIMPLE_ANIM_CLASS
 GDK_TYPE_PIXBUF_SIMPLE_ANIM
 GDK_PIXBUF_SIMPLE_ANIM
-
+GDK_TYPE_PIXBUF_SCALED_ANIM
+GDK_TYPE_PIXBUF_SCALED_ANIM_ITER
 <SUBSECTION Private>
 gdk_pixbuf_non_anim_new
 
@@ -156,6 +159,10 @@ gdk_pixbuf_animation_iter_get_type
 gdk_pixbuf_simple_anim_get_type
 gdk_pixbuf_simple_anim_iter_get_type
 GdkPixbufSimpleAnimClass
+gdk_pixbuf_scaled_anim_get_type
+gdk_pixbuf_scaled_anim_iter_get_type
+GdkPixbufScaledAnimClass
+GdkPixbufScaledAnim
 </SECTION>
 
 <SECTION>

docs/reference/gdk-pixbuf/porting-from-imlib.sgml

@@ -250,12 +250,10 @@
 	  In contrast, &gdk-pixbuf; provides convenience functions to
 	  render arbitrary rectangular regions of an image onto a
 	  drawable that your application provides.  You can use
-	  <function>gdk_pixbuf_render_to_drawable()</function> or
-	  <function>gdk_pixbuf_render_to_drawable_alpha()</function>
-	  to do this; having your application provide the destination
-	  drawable and specify an arbitrary region means your
-	  application has complete control over the way images are
-	  rendered.
+	  <function>gdk_draw_pixbuf()</function> to do this; having
+          your application provide the destination drawable and
+	  specify an arbitrary region means your application has
+          complete control over the way images are rendered.
 	</para>
 
 	<para>

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

@@ -23,6 +23,15 @@ Scaling pixbufs and scaling and compositing pixbufs
     new pixbuf.
   </para>
 
+  <para>
+   Scaling and compositing functions take advantage of MMX hardware
+   acceleration on systems where MMX is supported.  If gdk-pixbuf is built
+   with the Sun mediaLib library, these functions are instead accelerated
+   using mediaLib, which provides hardware acceleration on Intel, AMD,
+   and Sparc chipsets.  If desired, mediaLib support can be turned off by
+   setting the GDK_DISABLE_MEDIALIB environment variable.  
+  </para>
+
   <para>
     The following example demonstrates handling an expose event by
     rendering the appropriate area of a source image (which is scaled
@@ -52,10 +61,10 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
                               GDK_INTERP_BILINEAR, 255,
                               event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
 
-  gdk_pixbuf_render_to_drawable (dest, widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
-                                 0, 0, event->area.x, event->area.y,
-                                 event->area.width, event->area.height,
-                                 GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
+  gdk_draw_pixbuf (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL], dest,
+                   0, 0, event->area.x, event->area.y,
+                   event->area.width, event->area.height,
+                   GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
   
   gdk_pixbuf_unref (dest);
   

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

@@ -64,6 +64,15 @@ End:
 @pixelate: 
 
 
+<!-- ##### FUNCTION gdk_pixbuf_apply_embedded_orientation ##### -->
+<para>
+
+</para>
+
+@src: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_pixbuf_fill ##### -->
 <para>
 

docs/reference/gdk/Makefile.am

@@ -143,7 +143,11 @@ HTML_IMAGES =				\
 	images/xterm.png 
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
+
 
 include $(top_srcdir)/gtk-doc.make
 

docs/reference/gdk/gdk-docs.sgml

@@ -107,5 +107,8 @@
   <index role="2.10">
     <title>Index of new symbols in 2.10</title>
   </index>  
+  <index role="2.12">
+    <title>Index of new symbols in 2.12</title>
+  </index>  
 
 </book>

docs/reference/gdk/gdk-overrides.txt

@@ -15,13 +15,6 @@ struct GdkPixmap
 };
 </STRUCT>
 <STRUCT>
-<NAME>GdkBitmap</NAME>
-struct GdkBitmap
-{
-  gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
 <NAME>GdkDrawable</NAME>
 struct GdkDrawable
 {
@@ -43,9 +36,3 @@ struct GdkDrawable
 <NAME>GDK_WINDOWING_WIN32</NAME>
 #define GDK_WINDOWING_WIN32
 </MACRO>
-
-<MACRO>
-<NAME>GDK_WINDOWING_FB</NAME>
-#define GDK_WINDOWING_FB
-</MACRO>
-

docs/reference/gdk/gdk-sections.txt

@@ -12,6 +12,7 @@ gdk_set_locale
 gdk_set_sm_client_id
 gdk_exit
 gdk_notify_startup_complete
+gdk_notify_startup_complete_with_id
 
 <SUBSECTION>
 gdk_get_program_class
@@ -54,7 +55,6 @@ gdk_error_trap_pop
 <SUBSECTION>
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
-GDK_WINDOWING_FB
 
 <SUBSECTION Standard>
 GDK_TYPE_GRAB_STATUS
@@ -154,6 +154,7 @@ gdk_display_supports_clipboard_persistence
 gdk_display_store_clipboard
 gdk_display_supports_shapes
 gdk_display_supports_input_shapes
+gdk_display_supports_composite
 <SUBSECTION Standard>
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
@@ -385,6 +386,7 @@ gdk_color_alloc
 gdk_color_change
 gdk_color_equal
 gdk_color_hash
+gdk_color_to_string
 
 <SUBSECTION Standard>
 GDK_COLORMAP
@@ -648,6 +650,8 @@ gdk_window_fullscreen
 gdk_window_unfullscreen
 gdk_window_set_keep_above
 gdk_window_set_keep_below
+gdk_window_set_opacity
+gdk_window_set_composited
 gdk_window_move
 gdk_window_resize
 gdk_window_move_resize
@@ -665,6 +669,7 @@ gdk_window_register_dnd
 gdk_window_begin_resize_drag
 gdk_window_begin_move_drag
 gdk_window_constrain_size
+gdk_window_beep
 
 <SUBSECTION>
 gdk_window_begin_paint_rect
@@ -742,6 +747,7 @@ gdk_window_set_icon
 gdk_window_set_icon_name
 gdk_window_set_transient_for
 gdk_window_set_role
+gdk_window_set_startup_id
 gdk_window_set_group
 gdk_window_get_group
 gdk_window_set_decorations
@@ -861,7 +867,9 @@ gdk_pango_context_get
 gdk_pango_context_get_for_screen
 gdk_pango_context_set_colormap
 GdkPangoAttrEmbossed
+GdkPangoAttrEmbossColor
 GdkPangoAttrStipple
+gdk_pango_attr_emboss_color_new
 gdk_pango_attr_embossed_new
 gdk_pango_attr_stipple_new
 gdk_pango_layout_get_clip_region
@@ -950,6 +958,10 @@ gdk_threads_enter
 gdk_threads_leave
 gdk_threads_mutex
 gdk_threads_set_lock_functions
+gdk_threads_add_idle
+gdk_threads_add_idle_full
+gdk_threads_add_timeout
+gdk_threads_add_timeout_full
 
 <SUBSECTION Private>
 gdk_threads_lock
@@ -968,6 +980,7 @@ gdk_keymap_translate_keyboard_state
 gdk_keymap_get_entries_for_keyval
 gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_direction
+gdk_keymap_have_bidi_layouts
 
 <SUBSECTION>
 gdk_keyval_name
@@ -1066,6 +1079,7 @@ gdk_event_get_state
 gdk_event_get_axis
 gdk_event_get_coords
 gdk_event_get_root_coords
+gdk_event_request_motions
 
 <SUBSECTION>
 gdk_event_handler_set
@@ -1280,6 +1294,8 @@ gdk_x11_colormap_get_xcolormap
 gdk_x11_colormap_get_xdisplay
 gdk_x11_cursor_get_xcursor
 gdk_x11_cursor_get_xdisplay
+gdk_x11_display_broadcast_startup_message
+gdk_x11_display_get_startup_notification_id
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab

docs/reference/gdk/tmpl/colors.sgml

@@ -23,7 +23,7 @@ with gdk_colormap_get_system()) is the default
 colormap of the system. If you are using GdkRGB,
 there is another colormap that is important - the
 colormap in which GdkRGB works, retrieved with
-gdk_rgb_get_cmap(). However, when using GdkRGB, 
+gdk_rgb_get_colormap(). However, when using GdkRGB, 
 it is not generally necessary to allocate colors
 directly.
 </para>
@@ -289,3 +289,12 @@ The colormap structure contains the following public fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_color_to_string ##### -->
+<para>
+
+</para>
+
+@color: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/event_structs.sgml

@@ -444,7 +444,7 @@ can also cause #GdkEventGrabBroken events.
 @implicit: %TRUE if the broken grab was implicit
 @grab_window: If this event is caused by another grab in the same 
   application, @grab_window contains the new grab window. Otherwise
-  @grab_window id %NULL.
+  @grab_window is %NULL.
 @Since: 2.8
 
 <!-- ##### ENUM GdkScrollDirection ##### -->

docs/reference/gdk/tmpl/events.sgml

@@ -104,10 +104,11 @@ above.
 number of %GDK_MOTION_NOTIFY events received. Normally a %GDK_MOTION_NOTIFY
 event is received each time the mouse moves. However, if the application
 spends a lot of time processing the event (updating the display, for example),
-it can easily lag behind the position of the mouse. When using the
-%GDK_POINTER_MOTION_HINT_MASK the server will only send a single 
-%GDK_MOTION_NOTIFY event (which is marked as a hint) until the application 
-asks for more, by calling gdk_window_get_pointer().
+it can lag behind the position of the mouse. When using
+%GDK_POINTER_MOTION_HINT_MASK, fewer %GDK_MOTION_NOTIFY events will be sent,
+some of which are marked as a hint (the is_hint member is %TRUE).
+To receive more motion events after a motion hint event, the application
+needs to asks for more, by calling gdk_event_request_motions().
 </para>
 
 @GDK_EXPOSURE_MASK: receive expose events
@@ -268,6 +269,14 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_event_request_motions ##### -->
+<para>
+
+</para>
+
+@event: 
+
+
 <!-- ##### FUNCTION gdk_event_handler_set ##### -->
 <para>
 </para>

docs/reference/gdk/tmpl/gcs.sgml

@@ -103,22 +103,22 @@ images, only %GDK_COPY, %GDK_XOR and %GDK_INVERT are generally
 useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
 </para>
 
-@GDK_COPY: 
-@GDK_INVERT: 
-@GDK_XOR: 
-@GDK_CLEAR: 
-@GDK_AND: 
-@GDK_AND_REVERSE: 
-@GDK_AND_INVERT: 
-@GDK_NOOP: 
-@GDK_OR: 
-@GDK_EQUIV: 
-@GDK_OR_REVERSE: 
-@GDK_COPY_INVERT: 
-@GDK_OR_INVERT: 
-@GDK_NAND: 
-@GDK_NOR: 
-@GDK_SET: 
+@GDK_COPY: <literal>dst = src</literal>
+@GDK_INVERT: <literal>dst = NOT dst</literal>
+@GDK_XOR: <literal>dst = src XOR dst</literal>
+@GDK_CLEAR: <literal>dst = 0</literal>
+@GDK_AND: <literal>dst = dst AND src</literal>
+@GDK_AND_REVERSE: <literal>dst = src AND (NOT dst)</literal>
+@GDK_AND_INVERT: <literal>dst = (NOT src) AND dst</literal>
+@GDK_NOOP: <literal>dst = dst</literal>
+@GDK_OR: <literal>dst = src OR dst</literal>
+@GDK_EQUIV: <literal>dst = (NOT src) XOR dst</literal>
+@GDK_OR_REVERSE: <literal>dst = src OR (NOT dst)</literal>
+@GDK_COPY_INVERT: <literal>dst = NOT src</literal>
+@GDK_OR_INVERT: <literal>dst = (NOT src) OR dst</literal>
+@GDK_NAND: <literal>dst = (NOT src) OR (NOT dst)</literal>
+@GDK_NOR: <literal>dst = (NOT src) AND (NOT dst)</literal>
+@GDK_SET: <literal>dst = 1</literal>
 
 <!-- ##### FUNCTION gdk_gc_new ##### -->
 <para>

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

@@ -159,6 +159,12 @@ the device ID for the core pointer device.
 
 @obj: 
 
+<!-- ##### MACRO GDK_WINDOWING_FB ##### -->
+<para>
+This macro is defined if GDK is configured to use the Linux framebuffer backend.
+</para>
+
+
 <!-- ##### MACRO GDK_WINDOWING_NANOX ##### -->
 <para>
 

docs/reference/gdk/tmpl/gdkdisplay.sgml

@@ -396,3 +396,12 @@ Applications should never have any reason to use this facility
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_display_supports_composite ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/general.sgml

@@ -125,6 +125,14 @@ of g_atexit()).
 
 
 
+<!-- ##### FUNCTION gdk_notify_startup_complete_with_id ##### -->
+<para>
+
+</para>
+
+@startup_id: 
+
+
 <!-- ##### FUNCTION gdk_get_program_class ##### -->
 <para>
 Gets the program class. Unless the program class has explicitly
@@ -391,10 +399,3 @@ This macro is defined if GDK is configured to use the Win32 backend.
 
 
 
-<!-- ##### MACRO GDK_WINDOWING_FB ##### -->
-<para>
-This macro is defined if GDK is configured to use the Linux framebuffer backend.
-</para>
-
-
-

docs/reference/gdk/tmpl/keys.sgml

@@ -204,6 +204,15 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 @Returns: the direction of the keymap.
 
 
+<!-- ##### FUNCTION gdk_keymap_have_bidi_layouts ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_keyval_name ##### -->
 <para>
 Converts a key value into a symbolic name.

docs/reference/gdk/tmpl/pango_interaction.sgml

@@ -240,6 +240,14 @@ rendering the text.
 @attr: the #PangoAttribute.
 @embossed: the embossed bitmap.
 
+<!-- ##### STRUCT GdkPangoAttrEmbossColor ##### -->
+<para>
+A Pango text attribute specifying the color to emboss text with.
+</para>
+
+@attr: the #PangoAttribute
+@color: the color
+
 <!-- ##### STRUCT GdkPangoAttrStipple ##### -->
 <para>
 A Pango text attribute containing a stipple bitmap to be used when
@@ -249,6 +257,15 @@ rendering the text.
 @attr: the #PangoAttribute.
 @stipple: the stipple bitmap.
 
+<!-- ##### FUNCTION gdk_pango_attr_emboss_color_new ##### -->
+<para>
+
+</para>
+
+@color: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_pango_attr_embossed_new ##### -->
 <para>
 

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -164,7 +164,7 @@ Deprecated equivalent of g_object_unref().
 
 
 
-<!-- ##### STRUCT GdkBitmap ##### -->
+<!-- ##### TYPEDEF GdkBitmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable of depth
 1. Pointers to structures of type #GdkPixmap, #GdkBitmap, and
@@ -172,7 +172,6 @@ An opaque structure representing an offscreen drawable of depth
 refers generically to any of these types.
 </para>
 
-@user_data: 
 
 <!-- ##### MACRO gdk_bitmap_ref ##### -->
 <para>

docs/reference/gdk/tmpl/rgb.sgml

@@ -12,7 +12,7 @@ colormap images to a #GdkDrawable. It does this as efficiently as
 possible, handling issues such as colormaps, visuals, dithering,
 temporary buffers, and so on. Most code should use the higher-level
 #GdkPixbuf features in place of this module; for example,
-gdk_pixbuf_render_to_drawable() uses GdkRGB in its implementation.
+gdk_draw_pixbuf() uses GdkRGB in its implementation.
 </para>
 
 <para>
@@ -34,6 +34,13 @@ created in grayscale and direct color modes, and the visual is changed
 in cases where a "better" visual than the default is available.
 </para>
 
+<para>
+If GDK is built with the Sun mediaLib library, the GdkRGB functions are
+accelerated using mediaLib, which provides hardware acceleration on Intel,
+AMD, and Sparc chipsets.  If desired, mediaLib support can be turned off
+by setting the GDK_DISABLE_MEDIALIB environment variable.
+</para>
+
 <example>
 <title>A simple example program using GdkRGB</title>
 <programlisting>
@@ -107,7 +114,7 @@ colors.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term>#GdkPixbuf and gdk_pixbuf_render_to_drawable()</term>
+<term>#GdkPixbuf and gdk_draw_pixbuf()</term>
 <listitem><para>Higher-level image handling.</para></listitem>
 </varlistentry>
 
@@ -318,8 +325,8 @@ A private data structure which maps color indices to actual RGB
 colors. This is used only for gdk_draw_indexed_image().
 </para>
 
-@colors: 
-@n_colors: 
+@colors: The colors, represented as 0xRRGGBB integer values.
+@n_colors: The number of colors in the cmap.
 
 <!-- ##### FUNCTION gdk_rgb_gc_set_foreground ##### -->
 <para>

docs/reference/gdk/tmpl/threads.sgml

@@ -31,12 +31,14 @@ You must call g_thread_init() and gdk_threads_init() before executing
 any other GTK+ or GDK functions in a threaded GTK+ program.
 </para>
 <para>
-Idles, timeouts, and input functions are executed outside
-of the main GTK+ lock. So, if you need to call GTK+
-inside of such a callback, you must surround the callback
-with a gdk_threads_enter()/gdk_threads_leave() pair.
-(However, signals are still executed within the main
-GTK+ lock.)
+Idles, timeouts, and input functions from GLib, such as g_idle_add(), are
+executed outside of the main GTK+ lock.
+So, if you need to call GTK+ inside of such a callback, you must surround
+the callback with a gdk_threads_enter()/gdk_threads_leave() pair or use
+gdk_threads_add_idle_full() which does this for you.
+However, event dispatching from the mainloop is still executed within
+the main GTK+ lock, so callback functions connected to event signals
+like GtkWidget::button-press-event, do not need thread protection.
 </para>
 <para>
 In particular, this means, if you are writing widgets that might 
@@ -251,11 +253,12 @@ int main (int argc, char *argv[])
 
 <!-- ##### MACRO GDK_THREADS_ENTER ##### -->
 <para>
-This macro marks the beginning of a critical section in which GDK and GTK+
-functions can be called.  Only one thread at a time can be in such a
-critial section. The macro expands to a no-op if #G_THREADS_ENABLED
-has not been defined. Typically gdk_threads_enter() should be used 
-instead of this macro.
+This macro marks the beginning of a critical section in which GDK and
+GTK+ functions can be called safely and without causing race
+conditions.  Only one thread at a time can be in such a critial
+section. The macro expands to a no-op if #G_THREADS_ENABLED has not
+been defined. Typically gdk_threads_enter() should be used instead of
+this macro.
 </para>
 
 
@@ -277,9 +280,9 @@ begun with #GDK_THREADS_ENTER.
 
 <!-- ##### FUNCTION gdk_threads_enter ##### -->
 <para>
-This macro marks the beginning of a critical section
-in which GDK and GTK+ functions can be called.
-Only one thread at a time can be in such a critial 
+This macro marks the beginning of a critical section in which GDK and
+GTK+ functions can be called safely and without causing race
+conditions.  Only one thread at a time can be in such a critial
 section.
 </para>
 
@@ -308,3 +311,49 @@ gdk_threads_enter()/gdk_threads_leave().
 @leave_fn: 
 
 
+<!-- ##### FUNCTION gdk_threads_add_idle ##### -->
+<para>
+
+</para>
+
+@function: 
+@data: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_threads_add_idle_full ##### -->
+<para>
+
+</para>
+
+@priority: 
+@function: 
+@data: 
+@notify: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_threads_add_timeout ##### -->
+<para>
+
+</para>
+
+@interval: 
+@function: 
+@data: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_threads_add_timeout_full ##### -->
+<para>
+
+</para>
+
+@priority: 
+@interval: 
+@function: 
+@data: 
+@notify: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/windows.sgml

@@ -12,6 +12,164 @@ GTK+ level. A #GtkWindow is a toplevel window, the thing a user might think of
 as a "window" with a titlebar and so on; a #GtkWindow may contain many #GdkWindow. 
 For example, each #GtkButton has a #GdkWindow associated with it.
 </para>
+<example id="composited-window-example"><title>Composited windows</title>
+<programlisting><![CDATA[
+#include <gtk/gtk.h>
+
+/* The expose event handler for the event box.
+ *
+ * This function simply draws a transparency onto a widget on the area
+ * for which it receives expose events.  This is intended to give the
+ * event box a "transparent" background.
+ *
+ * In order for this to work properly, the widget must have an RGBA
+ * colourmap.  The widget should also be set as app-paintable since it
+ * doesn't make sense for GTK+ to draw a background if we are drawing it
+ * (and because GTK+ might actually replace our transparency with its
+ * default background colour).
+ */
+static gboolean
+transparent_expose (GtkWidget      *widget,
+                    GdkEventExpose *event)
+{
+  cairo_t *cr;
+
+  cr = gdk_cairo_create (widget->window);
+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+  gdk_cairo_region (cr, event->region);
+  cairo_fill (cr);
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+/* The expose event handler for the window.
+ *
+ * This function performs the actual compositing of the event box onto
+ * the already-existing background of the window at 50% normal opacity.
+ *
+ * In this case we do not want app-paintable to be set on the widget
+ * since we want it to draw its own (red) background. Because of this,
+ * however, we must ensure that we use g_signal_register_after so that
+ * this handler is called after the red has been drawn. If it was
+ * called before then GTK would just blindly paint over our work.
+ *
+ * Note: if the child window has children, then you need a cairo 1.16
+ * feature to make this work correctly.
+ */
+static gboolean
+window_expose_event (GtkWidget      *widget,
+                     GdkEventExpose *event)
+{
+  GdkRegion *region;
+  GtkWidget *child;
+  cairo_t *cr;
+
+  /* get our child (in this case, the event box) */ 
+  child = gtk_bin_get_child (GTK_BIN (widget));
+
+  /* create a cairo context to draw to the window */
+  cr = gdk_cairo_create (widget->window);
+
+  /* the source data is the (composited) event box */
+  gdk_cairo_set_source_pixmap (cr, child->window,
+                               child->allocation.x,
+                               child->allocation.y);
+
+  /* draw no more than our expose event intersects our child */
+  region = gdk_region_rectangle (&child->allocation);
+  gdk_region_intersect (region, event->region);
+  gdk_cairo_region (cr, region);
+  cairo_clip (cr);
+
+  /* composite, with a 50% opacity */
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+  cairo_paint_with_alpha (cr, 0.5);
+
+  /* we're done */
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+int
+main (int argc, char **argv)
+{
+  GtkWidget *window, *event, *button;
+  GdkScreen *screen;
+  GdkColormap *rgba;
+  GdkColor red;
+
+  gtk_init (&argc, &argv);
+
+  /* Make the widgets */
+  button = gtk_button_new_with_label ("A Button");
+  event = gtk_event_box_new ();
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+  /* Put a red background on the window */
+  gdk_color_parse ("red", &red);
+  gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &red);
+
+  /* Set the colourmap for the event box.
+   * Must be done before the event box is realised.
+   */
+  screen = gtk_widget_get_screen (event);
+  rgba = gdk_screen_get_rgba_colormap (screen);
+  gtk_widget_set_colormap (event, rgba);
+
+  /* Set our event box to have a fully-transparent background
+   * drawn on it. Currently there is no way to simply tell GTK+
+   * that "transparency" is the background colour for a widget.
+   */
+  gtk_widget_set_app_paintable (GTK_WIDGET (event), TRUE);
+  g_signal_connect (event, "expose-event",
+                    G_CALLBACK (transparent_expose), NULL);
+
+  /* Put them inside one another */
+  gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+  gtk_container_add (GTK_CONTAINER (window), event);
+  gtk_container_add (GTK_CONTAINER (event), button);
+
+  /* Realise and show everything */
+  gtk_widget_show_all (window);
+
+  /* Set the event box GdkWindow to be composited.
+   * Obviously must be performed after event box is realised.
+   */
+  gdk_window_set_composited (event->window, TRUE);
+
+  /* Set up the compositing handler.
+   * Note that we do _after_ so that the normal (red) background is drawn
+   * by gtk before our compositing occurs.
+   */
+  g_signal_connect_after (window, "expose-event",
+                          G_CALLBACK (window_expose_event), NULL);
+
+  gtk_main (<!-- -->);
+
+  return 0;
+}
+]]>
+</programlisting></example>
+<para>
+In the example <xref linkend="composited-window-example"/>, a button is 
+placed inside of an event box inside of a window. The event box is 
+set as composited and therefore is no longer automatically drawn to 
+the screen. 
+</para>
+<para>
+When the contents of the event box change, an expose event is
+generated on its parent window (which, in this case, belongs to
+the toplevel #GtkWindow). The expose handler for this widget is
+responsible for merging the changes back on the screen in the way
+that it wishes.
+</para>
+<para>
+In our case, we merge the contents with a 50% transparency. We
+also set the background colour of the window to red. The effect is
+that the background shows through the button. 
+</para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
@@ -38,7 +196,7 @@ Describes the kind of window.
 
 @GDK_WINDOW_ROOT: root window; this window has no parent, covers the entire screen, and is created by the window system
 @GDK_WINDOW_TOPLEVEL: toplevel window (used to implement #GtkWindow)
-@GDK_WINDOW_CHILD: child window (used to implement e.g. #GtkButton)
+@GDK_WINDOW_CHILD: child window (used to implement e.g. #GtkEntry)
 @GDK_WINDOW_DIALOG: useless/deprecated compatibility type
 @GDK_WINDOW_TEMP: override redirect temporary window (used to implement #GtkMenu)
 @GDK_WINDOW_FOREIGN: foreign window (see gdk_window_foreign_new())
@@ -202,7 +360,8 @@ window types.
 
 @GDK_WINDOW_TYPE_HINT_NORMAL: Normal toplevel window.
 @GDK_WINDOW_TYPE_HINT_DIALOG: Dialog window.
-@GDK_WINDOW_TYPE_HINT_MENU: Window used to implement a menu.
+@GDK_WINDOW_TYPE_HINT_MENU: Window used to implement a menu; GTK+ uses 
+  this hint only for torn-off menus, see #GtkTearoffMenuItem.
 @GDK_WINDOW_TYPE_HINT_TOOLBAR: Window used to implement toolbars.
 @GDK_WINDOW_TYPE_HINT_SPLASHSCREEN: Window used to display a splash 
   screen during application startup.
@@ -211,12 +370,14 @@ window types.
 @GDK_WINDOW_TYPE_HINT_DOCK: Used for creating dock or panel windows.
 @GDK_WINDOW_TYPE_HINT_DESKTOP: Used for creating the desktop background 
 window.
-@GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU: 
-@GDK_WINDOW_TYPE_HINT_POPUP_MENU: 
-@GDK_WINDOW_TYPE_HINT_TOOLTIP: 
-@GDK_WINDOW_TYPE_HINT_NOTIFICATION: 
-@GDK_WINDOW_TYPE_HINT_COMBO: 
-@GDK_WINDOW_TYPE_HINT_DND: 
+@GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU: A menu that belongs to a menubar.
+@GDK_WINDOW_TYPE_HINT_POPUP_MENU: A menu that does not belong to a menubar, 
+  e.g. a context menu.
+@GDK_WINDOW_TYPE_HINT_TOOLTIP: A tooltip.
+@GDK_WINDOW_TYPE_HINT_NOTIFICATION: A notification - typically a "bubble" 
+  that belongs to a status icon.
+@GDK_WINDOW_TYPE_HINT_COMBO: A popup from a combo box.
+@GDK_WINDOW_TYPE_HINT_DND: A window that is used to implement a DND cursor.
 
 <!-- ##### STRUCT GdkWindowAttr ##### -->
 <para>
@@ -237,6 +398,7 @@ Attributes to use for a newly-created window.
 @wmclass_name: don't use (see gtk_window_set_wmclass())
 @wmclass_class: don't use (see gtk_window_set_wmclass())
 @override_redirect: %TRUE to bypass the window manager
+@type_hint: a hint of the function of the window
 
 <!-- ##### ENUM GdkWindowAttributesType ##### -->
 <para>
@@ -256,6 +418,7 @@ corresponding flag in #GdkWindowAttributesType.
 @GDK_WA_VISUAL: Honor the visual field
 @GDK_WA_WMCLASS: Honor the wmclass_class and wmclass_name fields
 @GDK_WA_NOREDIR: Honor the override_redirect field
+@GDK_WA_TYPE_HINT: Honor the type_hint field
 
 <!-- ##### FUNCTION gdk_window_new ##### -->
 <para>
@@ -451,6 +614,24 @@ Deprecated equivalent of g_object_unref()
 @setting: 
 
 
+<!-- ##### FUNCTION gdk_window_set_opacity ##### -->
+<para>
+
+</para>
+
+@window: 
+@opacity: 
+
+
+<!-- ##### FUNCTION gdk_window_set_composited ##### -->
+<para>
+
+</para>
+
+@window: 
+@composited: 
+
+
 <!-- ##### FUNCTION gdk_window_move ##### -->
 <para>
 
@@ -638,6 +819,14 @@ Registers a window as a potential drop destination.
 @new_height: 
 
 
+<!-- ##### FUNCTION gdk_window_beep ##### -->
+<para>
+
+</para>
+
+@window: 
+
+
 <!-- ##### FUNCTION gdk_window_begin_paint_rect ##### -->
 <para>
 
@@ -1341,6 +1530,15 @@ or %GDK_META_MASK in the state field of key events.
 @role: 
 
 
+<!-- ##### FUNCTION gdk_window_set_startup_id ##### -->
+<para>
+
+</para>
+
+@window: 
+@startup_id: 
+
+
 <!-- ##### FUNCTION gdk_window_set_group ##### -->
 <para>
 

docs/reference/gdk/tmpl/x_interaction.sgml

@@ -515,6 +515,25 @@ Since: 2.2
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_x11_display_broadcast_startup_message ##### -->
+<para>
+
+</para>
+
+@display: 
+@message_type: 
+@Varargs: 
+
+
+<!-- ##### FUNCTION gdk_x11_display_get_startup_notification_id ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_x11_display_get_xdisplay ##### -->
 <para>
 

docs/reference/gtk/Makefile.am

@@ -27,6 +27,7 @@ IGNORE_HFILES=				\
 	fnmatch.h			\
 	gdk-pixbuf-loader.h		\
 	gtkdebug.h			\
+	gtkbuilderprivate.h		\
 	gtkdndcursors.h			\
 	gtkentryprivate.h		\
 	gtkfilechooserdefault.h		\
@@ -41,6 +42,7 @@ IGNORE_HFILES=				\
 	gtkfilesystemwin32.h		\
 	gtkhsv.h			\
 	gtkiconcache.h			\
+        gtkiconcachevalidator.h         \
 	gtkiconthemeparser.h		\
 	gtkimmodule.h			\
 	gtkintl.h			\
@@ -58,15 +60,21 @@ IGNORE_HFILES=				\
 	gtkprintutils.h			\
 	gtkprintoperation-private.h	\
 	gtkprivate.h			\
+	gtkquery.h			\
 	gtkrbtree.h			\
 	gtkrecentchooserdefault.h	\
 	gtkrecentchooserutils.h		\
 	gtkrecentchooserprivate.h	\
+	gtksearchengine.h		\
+	gtksearchenginebeagle.h		\
+	gtksearchenginetracker.h	\
+	gtksearchenginesimple.h		\
+	gtksearchenginequartz.h		\
 	gtksequence.h			\
 	gtksocketprivate.h		\
-	gtktreedatalist.h		\
-	gtktreeprivate.h		\
 	gtktextbtree.h			\
+	gtktextbufferserializ.h		\
+	gtktextchildprivate.h		\
 	gtktextdisplay.h		\
 	gtktextiterprivate.h		\
 	gtktextlayout.h			\
@@ -75,12 +83,16 @@ IGNORE_HFILES=				\
 	gtktexttagprivate.h		\
 	gtktexttypes.h			\
 	gtktextutil.h			\
+	gtkthemes.h			\
 	gtktoggleactionprivate.h	\
 	gtktrayicon.h			\
+	gtktreedatalist.h		\
+	gtktreeprivate.h		\
 	gtktypebuiltins.h		\
 	gtkxembed.h			\
 	gtkwin32embed.h			\
 	gtkwin32embedwidget.h		\
+	gtkwindow-decorate.h		\
 	xdgmime				\
 	xembed.h
 
@@ -112,7 +124,6 @@ content_files =					\
 	changes-2.0.sgml			\
 	compiling.sgml				\
 	directfb.sgml				\
-	framebuffer.sgml			\
 	glossary.xml				\
 	migrating-checklist.sgml		\
 	migrating-GtkAction.sgml		\
@@ -124,6 +135,8 @@ content_files =					\
 	migrating-GtkAssistant.sgml		\
 	migrating-GtkRecentChooser.sgml 	\
 	migrating-GtkLinkButton.sgml		\
+	migrating-GtkBuilder.sgml		\
+        migrating-GtkTooltip.sgml		\
 	objects_grouped.sgml			\
 	osx.sgml				\
 	question_index.sgml			\
@@ -134,6 +147,7 @@ content_files =					\
 	x11.sgml				\
 	gtk-query-immodules-2.0.xml		\
 	gtk-update-icon-cache.xml		\
+	gtk-builder-convert.xml			\
 	visual_index.xml
 
 expand_content_files = 				\
@@ -148,6 +162,8 @@ expand_content_files = 				\
 	migrating-GtkAssistant.sgml		\
 	migrating-GtkRecentChooser.sgml 	\
 	migrating-GtkLinkButton.sgml		\
+	migrating-GtkBuilder.sgml		\
+	migrating-GtkTooltip.sgml		\
 	tree_widget.sgml			\
 	text_widget.sgml			\
 	question_index.sgml
@@ -304,10 +320,17 @@ HTML_IMAGES = \
 	$(srcdir)/images/statusbar.png					\
 	$(srcdir)/images/toggle-button.png				\
 	$(srcdir)/images/toolbar.png					\
+	$(srcdir)/images/tree-view-coordinates.png			\
+	$(srcdir)/images/volumebutton.png				\
 	$(srcdir)/images/window.png
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+	--extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \
+	--extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
+	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
 
 include $(top_srcdir)/gtk-doc.make
 
@@ -316,7 +339,7 @@ EXTRA_DIST += version.xml.in
 
 ########################################################################
 
-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 
+man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
 
 if ENABLE_MAN
 

docs/reference/gtk/building.sgml

@@ -45,11 +45,12 @@ How to compile GTK+ itself
       of the tools are already included in the source packages. But
       it's useful to know a bit about how packages that use these
       tools work. A source package is distributed as a
-      <literal>tar.gz</literal> file which you unpack into a 
-      directory full of the source files as follows:
+      <literal>tar.gz</literal> or <literal>tar.bz2</literal> file 
+      which you unpack into a directory full of the source files as follows:
     </para>
     <programlisting>
       tar xvfz gtk+-2.0.0.tar.gz
+      tar xvfj gtk+-2.0.0.tar.bz2
     </programlisting>
     <para>
       In the toplevel of the directory that is created, there will be
@@ -142,7 +143,7 @@ How to compile GTK+ itself
           needed for that library along with version number information.)  
           The version of <command>pkg-config</command> needed to build 
           GTK+ is mirrored in the <filename>dependencies</filename> directory
-	  on the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP
+	  on the <ulink url="ftp://ftp.gtk.org/pub/gtk/">GTK+ FTP
 	  site.</ulink>
 	</para>
       </listitem>
@@ -331,6 +332,10 @@ How to compile GTK+ itself
 	    <arg>--disable-xkb</arg>
 	    <arg>--enable-xkb</arg>
 	  </group>
+          <group>
+	    <arg>--disable-xinerama</arg>
+	    <arg>--enable-xinerama</arg>
+	  </group>
 	  <group>
 	    <arg>--disable-gtk-doc</arg>
 	    <arg>--enable-gtk-doc</arg>
@@ -339,11 +344,7 @@ How to compile GTK+ itself
             <arg>--with-xinput=[no|yes]</arg>
           </group>
 	  <group>
-	    <arg>--with-gdktarget=[x11|linux-fb|win32]</arg>
-	  </group>
-	  <group>
-	    <arg>--disable-shadowfb</arg>
-	    <arg>--enable-shadowfb</arg>
+	    <arg>--with-gdktarget=[x11|win32|quartz|directfb]</arg>
 	  </group>
 	</cmdsynopsis>
       </para>
@@ -480,6 +481,18 @@ How to compile GTK+ itself
         </para>
       </formalpara>
 
+      <formalpara>
+        <title><systemitem>--disable-xinerama</systemitem> and
+          <systemitem>--enable-xinerama</systemitem></title>
+     
+        <para>
+          By default the <command>configure</command> script will try
+          to link against the Xinerama libraries if they are found.
+          These options can be used to explicitly control whether
+          Xinerama should be used.
+        </para>
+      </formalpara>
+
       <formalpara>
 	<title><systemitem>--disable-gtk-doc</systemitem> and
 	  <systemitem>--enable-gtk-doc</systemitem></title>
@@ -519,17 +532,9 @@ How to compile GTK+ itself
 	<para>
           Toggles between the supported backends for GDK. 
           The default is x11, unless the platform is Windows, in which
-	  case the default is win32.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title><systemitem>--disable-shadowfb</systemitem> and
-	  <systemitem>--enable-shadowfb</systemitem></title>
-
-	<para>
-         Toggles shadow framebuffer support for the linux-fb target, 
-         if selected.
+	  case the default is win32. Other supported backends are
+          the quartz backend for OS X, and the DirectFB backend
+          for the Linux framebuffer.
 	</para>
       </formalpara>
 

docs/reference/gtk/compiling.sgml

@@ -42,14 +42,6 @@ $ cc `pkg-config --cflags --libs gtk+-2.0` hello.c -o hello
 </programlisting>
 </para>
 
-<para>
-To compile a GTK+ program for the framebuffer, use the
-"gtk+-linux-fb-2.0" package name instead of "gtk+-2.0":
-<programlisting>
-$ cc `pkg-config --cflags --libs gtk+-linux-fb-2.0` hello.c -o hello
-</programlisting>
-</para>
-
 <para>
 If you want to make sure that your program doesn't use any deprecated 
 functions, you can define the preprocessor symbol GTK_DISABLE_DEPRECATED

docs/reference/gtk/directfb.sgml

@@ -31,75 +31,10 @@ system.
 <refsect2><title>Build requirements</title>
 
 <para>
-Beyond the usual GTK+ build requirements, the DirectFB backend (obviously) needs 
-the DirectFB libraries (at least 0.9.21) and Cairo compiled with DirectFB support.
+Beyond the usual GTK+ build requirements, the DirectFB backend (obviously) 
+needs the DirectFB libraries (at least 0.9.21) and cairo compiled with 
+DirectFB support.
 </para>
-
 </refsect2>
-
-<!--
-  FIXME: it seems most of the options listed in _gdk_windowing_args
-  are ignored, and they need to be described by somebody who knows 
-  what they are supposed to do...
-
-<refsect2><title>DirectFB-specific commandline options</title>
-
-<para>
-The DirectFB GDB backend can be influenced with some additional 
-command line arguments.
-</para>
-
-<formalpara>
-  <title><systemitem>dfb-help</systemitem></title>
-  <para>
-    Display help for DirectFB-specific commandline options.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>dfb=<replaceable>value</replaceable></systemitem></title>
-  <para>
-    Possible values: sdl, system. 
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>disable-aa-fonts=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    If <replaceable>number</replaceable> is 1, disable antialising for fonts.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>argb-font=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    If <replaceable>number</replaceable> is 1, enable ARGB fonts.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>transparent-unfocused=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    If <replaceable>number</replaceable> is 1, make unfocused windows transparent.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>glyph-surface-cache=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    Set the size of the glyph surface cache. The default value is 8.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>enable-color-keyring=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    If <replaceable>number</replaceable> is 1, turn on the color keyring.
-  </para>
-</formalpara>
-
--->
-
 </refsect1>
-
 </refentry>

docs/reference/gtk/glossary.xml

@@ -95,6 +95,17 @@
     </glossdef>
   </glossentry>
 
+  <glossentry id="ellipsization">
+    <glossdef>
+      <para>
+        Ellipsization is the process of replacing some part
+        of a text by an ellipsis (usually "...") to make the
+        text fit in a smaller space. Pango can ellipsize text
+        at the beginning, at the end or in the middle.
+      </para>
+    </glossdef>
+  </glossentry>
+
   <glossentry id="event">
     <glossterm>event</glossterm>
     <glossdef>

docs/reference/gtk/gtk-builder-convert.1

@@ -0,0 +1,43 @@
+.\"     Title: gtk-builder-convert
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\"      Date: 07/10/2007
+.\"    Manual: 
+.\"    Source: 
+.\"
+.TH "GTK\-BUILDER\-CONVERT" "1" "07/10/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+gtk\-builder\-convert \- Glade file conversion utility
+.SH "SYNOPSIS"
+.HP 20
+\fBgtk\-builder\-convert\fR [\-\-skip\-windows] [\-\-root\ \fIname\fR] {input} {output}
+.SH "DESCRIPTION"
+.PP
+\fBgtk\-builder\-convert\fR
+converts glade files into XML files which can be loaded with #GtkBuilder.
+.PP
+It expects the name of a glade file as the first argument, and writes its output the file specified as the second argument.
+.SH "OPTIONS"
+.PP
+\-\-skip\-windows, \-w
+.RS 4
+Convert everything but GtkWindow subclasses.
+.RE
+.PP
+\-\-root, \-r
+.RS 4
+Convert only the widget named
+\fIname\fR
+and its children.
+.RE
+.SH "BUGS"
+.PP
+Toolbars are not handled.
+.PP
+Support for accessibility is not yet implemented.
+.PP
+The script requires a python interpreter to run.

docs/reference/gtk/gtk-builder-convert.xml

@@ -0,0 +1,61 @@
+<refentry id="gtk-builder-convert">
+
+<refmeta>
+<refentrytitle>gtk-builder-convert</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>gtk-builder-convert</refname>
+<refpurpose>Glade file conversion utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk-builder-convert</command>
+<arg choice="opt">--skip-windows</arg>
+<arg choice="opt">--root <replaceable>name</replaceable></arg>
+<arg choice="req">input</arg>
+<arg choice="req">output</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para><command>gtk-builder-convert</command> converts glade files
+into XML files which can be loaded with GtkBuilder.
+</para>
+<para>
+It expects the name of a glade file as the first argument, and writes
+its output the file specified as the second argument.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>--skip-windows</term>
+    <term>-w</term>
+    <listitem><para>Convert everything but GtkWindow subclasses.</para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>--root</term>
+    <term>-r</term>
+    <listitem><para>Convert only the widget named <replaceable>name</replaceable> 
+       and its children.</para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1><title>Bugs</title>
+<para>
+Toolbars are not handled.
+</para>
+<para>
+Support for accessibility is not yet implemented.
+</para>
+<para>
+The script requires a python interpreter to run.
+</para>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk-docs.sgml

@@ -14,6 +14,8 @@
 <!ENTITY GtkBin SYSTEM "xml/gtkbin.xml">
 <!ENTITY GtkBox SYSTEM "xml/gtkbox.xml">
 <!ENTITY GtkButton SYSTEM "xml/gtkbutton.xml">
+<!ENTITY GtkBuildable SYSTEM "xml/gtkbuildable.xml">
+<!ENTITY GtkBuilder SYSTEM "xml/gtkbuilder.xml">
 <!ENTITY GtkCalendar SYSTEM "xml/gtkcalendar.xml">
 <!ENTITY GtkCheckButton SYSTEM "xml/gtkcheckbutton.xml">
 <!ENTITY GtkCheckMenuItem SYSTEM "xml/gtkcheckmenuitem.xml">
@@ -106,8 +108,10 @@
 <!ENTITY GtkRecentChooserWidget SYSTEM "xml/gtkrecentchooserwidget.xml">
 <!ENTITY GtkRecentFilter SYSTEM "xml/gtkrecentfilter.xml">
 <!ENTITY GtkRecentManager SYSTEM "xml/gtkrecentmanager.xml">
+<!ENTITY GtkRecentAction SYSTEM "xml/gtkrecentaction.xml">
 <!ENTITY GtkRuler SYSTEM "xml/gtkruler.xml">
 <!ENTITY GtkScale SYSTEM "xml/gtkscale.xml">
+<!ENTITY GtkScaleButton SYSTEM "xml/gtkscalebutton.xml">
 <!ENTITY GtkScrollbar SYSTEM "xml/gtkscrollbar.xml">
 <!ENTITY GtkScrolledWindow SYSTEM "xml/gtkscrolledwindow.xml">
 <!ENTITY GtkSeparator SYSTEM "xml/gtkseparator.xml">
@@ -135,6 +139,7 @@
 <!ENTITY GtkToolButton SYSTEM "xml/gtktoolbutton.xml">
 <!ENTITY GtkToolItem SYSTEM "xml/gtktoolitem.xml">
 <!ENTITY GtkTooltips SYSTEM "xml/gtktooltips.xml">
+<!ENTITY GtkTooltip SYSTEM "xml/gtktooltip.xml">
 <!ENTITY GtkTree SYSTEM "xml/gtktree.xml">
 <!ENTITY GtkTreeItem SYSTEM "xml/gtktreeitem.xml">
 <!ENTITY GtkTreeModel SYSTEM "xml/gtktreemodel.xml">
@@ -162,6 +167,7 @@
 <!ENTITY GtkVButtonBox SYSTEM "xml/gtkvbbox.xml">
 <!ENTITY GtkVBox SYSTEM "xml/gtkvbox.xml">
 <!ENTITY GtkViewport SYSTEM "xml/gtkviewport.xml">
+<!ENTITY GtkVolumeButton SYSTEM "xml/gtkvolumebutton.xml">
 <!ENTITY GtkVPaned SYSTEM "xml/gtkvpaned.xml">
 <!ENTITY GtkVRuler SYSTEM "xml/gtkvruler.xml">
 <!ENTITY GtkVScale SYSTEM "xml/gtkvscale.xml">
@@ -202,7 +208,6 @@
 <!ENTITY gtk-Running SYSTEM "running.sgml">
 <!ENTITY gtk-Resources SYSTEM "resources.sgml">
 <!ENTITY gtk-Windows SYSTEM "windows.sgml">
-<!ENTITY gtk-Framebuffer SYSTEM "framebuffer.sgml">
 <!ENTITY gtk-X11 SYSTEM "x11.sgml">
 <!ENTITY gtk-OSX SYSTEM "osx.sgml">
 <!ENTITY gtk-DirectFB SYSTEM "directfb.sgml">
@@ -220,9 +225,12 @@
 <!ENTITY gtk-migrating-GtkAssistant SYSTEM "xml/migrating-GtkAssistant.sgml">
 <!ENTITY gtk-migrating-GtkRecentChooser SYSTEM "xml/migrating-GtkRecentChooser.sgml">
 <!ENTITY gtk-migrating-GtkLinkButton SYSTEM "xml/migrating-GtkLinkButton.sgml">
+<!ENTITY gtk-migrating-GtkBuilder SYSTEM "xml/migrating-GtkBuilder.sgml">
+<!ENTITY gtk-migrating-GtkTooltip SYSTEM "xml/migrating-GtkTooltip.sgml">
 <!ENTITY version SYSTEM "version.xml">
 <!ENTITY gtk-query-immodules SYSTEM "gtk-query-immodules-2.0.xml">
 <!ENTITY gtk-update-icon-cache SYSTEM "gtk-update-icon-cache.xml">
+<!ENTITY gtk-builder-convert SYSTEM "gtk-builder-convert.xml">
 <!ENTITY gtk-glossary SYSTEM "xml/glossary.xml">
 ]>
 <book id="index">
@@ -260,38 +268,31 @@ string utilities, file utilities, a main loop abstraction, and so on.
 <varlistentry>
 <term>Pango</term>
 <listitem><para>
-
 Pango is a library for internationalized text handling. It centers
-around the <link linkend="PangoLayout">PangoLayout</link> object, representing
-a paragraph of text. 
-Pango provides the engine for <link linkend="GtkTextView">GtkTextView</link>, 
-<link linkend="GtkLabel">GtkLabel</link>, 
-<link linkend="GtkEntry">GtkEntry</link>, and
+around the #PangoLayout object, representing a paragraph of text. 
+Pango provides the engine for #GtkTextView, #GtkLabel, #GtkEntry, and
 other widgets that display text.
-
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>ATK</term>
 <listitem><para>
-
 ATK is the Accessibility Toolkit. It provides a set of generic
 interfaces allowing accessibility technologies to interact with a
 graphical user interface. For example, a screen reader uses ATK to
 discover the text in an interface and read it to blind users.  GTK+
 widgets have built-in support for accessibility using the ATK
 framework.
-
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>GdkPixbuf</term>
 <listitem><para>
-This is a small library which allows you to create <link linkend="GdkPixbuf">GdkPixbuf</link>
+This is a small library which allows you to create #GdkPixbuf
 ("pixel buffer") objects from image data or image files. 
-Use a <link linkend="GdkPixbuf">GdkPixbuf</link> in combination with <link linkend="GtkImage">GtkImage</link> to display images.
+Use a #GdkPixbuf in combination with #GtkImage to display images.
 </para></listitem>
 </varlistentry>
 
@@ -307,11 +308,8 @@ on X11, Windows, and the Linux framebuffer device.
 <varlistentry>
 <term>GTK+</term>
 <listitem><para>
-
 The GTK+ library itself contains <firstterm>widgets</firstterm>, 
-that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or 
-<link linkend="GtkTextView">GtkTextView</link>.
-
+that is, GUI components such as #GtkButton or #GtkTextView.
 </para></listitem>
 </varlistentry>
 </variablelist>
@@ -324,7 +322,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
     &gtk-Windows;
     &gtk-OSX;
     &gtk-DirectFB;
-    &gtk-Framebuffer;
     &gtk-Resources;
     &gtk-Questions;
   </part>
@@ -393,6 +390,8 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkRadioButton;
         &GtkToggleButton;
         &GtkLinkButton;
+        &GtkScaleButton;
+	&GtkVolumeButton;
     </chapter>
 
     <chapter id="NumericEntry">
@@ -450,7 +449,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkMenu;
         &GtkMenuBar;
         &GtkMenuItem;
-        &GtkMenuShell;
 	&GtkImageMenuItem;
         &GtkRadioMenuItem;
         &GtkCheckMenuItem;      
@@ -472,6 +470,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkAction;
         &GtkToggleAction;
         &GtkRadioAction;
+        &GtkRecentAction;
     </chapter>
 
     <chapter id="SelectorWidgets">
@@ -479,7 +478,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkColorButton;
         &GtkColorSelection;
         &GtkColorSelectionDialog;
-        &GtkFileSelection;
 	&GtkFileChooser;
 	&GtkFileChooserButton;
 	&GtkFileChooserDialog;
@@ -546,7 +544,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkIMContextSimple;
         &GtkIMMulticontext;
         &GtkSizeGroup;
-        &GtkTooltips;
+        &GtkTooltip;
         &GtkViewport;
         &GtkAccessible;
     </chapter>
@@ -558,6 +556,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkButtonBox;
         &GtkContainer;
         &GtkItem;
+        &GtkMenuShell;
         &GtkMisc;
         &GtkObject;
         &GtkPaned;
@@ -594,11 +593,18 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
       &GtkRecentFilter;
     </chapter>
 
+    <chapter id="Builder">
+      <title>Interface builder</title>
+      &GtkBuildable;
+      &GtkBuilder;
+    </chapter>
+
     <chapter id="DeprecatedObjects">
       <title>Deprecated</title>
         &GtkCList;      
         &GtkCTree;
         &GtkCombo;
+        &GtkFileSelection;
         &GtkItemFactory;
         &GtkList;
         &GtkListItem;
@@ -608,6 +614,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkPreview;
         &GtkProgress;
         &GtkText;
+        &GtkTooltips;
         &GtkTipsQuery;
         &GtkTree;
         &GtkTreeItem;
@@ -639,6 +646,8 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
     &gtk-migrating-GtkAssistant;
     &gtk-migrating-GtkRecentChooser;
     &gtk-migrating-GtkLinkButton;
+    &gtk-migrating-GtkBuilder;
+    &gtk-migrating-GtkTooltip;
   </part>
 
   <part>
@@ -646,6 +655,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
 
      &gtk-query-immodules;
      &gtk-update-icon-cache;
+     &gtk-builder-convert;
   </part>
 
   &gtk-glossary;
@@ -671,5 +681,8 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
   <index role="2.10">
     <title>Index of new symbols in 2.10</title>
   </index>  
+  <index role="2.12">
+    <title>Index of new symbols in 2.12</title>
+  </index>  
 
 </book>

docs/reference/gtk/gtk-sections.txt

@@ -8,6 +8,8 @@ GtkAboutDialog
 gtk_about_dialog_new
 gtk_about_dialog_get_name
 gtk_about_dialog_set_name
+gtk_about_dialog_get_program_name
+gtk_about_dialog_set_program_name
 gtk_about_dialog_get_version
 gtk_about_dialog_set_version
 gtk_about_dialog_get_copyright
@@ -178,6 +180,7 @@ gtk_action_activate
 gtk_action_create_icon
 gtk_action_create_menu_item
 gtk_action_create_tool_item
+gtk_action_create_menu
 gtk_action_connect_proxy
 gtk_action_disconnect_proxy
 gtk_action_get_proxies
@@ -428,6 +431,77 @@ GTK_BOX_GET_CLASS
 gtk_box_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkvscrollbar</FILE>
+<TITLE>GtkVScrollbar</TITLE>
+GtkVScrollbar
+gtk_vscrollbar_new
+<SUBSECTION Standard>
+GTK_VSCROLLBAR
+GTK_IS_VSCROLLBAR
+GTK_TYPE_VSCROLLBAR
+gtk_vscrollbar_get_type
+GTK_VSCROLLBAR_CLASS
+GTK_IS_VSCROLLBAR_CLASS
+GTK_VSCROLLBAR_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gtkbuildable</FILE>
+GtkBuildable
+GtkBuildableIface
+gtk_buildable_set_name
+gtk_buildable_get_name
+gtk_buildable_add_child
+gtk_buildable_set_buildable_property
+gtk_buildable_construct_child
+gtk_buildable_custom_tag_start
+gtk_buildable_custom_tag_end
+gtk_buildable_custom_finished
+gtk_buildable_parser_finished
+gtk_buildable_get_internal_child
+<SUBSECTION Standard>
+GTK_BUILDABLE
+GTK_IS_BUILDABLE
+GTK_TYPE_BUILDABLE
+gtk_buildable_get_type
+GTK_BUILDABLE_CLASS
+GTK_BUILDABLE_GET_IFACE
+</SECTION>
+
+<SECTION>
+<FILE>gtkbuilder</FILE>
+<TITLE>GtkBuilder</TITLE>
+GtkBuilder
+GtkBuilderConnectFunc
+GtkBuilderError
+gtk_builder_new
+gtk_builder_add_from_file
+gtk_builder_add_from_string
+gtk_builder_get_object
+gtk_builder_get_objects
+gtk_builder_connect_signals
+gtk_builder_connect_signals_full
+gtk_builder_set_translation_domain
+gtk_builder_get_translation_domain
+gtk_builder_get_type_from_name
+gtk_builder_value_from_string
+gtk_builder_value_from_string_type
+GTK_BUILDER_WARN_INVALID_CHILD_TYPE
+GTK_BUILDER_ERROR
+<SUBSECTION Standard>
+GTK_BUILDER
+GTK_IS_BUILDER
+GTK_TYPE_BUILDER
+GTK_BUILDER_CLASS
+GTK_IS_BUILDER_CLASS
+GTK_BUILDER_GET_CLASS
+<SUBSECTION Private>
+gtk_builder_get_type
+gtk_builder_error_quark
+GtkBuilderPrivate
+</SECTION>
+
 <SECTION>
 <FILE>gtkbutton</FILE>
 <TITLE>GtkButton</TITLE>
@@ -1138,6 +1212,8 @@ gtk_entry_get_max_length
 gtk_entry_get_visibility
 gtk_entry_set_completion
 gtk_entry_get_completion
+gtk_entry_set_cursor_hadjustment
+gtk_entry_get_cursor_hadjustment
 <SUBSECTION Standard>
 GTK_ENTRY
 GTK_IS_ENTRY
@@ -1162,6 +1238,7 @@ gtk_entry_completion_set_match_func
 gtk_entry_completion_set_minimum_key_length
 gtk_entry_completion_get_minimum_key_length
 gtk_entry_completion_complete
+gtk_entry_completion_get_completion_prefix
 gtk_entry_completion_insert_prefix
 gtk_entry_completion_insert_action_text
 gtk_entry_completion_insert_action_markup
@@ -1170,6 +1247,8 @@ gtk_entry_completion_set_text_column
 gtk_entry_completion_get_text_column
 gtk_entry_completion_set_inline_completion
 gtk_entry_completion_get_inline_completion
+gtk_entry_completion_set_inline_selection
+gtk_entry_completion_get_inline_selection
 gtk_entry_completion_set_popup_completion
 gtk_entry_completion_get_popup_completion
 gtk_entry_completion_set_popup_set_width
@@ -1703,6 +1782,7 @@ gtk_icon_view_set_pixbuf_column
 gtk_icon_view_get_pixbuf_column
 gtk_icon_view_get_path_at_pos
 gtk_icon_view_get_item_at_pos
+gtk_icon_view_convert_widget_to_bin_window_coords
 gtk_icon_view_set_cursor
 gtk_icon_view_get_cursor
 gtk_icon_view_selected_foreach
@@ -1731,6 +1811,11 @@ gtk_icon_view_unselect_all
 gtk_icon_view_item_activated
 gtk_icon_view_scroll_to_path
 gtk_icon_view_get_visible_range
+gtk_icon_view_set_tooltip_item
+gtk_icon_view_set_tooltip_cell
+gtk_icon_view_get_tooltip_context
+gtk_icon_view_set_tooltip_column
+gtk_icon_view_get_tooltip_column
 <SUBSECTION Dnd>
 GtkIconViewDropPosition
 gtk_icon_view_enable_model_drag_source
@@ -2413,6 +2498,8 @@ gtk_notebook_get_tab_detachable
 gtk_notebook_set_current_page
 gtk_notebook_set_group_id
 gtk_notebook_get_group_id
+gtk_notebook_set_group
+gtk_notebook_get_group
 GtkNotebookWindowCreationFunc
 gtk_notebook_set_window_creation_hook
 <SUBSECTION Standard>
@@ -2731,6 +2818,12 @@ gtk_radio_menu_item_get_type
 <FILE>gtkrange</FILE>
 <TITLE>GtkRange</TITLE>
 GtkRange
+gtk_range_get_fill_level
+gtk_range_get_restrict_to_fill_level
+gtk_range_get_show_fill_level
+gtk_range_set_fill_level
+gtk_range_set_restrict_to_fill_level
+gtk_range_set_show_fill_level
 gtk_range_get_adjustment
 gtk_range_set_update_policy
 gtk_range_set_adjustment
@@ -2960,6 +3053,26 @@ GtkRecentManagerPrivate
 gtk_recent_manager_error_quark
 </SECTION>
 
+<SECTION>
+<FILE>gtkrecentaction</FILE>
+<TITLE>GtkRecentAction</TITLE>
+GtkRecentAction
+gtk_recent_action_new
+gtk_recent_action_new_for_manager
+gtk_recent_action_get_show_numbers
+gtk_recent_action_set_show_numbers
+<SUBSECTION Standard>
+GTK_TYPE_RECENT_ACTION
+GTK_RECENT_ACTION
+GTK_IS_RECENT_ACTION
+GTK_RECENT_ACTION_CLASS
+GTK_IS_RECENT_ACTION_CLASS
+GTK_RECENT_ACTION_GET_CLASS
+<SUBSECTION Private>
+GtkRecentActionPrivate
+gtk_recent_action_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkruler</FILE>
 <TITLE>GtkRuler</TITLE>
@@ -3006,6 +3119,27 @@ GTK_SCALE_GET_CLASS
 gtk_scale_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkscalebutton</FILE>
+<TITLE>GtkScaleButton</TITLE>
+GtkScaleButton
+gtk_scale_button_new
+gtk_scale_button_set_adjustment
+gtk_scale_button_set_icons
+gtk_scale_button_set_value
+gtk_scale_button_get_adjustment
+gtk_scale_button_get_value
+<SUBSECTION Standard>
+GTK_SCALE_BUTTON
+GTK_IS_SCALE_BUTTON
+GTK_TYPE_SCALE_BUTTON
+GTK_SCALE_BUTTON_CLASS
+GTK_IS_SCALE_BUTTON_CLASS
+GTK_SCALE_BUTTON_GET_CLASS
+<SUBSECTION Private>
+gtk_scale_button_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkscrollbar</FILE>
 <TITLE>GtkScrollbar</TITLE>
@@ -3240,6 +3374,8 @@ gtk_status_icon_get_pixbuf
 gtk_status_icon_get_stock
 gtk_status_icon_get_icon_name
 gtk_status_icon_get_size
+gtk_status_icon_set_screen
+gtk_status_icon_get_screen
 gtk_status_icon_set_tooltip
 gtk_status_icon_set_visible
 gtk_status_icon_get_visible
@@ -3374,6 +3510,7 @@ gtk_text_buffer_create_child_anchor
 gtk_text_buffer_create_mark
 gtk_text_buffer_move_mark
 gtk_text_buffer_move_mark_by_name
+gtk_text_buffer_add_mark
 gtk_text_buffer_delete_mark
 gtk_text_buffer_delete_mark_by_name
 gtk_text_buffer_get_mark
@@ -3560,6 +3697,7 @@ gtk_text_iter_get_type
 <FILE>gtktextmark</FILE>
 <TITLE>GtkTextMark</TITLE>
 GtkTextMark
+gtk_text_mark_new
 gtk_text_mark_set_visible
 gtk_text_mark_get_visible
 gtk_text_mark_get_deleted
@@ -3713,8 +3851,6 @@ GTK_TEXT_CHILD_ANCHOR_GET_CLASS
 gtk_text_view_get_type
 gtk_text_child_anchor_get_type
 GtkTextBTree
-GtkTextChildBody
-GtkTextPixbuf
 GtkTextWindow
 GtkTextPendingScroll
 </SECTION>
@@ -3855,6 +3991,8 @@ gtk_tool_item_get_homogeneous
 gtk_tool_item_set_expand
 gtk_tool_item_get_expand
 gtk_tool_item_set_tooltip
+gtk_tool_item_set_tooltip_text
+gtk_tool_item_set_tooltip_markup
 gtk_tool_item_set_use_drag_window
 gtk_tool_item_get_use_drag_window
 gtk_tool_item_set_visible_horizontal
@@ -3947,6 +4085,8 @@ gtk_menu_tool_button_new_from_stock
 gtk_menu_tool_button_set_menu
 gtk_menu_tool_button_get_menu
 gtk_menu_tool_button_set_arrow_tooltip
+gtk_menu_tool_button_set_arrow_tooltip_text
+gtk_menu_tool_button_set_arrow_tooltip_markup
 
 <SUBSECTION Standard>
 GtkMenuToolButtonClass
@@ -4033,6 +4173,25 @@ GTK_TOOLTIPS_GET_CLASS
 gtk_tooltips_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtktooltip</FILE>
+<TITLE>GtkTooltip</TITLE>
+GtkTooltip
+gtk_tooltip_set_markup
+gtk_tooltip_set_text
+gtk_tooltip_set_icon
+gtk_tooltip_set_icon_from_stock
+gtk_tooltip_set_custom
+gtk_tooltip_trigger_tooltip_query
+gtk_tooltip_set_tip_area
+<SUBSECTION Standard>
+GTK_TYPE_TOOLTIP
+GTK_IS_TOOLTIP
+GTK_TOOLTIP
+<SUBSECTION Private>
+gtk_tooltip_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtktree</FILE>
 <TITLE>GtkTree</TITLE>
@@ -4322,6 +4481,7 @@ gtk_tree_store_set_column_types
 gtk_tree_store_set_value
 gtk_tree_store_set
 gtk_tree_store_set_valist
+gtk_tree_store_set_valuesv
 gtk_tree_store_remove
 gtk_tree_store_insert
 gtk_tree_store_insert_before
@@ -4405,6 +4565,7 @@ gtk_tree_view_column_cell_get_position
 gtk_tree_view_column_cell_is_visible
 gtk_tree_view_column_focus_cell
 gtk_tree_view_column_queue_resize
+gtk_tree_view_column_get_tree_view
 <SUBSECTION Standard>
 GTK_TREE_VIEW_COLUMN
 GTK_IS_TREE_VIEW_COLUMN
@@ -4426,6 +4587,10 @@ GtkTreeViewColumnDropFunc
 GtkTreeViewMappingFunc
 GtkTreeViewSearchEqualFunc
 gtk_tree_view_new
+gtk_tree_view_get_level_indentation
+gtk_tree_view_get_show_expanders
+gtk_tree_view_set_level_indentation
+gtk_tree_view_set_show_expanders
 gtk_tree_view_new_with_model
 gtk_tree_view_get_model
 gtk_tree_view_set_model
@@ -4475,6 +4640,12 @@ gtk_tree_view_get_visible_range
 gtk_tree_view_get_bin_window
 gtk_tree_view_widget_to_tree_coords
 gtk_tree_view_tree_to_widget_coords
+gtk_tree_view_convert_bin_window_to_tree_coords
+gtk_tree_view_convert_bin_window_to_widget_coords
+gtk_tree_view_convert_tree_to_bin_window_coords
+gtk_tree_view_convert_tree_to_widget_coords
+gtk_tree_view_convert_widget_to_bin_window_coords
+gtk_tree_view_convert_widget_to_tree_coords
 gtk_tree_view_enable_model_drag_dest
 gtk_tree_view_enable_model_drag_source
 gtk_tree_view_unset_rows_drag_source
@@ -4507,11 +4678,17 @@ gtk_tree_view_get_row_separator_func
 gtk_tree_view_set_row_separator_func
 gtk_tree_view_get_rubber_banding
 gtk_tree_view_set_rubber_banding
+gtk_tree_view_is_rubber_banding_active
 gtk_tree_view_get_enable_tree_lines
 gtk_tree_view_set_enable_tree_lines
 GtkTreeViewGridLines
 gtk_tree_view_get_grid_lines
 gtk_tree_view_set_grid_lines
+gtk_tree_view_set_tooltip_row
+gtk_tree_view_set_tooltip_cell
+gtk_tree_view_get_tooltip_context
+gtk_tree_view_get_tooltip_column
+gtk_tree_view_set_tooltip_column
 
 <SUBSECTION Standard>
 GtkTreeSelectionClass
@@ -4560,6 +4737,7 @@ GtkCellLayoutIface
 GtkCellLayoutDataFunc
 gtk_cell_layout_pack_start
 gtk_cell_layout_pack_end
+gtk_cell_layout_get_cells
 gtk_cell_layout_reorder
 gtk_cell_layout_clear
 gtk_cell_layout_set_attributes
@@ -4581,6 +4759,7 @@ gtk_cell_layout_get_type
 GtkCellRendererState
 GtkCellRendererMode
 GtkCellRenderer
+GtkCellRendererClass
 gtk_cell_renderer_get_size
 gtk_cell_renderer_render
 gtk_cell_renderer_activate
@@ -4750,6 +4929,7 @@ gtk_list_store_set_column_types
 gtk_list_store_set
 gtk_list_store_set_valist
 gtk_list_store_set_value
+gtk_list_store_set_valuesv
 gtk_list_store_remove
 gtk_list_store_insert
 gtk_list_store_insert_before
@@ -4833,6 +5013,22 @@ GTK_VIEWPORT_GET_CLASS
 gtk_viewport_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkvolumebutton</FILE>
+<TITLE>GtkVolumeButton</TITLE>
+GtkVolumeButton
+gtk_volume_button_new
+<SUBSECTION Standard>
+GTK_VOLUME_BUTTON
+GTK_IS_VOLUME_BUTTON
+GTK_TYPE_VOLUME_BUTTON
+GTK_VOLUME_BUTTON_CLASS
+GTK_IS_VOLUME_BUTTON_CLASS
+GTK_VOLUME_BUTTON_GET_CLASS
+<SUBSECTION Private>
+gtk_volume_button_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkvpaned</FILE>
 <TITLE>GtkVPaned</TITLE>
@@ -5040,6 +5236,7 @@ gtk_widget_modify_bg
 gtk_widget_modify_text
 gtk_widget_modify_base
 gtk_widget_modify_font
+gtk_widget_modify_cursor
 gtk_widget_create_pango_context
 gtk_widget_get_pango_context
 gtk_widget_create_pango_layout
@@ -5092,6 +5289,17 @@ gtk_widget_add_mnemonic_label
 gtk_widget_remove_mnemonic_label
 gtk_widget_get_action
 gtk_widget_is_composited
+gtk_widget_error_bell
+gtk_widget_keynav_failed
+gtk_widget_get_tooltip_markup
+gtk_widget_set_tooltip_markup
+gtk_widget_get_tooltip_text
+gtk_widget_set_tooltip_text
+gtk_widget_get_tooltip_window
+gtk_widget_set_tooltip_window
+gtk_widget_get_has_tooltip
+gtk_widget_set_has_tooltip
+gtk_widget_trigger_tooltip_query
 <SUBSECTION>
 gtk_requisition_copy
 gtk_requisition_free
@@ -5171,6 +5379,8 @@ gtk_window_set_skip_pager_hint
 gtk_window_set_urgency_hint
 gtk_window_set_accept_focus
 gtk_window_set_focus_on_map
+gtk_window_set_startup_id
+gtk_window_set_role
 gtk_window_get_decorated
 gtk_window_get_deletable
 gtk_window_get_default_icon_list
@@ -5208,6 +5418,8 @@ gtk_window_set_icon_list
 gtk_window_set_icon_from_file
 gtk_window_set_icon_name
 gtk_window_set_auto_startup_notification
+gtk_window_get_opacity
+gtk_window_set_opacity
 <SUBSECTION Standard>
 GTK_WINDOW
 GTK_IS_WINDOW
@@ -5216,12 +5428,6 @@ GTK_WINDOW_CLASS
 GTK_IS_WINDOW_CLASS
 GTK_WINDOW_GET_CLASS
 
-<SUBSECTION>
-gtk_decorated_window_init
-gtk_decorated_window_calculate_frame_size
-gtk_decorated_window_set_title
-gtk_decorated_window_move_resize_window
-
 <SUBSECTION Private>
 gtk_window_get_type
 GtkWindowGeometryInfo
@@ -5445,19 +5651,6 @@ gtk_style_get_type
 gtk_border_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkthemes</FILE>
-<TITLE>Themes</TITLE>
-<SUBSECTION Private>
-GtkThemeEngine
-gtk_theme_engine_get
-gtk_theme_engine_create_rc_style
-GTK_THEME_ENGINE
-GTK_IS_THEME_ENGINE
-GTK_TYPE_THEME_ENGINE
-gtk_theme_engine_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkrc</FILE>
 <TITLE>Resource Files</TITLE>
@@ -5479,6 +5672,7 @@ gtk_rc_add_default_file
 gtk_rc_get_default_files
 gtk_rc_set_default_files
 gtk_rc_parse_color
+gtk_rc_parse_color_full
 gtk_rc_parse_state
 gtk_rc_parse_priority
 gtk_rc_find_module_in_path
@@ -5790,19 +5984,20 @@ GtkBindingSet
 GtkBindingEntry
 GtkBindingSignal
 GtkBindingArg
+gtk_binding_entry_add
+gtk_binding_entry_add_signall
+gtk_binding_entry_clear
+gtk_binding_parse_binding
 gtk_binding_set_new
 gtk_binding_set_by_class
 gtk_binding_set_find
 gtk_bindings_activate
 gtk_bindings_activate_event
 gtk_binding_set_activate
-gtk_binding_entry_add
-gtk_binding_entry_clear
 gtk_binding_entry_add_signal
-gtk_binding_set_add_path
+gtk_binding_entry_skip
 gtk_binding_entry_remove
-gtk_binding_entry_add_signall
-gtk_binding_parse_binding
+gtk_binding_set_add_path
 </SECTION>
 
 <SECTION>
@@ -5847,6 +6042,7 @@ GtkVisibility
 GtkWindowPosition
 GtkWindowType
 GtkSortType
+GtkDragResult
 
 <SUBSECTION Private>
 GtkMenuCallback
@@ -5886,6 +6082,7 @@ GTK_STOCK_DIALOG_INFO
 GTK_STOCK_DIALOG_QUESTION
 GTK_STOCK_DIALOG_WARNING
 GTK_STOCK_DIRECTORY
+GTK_STOCK_DISCARD
 GTK_STOCK_DISCONNECT
 GTK_STOCK_DND
 GTK_STOCK_DND_MULTIPLE
@@ -5985,7 +6182,9 @@ gtk_icon_theme_prepend_search_path
 gtk_icon_theme_set_custom_theme
 gtk_icon_theme_has_icon
 gtk_icon_theme_lookup_icon
+gtk_icon_theme_choose_icon
 gtk_icon_theme_load_icon
+gtk_icon_theme_list_contexts
 gtk_icon_theme_list_icons
 gtk_icon_theme_get_icon_sizes
 gtk_icon_theme_get_example_icon_name
@@ -6112,7 +6311,6 @@ gtk_print_operation_cancel
 gtk_print_operation_get_status
 gtk_print_operation_get_status_string
 gtk_print_operation_is_finished
-gtk_print_operation_get_error
 gtk_print_run_page_setup_dialog
 GtkPageSetupDoneFunc
 gtk_print_run_page_setup_dialog_async
@@ -6167,7 +6365,7 @@ GTK_PRINT_UNIX_DIALOG_CLASS
 GTK_IS_PRINT_UNIX_DIALOG
 GTK_IS_PRINT_UNIX_DIALOG_CLASS
 GTK_PRINT_UNIX_DIALOG_GET_CLASS
-
+GTK_TYPE_PRINT_CAPABILITIES
 <SUBSECTION Private>
 GtkPrintUnixDialogPrivate
 gtk_print_unix_dialog_get_type
@@ -6193,7 +6391,11 @@ gtk_printer_is_virtual
 gtk_printer_is_default
 gtk_printer_accepts_ps
 gtk_printer_accepts_pdf
+gtk_printer_list_papers
 gtk_printer_compare
+gtk_printer_has_details
+gtk_printer_request_details
+gtk_printer_get_capabilities
 GtkPrinterFunc
 gtk_enumerate_printers
 
@@ -6310,6 +6512,11 @@ GTK_PRINT_SETTINGS_OUTPUT_URI
 GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA
 GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION
 
+<SUBSECTION Serialization>
+gtk_print_settings_new_from_file
+gtk_print_settings_new_from_key_file
+gtk_print_settings_to_file
+gtk_print_settings_to_key_file
 
 <SUBSECTION Standard>
 GTK_TYPE_PRINT_SETTINGS
@@ -6339,6 +6546,7 @@ gtk_paper_size_new_custom
 gtk_paper_size_copy
 gtk_paper_size_free
 gtk_paper_size_is_equal
+gtk_paper_size_get_paper_sizes
 gtk_paper_size_get_name
 gtk_paper_size_get_display_name
 gtk_paper_size_get_ppd_name
@@ -6352,6 +6560,10 @@ gtk_paper_size_get_default_left_margin
 gtk_paper_size_get_default_right_margin
 gtk_paper_size_get_default
 
+<SUBSECTION Serialization>
+gtk_paper_size_new_from_key_file
+gtk_paper_size_to_key_file
+
 <SUBSECTION Standard>
 GTK_TYPE_PAPER_SIZE
 <SUBSECTION Private>
@@ -6383,6 +6595,12 @@ gtk_page_setup_get_paper_height
 gtk_page_setup_get_page_width
 gtk_page_setup_get_page_height
 
+<SUBSECTION Serialization>
+gtk_page_setup_new_from_file
+gtk_page_setup_new_from_key_file
+gtk_page_setup_to_file
+gtk_page_setup_to_key_file
+
 <SUBSECTION Standard>
 GTK_TYPE_PAGE_SETUP
 GTK_PAGE_SETUP

docs/reference/gtk/gtk-update-icon-cache.xml

@@ -18,6 +18,7 @@
 <arg choice="opt">--index-only</arg>
 <arg choice="opt">--source<arg>name</arg></arg>
 <arg choice="opt">--quiet</arg>
+<arg choice="opt">--validate</arg>
 <arg choice="req">iconpath</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
@@ -80,6 +81,13 @@ multiple applications, the overall memory consumption is reduced as well.
     <listitem><para>Turn off verbose output. 
     </para></listitem>
   </varlistentry>
+
+  <varlistentry>
+    <term>--validate</term>
+    <term>-v</term>
+    <listitem><para>Validate existing icon cache.
+    </para></listitem>
+  </varlistentry>
 </variablelist>
 </refsect1>
 

docs/reference/gtk/gtk.types

@@ -18,6 +18,8 @@ gtk_aspect_frame_get_type
 gtk_assistant_get_type
 gtk_bin_get_type
 gtk_box_get_type
+gtk_builder_get_type
+gtk_buildable_get_type
 gtk_button_box_get_type
 gtk_button_get_type
 gtk_calendar_get_type
@@ -122,12 +124,14 @@ gtk_radio_menu_item_get_type
 gtk_radio_tool_button_get_type
 gtk_range_get_type
 gtk_rc_style_get_type
+gtk_recent_action_get_type
 gtk_recent_chooser_get_type
 gtk_recent_chooser_dialog_get_type
 gtk_recent_chooser_menu_get_type
 gtk_recent_chooser_widget_get_type
 gtk_recent_manager_get_type
 gtk_ruler_get_type
+gtk_scale_button_get_type
 gtk_scale_get_type
 gtk_scrollbar_get_type
 gtk_scrolled_window_get_type
@@ -175,6 +179,7 @@ gtk_ui_manager_get_type
 gtk_vbox_get_type
 gtk_vbutton_box_get_type
 gtk_viewport_get_type
+gtk_volume_button_get_type
 gtk_vpaned_get_type
 gtk_vruler_get_type
 gtk_vscale_get_type

docs/reference/gtk/migrating-GtkAboutDialog.sgml

@@ -3,8 +3,9 @@
   <title>Migrating from GnomeAbout to GtkAboutDialog</title>
 
   <para>
-    Since version 2.6, GTK+ provides the #GtkAboutDialog widget as a replacement for 
-    the <structname>GnomeAbout</structname> dialog in the libgnomeui library.
+    Since version 2.6, GTK+ provides the #GtkAboutDialog widget as a 
+    replacement for the <structname>GnomeAbout</structname> dialog in 
+    the libgnomeui library.
   </para>
 
   <para>
@@ -55,8 +56,8 @@
     g_object_unref (pixbuf);
     </programlisting></informalexample>
     If the g_object_new() construction scares you, you can also use 
-    gtk_about_dialog_new() to construct the dialog and then use the setters for 
-    the individual properties.
+    gtk_about_dialog_new() to construct the dialog and then use the 
+    setters for the individual properties.
   </para>
 
   <para>
@@ -66,17 +67,15 @@
     <itemizedlist>
       <listitem><para>
         You can specify license information with the 
-        <link linkend="GtkAboutDialog--license">license</link> property
+        #GtkAboutDialog:license property
       </para></listitem>
       <listitem><para>
         You can add separate credits for artists with the 
-        <link linkend="GtkAboutDialog--artists">artists</link> property
+        #GtkAboutDialog:artists property
       </para></listitem>
       <listitem><para>
         You can add a pointer to the website of your application, using the 
-        <link linkend="GtkAboutDialog--website">website</link> and
-        <link linkend="GtkAboutDialog--website-label">website-label</link> 
-        properties.
+        #GtkAboutDialog:website and #GtkAboutDialog:website-label properties.
       </para></listitem>
       <listitem><para>
         If your credits contain email addresses or URLs, you can turn them 

docs/reference/gtk/migrating-GtkAction.sgml

@@ -52,8 +52,8 @@
 
     <para>
       Normal actions are simply commands, such as
-      <symbol>FileSave</symbol> or <symbol>EditCopy</symbol>.  Toggle
-      actions can be active or inactive, such as
+      <symbol>FileSave</symbol> or <symbol>EditCopy</symbol>.  
+      Toggle actions can be active or inactive, such as
       <symbol>FormatBold</symbol> or <symbol>ViewShowRulers</symbol>.
       Radio actions define a set of items for which one and only one
       can be active at a time, for example, {
@@ -105,8 +105,8 @@
       pass back pointers to the widgets that got created.  This means
       that the structures cannot simply be kept around if the program
       requires multiple instances of the user interface (e.g. several
-      windows); each new invocation of gnome_app_fill_menu() would overwrite the
-      widget fields of the structures.
+      windows); each new invocation of gnome_app_fill_menu() would 
+      overwrite the widget fields of the structures.
     </para>
 
     <para>
@@ -135,15 +135,16 @@
 	  actions, toggle actions, and radio actions, and then create
 	  a separate array of #GtkActionEntry structures
 	  for each group.  This will allow you to create the necessary
-	  #GtkActionGroup objects.  Note that this does not describe the actual
-	  "shape" that your menus and toolbars will have; it simply
-	  defines the set of commands that will appear in them.
+	  #GtkActionGroup objects.  Note that this does not describe 
+          the actual "shape" that your menus and toolbars will have; 
+          it simply defines the set of commands that will appear in them.
 	</para>
       </listitem>
       <listitem>
 	<para>
 	  Create an XML description of your menus and toolbars for use
-	  with #GtkUIManager.  This defines the actual shape of the menus and toolbars.
+	  with #GtkUIManager.  This defines the actual shape of the menus 
+          and toolbars.
 	</para>
       </listitem>
       <listitem>
@@ -156,9 +157,10 @@
        <para>
          If your GnomeUIInfo entries use GNOME_APP_PIXMAP_DATA or 
          GNOME_APP_PIXMAP_FILENAME for pixmaps, you have to create a 
-         #GtkIconFactory, add it to the list of default factories, then create a 
-         #GtkIconSet for each of your own icons. Add the sets to the factory, and 
-         use the id in the #GtkActionEntry like a regular GTK+ stock id.
+         #GtkIconFactory, add it to the list of default factories, then 
+         create a #GtkIconSet for each of your own icons. Add the sets to 
+         the factory, and use the id in the #GtkActionEntry like a regular 
+         GTK+ stock id.
        </para>
       </listitem>
     </orderedlist>
@@ -168,8 +170,8 @@
 
       <para>
 	The following code shows a declaration of a simple menu bar to
-	be used with gnome_app_fill_menu() or similar.  The menu hierarchy looks 
-        like this:
+	be used with gnome_app_fill_menu() or similar.  The menu hierarchy i
+        looks like this:
       </para>
 
       <itemizedlist>

docs/reference/gtk/migrating-GtkAssistant.sgml

@@ -15,13 +15,15 @@
 
   <para>
     Since version 2.10, GTK+ provides the GtkAssistant widget as a replacement
-    for the <structname>GnomeDruid</structname> widget in the libgnomeui library.
+    for the <structname>GnomeDruid</structname> widget in the libgnomeui 
+    library.
   </para>
 
   <para>
-    Conceptually, both <structname>GtkAssistant</structname> and <structname>GnomeDruid</structname>
-    do the same task, but there are several areas where the API has been completely
-    redesigned, so this chapter covers the main changes between both widgets.
+    Conceptually, both <structname>GtkAssistant</structname> and
+    <structname>GnomeDruid</structname> do the same task, but there are 
+    several areas where the API has been completely redesigned, so this 
+    chapter covers the main changes between both widgets.
   </para>
 
   <section id="inserting-pages">
@@ -29,10 +31,12 @@
 
     <para>
       <structname>GnomeDruid</structname> was implemented as a container for
-	 <structname>GnomeDruidPage</structname> abstract objects, which are implemented by the
-	 <structname>GnomeDruidPageEdge</structname> and <structname>GnomeDruidPageStandard</structname>
-	 widgets. Instead, <structname>GtkAssistant</structname> allows any widget to be a page, and implements
-	 per-page settings (such as page type or title) as child properties. So instead of:
+	 <structname>GnomeDruidPage</structname> abstract objects, which are
+         implemented by the <structname>GnomeDruidPageEdge</structname> and 
+         <structname>GnomeDruidPageStandard</structname> widgets. Instead, 
+         <structname>GtkAssistant</structname> allows any widget to be a page, 
+         and implements per-page settings (such as page type or title) as 
+         child properties. So instead of:
     </para>
 
     <programlisting>

docs/reference/gtk/migrating-GtkBuilder.sgml

@@ -0,0 +1,66 @@
+<chapter id="gtk-migrating-GtkBuilder">
+
+  <title>Migrating from libglade to GtkBuilder</title>
+
+  <para>
+    Since version 2.12, GTK+ provides #GtkBuilder to construct
+    user interfaces from XML descriptions, similar to the functionality
+    provided by #GladeXML in the libglade library.
+  </para>
+
+  <para>
+    A good way to start a migration from libglade to GtkBuilder is
+    to run the <link linkend="gtk-builder-convert">gtk-builder-convert</link>
+    utility on your glade file, and inspect the resulting output.
+    If your code uses the @root parameter of glade_xml_new(), you 
+    may want to split your glade file into multiple GtkBuilder files
+    by using the <option>--root</option> option of 
+    <application>gtk-builder-convert</application>.
+  </para>
+
+  <para>
+    While GtkBuilder strives to be a complete replacement for
+    libglade, there are a number of areas where it is currently
+    still behind libglade:
+    <itemizedlist>
+
+      <listitem><para>
+        GtkBuilder can not construct partial trees, it lacks
+        the equivalent of the @root parameter of glade_xml_new().
+        Due to the way GtkBuilder parses its input, this is difficult 
+        to implement, see 
+        <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=447998">bug 
+        447998</ulink>. As a workaround, you can split your glade file 
+        into multiple GtkBuilder input files using the <option>--root</option>
+        that was mentioned above.
+      </para></listitem>
+
+      <listitem><para>
+        GtkBuilder does not yet implement support for accessibility 
+        properties. It parses the same &lt;accessibility&gt; elements 
+        as libglade, but ignores them. See 
+        <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=454653">bug 
+        454983</ulink> for the current status of accessibility support 
+        in GtkBuilder.
+      </para></listitem>
+ 
+      <listitem><para>
+        GtkBuilder supports context information in translatable
+        properties in a slightly different way than libglade. 
+        Intltool does not yet support this; see 
+        <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=454894">bug 
+        454894</ulink> for the current status of intltool support for 
+        GtkBuilder files. Thankfully, context in translations is a 
+        rarely used feature, and if you are not using it, intltools 
+        glade format support works just fine for GtkBuilder files.
+      </para></listitem>
+
+  </itemizedlist>
+  </para>
+
+  <para>
+    More details about migrating from libglade to GtkBuilder will 
+    appear here over time...
+  </para>
+
+</chapter>

docs/reference/gtk/migrating-GtkComboBox.sgml

@@ -16,8 +16,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 
-    <link linkend="GtkComboBox--appearance">GtkComboBox::appearance</link>.
+    the style property #GtkComboBox:appearance.
   </para>
 
   <section id="migrating-GtkOptionMenu">
@@ -59,8 +58,8 @@ 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"
-      signal on the combo box and use gtk_combo_box_get_active()
+      In order to react to the user's selection, connect to the 
+      #GtkComboBox::changed signal and use gtk_combo_box_get_active()
       to retrieve the index of the selected item.
     </para>
 

docs/reference/gtk/migrating-GtkLinkButton.sgml

@@ -11,15 +11,15 @@
   <para>
     Porting an application from <structname>GnomeHRef</structname> to
     #GtkLinkButton is very simple. #GtkLinkButton does not have a
-    default action for "clicked" signal. So instead of simply creating
-    the widget
+    default action for #GtkButton::clicked signal. So instead of simply 
+    creating the widget
     <informalexample><programlisting>
       GtkWidget *button;
 
       button = gnome_href_new (url, "");
     </programlisting></informalexample>
     you will have to handle the activation of the #GtkLinkButton, using
-    the "clicked" signal for instance
+    the ::clicked signal for instance
     <informalexample><programlisting>
       static void
       link_button_clicked_cb (GtkWidget *widget,

docs/reference/gtk/migrating-GtkTooltip.sgml

@@ -0,0 +1,62 @@
+<chapter id="gtk-migrating-tooltips">
+
+  <title>Migrating from GtkTooltips to GtkTooltip</title>
+
+  <para>
+    GTK+ 2.12 brings a completely new tooltip implementation which
+    allows many things that were not possible with the old 
+    #GtkTooltips interface. The new possibilities are explained
+    in more detail in the section about #GtkTooltip. 
+  </para>
+
+  <para>
+    A number of complications of the old API have been removed:
+    <itemizedlist>
+
+      <listitem><para>
+        Tooltips can not be grouped anymore. The old tooltips
+        API allowed this by using multiple #GtkTooltips objects.
+        We believe that the timeout behaviour of the new tooltips 
+        implementation is better and makes it unnecessary to use 
+        grouping as a way to overcome shortcomings of the 
+        fast-tooltips mode.
+      </para></listitem>
+
+      <listitem><para>
+        Timeouts can not be set individually anymore. Instead
+        there are settings #GtkSettings:gtk-tooltip-timeout, 
+        #GtkSettings:gtk-tooltip-browse-timeout and
+        #GtkSettings:gtk-tooltip-browse-mode-timeout to influence
+        the behaviour of tooltips globally.
+      </para></listitem>
+
+    </itemizedlist>
+  </para>
+
+  <para>
+    Here is an example of setting a tooltip on a widget with the old API:
+    <informalexample><programlisting>
+GtkTooltips *tooltips = gtk_tooltips_new ();     
+gtk_tooltips_set_tip (tooltips, widget, "Some tips", NULL);
+    </programlisting></informalexample>
+  </para>
+  <para>
+    Using the new tooltips API, it is no longer necessary to create 
+    an object:
+    <informalexample><programlisting>
+gtk_widget_set_tooltip_text (widget, "Some tips");
+    </programlisting></informalexample>
+  </para>
+  <para>
+    Similarly, setting a tooltip on a #GtkToolItem gets
+    simplified from
+    <informalexample><programlisting>
+gtk_tool_item_set_tooltip (toolitem, toolbar->tooltips, "tool tip", NULL);
+    </programlisting></informalexample>
+    to
+    <informalexample><programlisting>
+gtk_tool_item_set_tooltip_text (toolitem, text);
+    </programlisting></informalexample>
+  </para>
+
+</chapter>

docs/reference/gtk/migrating-checklist.sgml

@@ -22,11 +22,9 @@
     </formalpara>
 
     <para>
-      The <link
-      linkend="GtkWidget-popup-menu">GtkWidget::popup_menu</link>
-      signal instructs the widget for which it is emitted to create a
-      context-sensitive popup menu.  By default, the <link
-      linkend="gtk-bindings">key binding mechanism</link> is set to
+      The #GtkWidget::popup-menu signal instructs the widget for which 
+      it is emitted to create a context-sensitive popup menu. By default, 
+      the <link linkend="gtk-bindings">key binding mechanism</link> is set to
       emit this signal when the
       <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
       or <keycap>Menu</keycap> keys are pressed while a widget has the
@@ -77,8 +75,8 @@ do_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
 
       <listitem>
 	<para>
-	  In your button_press handler, call this function when you
-	  need to pop up a menu:
+	  In your #GtkWidget::button-press-event handler, call this function 
+          when you need to pop up a menu:
 	</para>
 
 	<programlisting>
@@ -99,7 +97,7 @@ my_widget_button_press_event_handler (GtkWidget *widget, GdkEventButton *event)
 
       <listitem>
 	<para>
-	  Implement a handler for the popup_menu signal:
+	  Implement a handler for the #GtkWidget::popup-menu signal:
 	</para>
 
 	<programlisting>
@@ -126,10 +124,10 @@ my_widget_popup_menu_handler (GtkWidget *widget)
 	provide your own <link
 	linkend="GtkMenuPositionFunc">menu-positioning function</link>
 	in the case where the <parameter>event</parameter> is
-	<constant>NULL</constant>.  This function should compute the
-	desired position for a menu when it is invoked through the
-	keyboard.  For example, #GtkEntry aligns the
-	top edge of its popup menu with the bottom edge of the entry.
+	%NULL.  This function should compute the desired position for 
+        a menu when it is invoked through the keyboard.  For example, 
+        #GtkEntry aligns the top edge of its popup menu with the bottom 
+        edge of the entry.
       </para>
     </note>
 
@@ -139,8 +137,7 @@ my_widget_popup_menu_handler (GtkWidget *widget)
 	able to take the keyboard focus.  In general, widgets should
 	be fully usable through the keyboard and not just the mouse.
 	The very first step of this is to ensure that your widget
-	turns on the %GTK_CAN_FOCUS <link
-	linkend="gtkwidgetflags">flag</link>.
+	turns on the %GTK_CAN_FOCUS <link linkend="gtkwidgetflags">flag</link>.
       </para>
     </note>
   </section>
@@ -182,7 +179,7 @@ my_widget_popup_menu_handler (GtkWidget *widget)
 
     <para>
       Regions have an internal representation that is accessible as a
-      list of rectangles.  To turn the
+      list of rectangles.  To turn the 
       <structfield>GdkEventExpose.region</structfield> field into such
       a list, use gdk_region_get_rectangles():
     </para>
@@ -217,12 +214,10 @@ my_widget_expose_event_handler (GtkWidget *widget, GdkEventExpose *event)
     <formalpara>
       <title>Why</title>
       <para>
-	With
-	gtk_accelerator_get_default_mod_mask()
-	you can test for modifier keys reliably; this way your key
-	event handlers will work correctly even if
-	<keycap>NumLock</keycap> or <keycap>CapsLock</keycap> are
-	activated.
+	With gtk_accelerator_get_default_mod_mask() you can test for 
+        modifier keys reliably; this way your key event handlers will 
+        work correctly even if <keycap>NumLock</keycap> or 
+        <keycap>CapsLock</keycap> are activated.
       </para>
     </formalpara>
 
@@ -231,14 +226,14 @@ my_widget_expose_event_handler (GtkWidget *widget, GdkEventExpose *event)
       <structfield>state</structfield> field is a bit mask which
       indicates the modifier state at the time the key was pressed.
       Modifiers are keys like <keycap>Control</keycap> and
-      <keycap>NumLock</keycap>.  When implementing a <link
-      linkend="GtkWidget-key-press-event">GtkWidget::key_press_event</link>
-      handler, you should use gtk_accelerator_get_default_mod_mask() to
+      <keycap>NumLock</keycap>.  When implementing a 
+      #GtkWidget::key-press-event handler, you should use 
+      gtk_accelerator_get_default_mod_mask() to
       test against modifier keys.  This function returns a bit mask
       which encompasses all the modifiers which the user may be
       actively pressing, such as <keycap>Control</keycap>,
       <keycap>Shift</keycap>, and <keycap>Alt</keycap>, but ignores
-      "inocuous" modifiers such as <keycap>NumLock</keycap> and
+      "innocuous" modifiers such as <keycap>NumLock</keycap> and
       <keycap>CapsLock</keycap>.
     </para>
 
@@ -300,8 +295,7 @@ my_widget_key_press_event_handler (GtkWidget *widget, GdkEventKey *event)
       gtk_window_set_icon_name()) and images (see gtk_image_set_icon_name()).
       In GTK+ 2.8, you can also use named icons for drag-and-drop (see 
       gtk_drag_source_set_icon_name()) and in treeview cells (see the
-      <link linkend="GtkCellRendererPixbuf--icon-name">icon_name</link>
-      property of #GtkCellRendererPixbuf).
+      #GtkCellRendererPixbuf:icon-name property).
     </para>
   </section>
 </chapter>

docs/reference/gtk/question_index.sgml

@@ -59,7 +59,7 @@ See the <link linkend="gtk-resources">documentation on this topic</link>.
 
 
 <qandaentry>
-<question><para>How do I port from one GTK+
+<question><para>How do I port from one GTK+ 
 version to another?</para></question>
 
 <answer>
@@ -96,17 +96,17 @@ from functions?
 <answer>
 
 <para>
-See the documentation for #GObject and #GtkObject. For #GObject note specifically
-g_object_ref() and g_object_unref(). #GtkObject is a subclass of #GObject so the 
-same points apply, except that it has a "floating" state (explained in its 
-documentation).
+See the documentation for #GObject and #GtkObject. For #GObject note 
+specifically g_object_ref() and g_object_unref(). #GtkObject is a subclass 
+of #GObject so the same points apply, except that it has a "floating" state 
+(explained in its documentation).
 </para>
 
 <para>
 For strings returned from functions, they will be declared "const" (using 
-#G_CONST_RETURN) if they should not be freed. Non-const strings should be freed 
-with g_free(). Arrays follow the same rule.  (If you find an exception to the rules, 
-please report a bug to <ulink 
+#G_CONST_RETURN) if they should not be freed. Non-const strings should be 
+freed with g_free(). Arrays follow the same rule.  (If you find an exception 
+to the rules, please report a bug to <ulink 
 url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>.)
 </para>
 
@@ -135,8 +135,9 @@ reference counting, not floating reference counting.
 </para>
 
 <para>
-To to get this, you must acquire a reference to the widget and drop the floating 
-reference (<quote>ref and sink</quote> in GTK+ parlance) after creating it:
+To to get this, you must acquire a reference to the widget and drop the 
+floating reference (<quote>ref and sink</quote> in GTK+ parlance) after 
+creating it:
 <informalexample><programlisting>
  foo = gtk_foo_new (<!-- -->);
  g_object_ref (foo); 
@@ -165,10 +166,9 @@ How do I use GTK+ with threads?
 <answer>
 
 <para>
-This is covered in the 
-<link linkend="gdk-Threads">GDK threads documentation</link>. 
-See also the <link linkend="glib-Threads">GThread</link> documentation for portable
-threading primitives.
+This is covered in the <link linkend="gdk-Threads">GDK threads 
+documentation</link>. See also the <link linkend="glib-Threads">GThread</link> 
+documentation for portable threading primitives.
 </para>
 
 </answer>
@@ -184,8 +184,8 @@ How do I internationalize a GTK+ program?
 <para>
 Most people use <ulink url="http://www.gnu.org/software/gettext/">GNU
 gettext</ulink>, already required in order to install GLib. On a UNIX
-or Linux system with gettext installed, type <literal>info
-gettext</literal> to read the documentation.
+or Linux system with gettext installed, type <literal>info gettext</literal> 
+to read the documentation.
 </para>
 <para>
 The short checklist on how to use gettext is: call bindtextdomain() so gettext 
@@ -199,15 +199,17 @@ follows for convenience:
   #define N_(x)  x
 </programlisting>
 </informalexample>
-You use N_() (N stands for no-op) to mark a string for translation in a context 
-where a function call to gettext() is not allowed, such as in an array initializer. 
+You use N_() (N stands for no-op) to mark a string for translation in a 
+context where a function call to gettext() is not allowed, such as in an 
+array initializer. 
 You eventually have to call gettext() on the string to actually fetch the
-translation.  _() both marks the string for translation and actually translates it.
+translation.  _() both marks the string for translation and actually 
+translates it.
 </para>
 <para>
 Nowadays, GLib provides the common shorthand macros in the header file
-<filename>gi18n.h</filename>, so you don't have to define them yourself, just
-include that header.
+<filename>gi18n.h</filename>, so you don't have to define them yourself, 
+just include that header.
 </para>
 <para>
 Code using these macros ends up looking like this:
@@ -230,10 +232,11 @@ Code using these macros ends up looking like this:
 </informalexample>
 </para>
 <para>
-Libraries using gettext should use dgettext() instead of gettext(), which allows
-them to specify the translation domain each time they ask for a translation. Libraries
-should also avoid calling textdomain(), since they'll be specifying the domain instead
-of using the default.For dgettext() the _() macro can be defined as:
+Libraries using gettext should use dgettext() instead of gettext(), which 
+allows them to specify the translation domain each time they ask for a 
+translation. Libraries should also avoid calling textdomain(), since they
+will be specifying the domain instead of using the default. For dgettext() 
+the _() macro can be defined as:
 <informalexample>
 <programlisting>
   #define _(x) dgettext ("MyDomain", x)
@@ -241,9 +244,9 @@ of using the default.For dgettext() the _() macro can be defined as:
 </informalexample>
 </para>
 <para>
-Again, GLib comes with the <filename>gi18n-lib.h</filename>, saving you the trouble
-of defining the macros by hand. The macros in that header expect the translation
-domain to be specified by the %GETTEXT_PACKAGE macro. 
+Again, GLib comes with the <filename>gi18n-lib.h</filename>, saving you the 
+trouble of defining the macros by hand. The macros in that header expect the 
+translation domain to be specified by the %GETTEXT_PACKAGE macro. 
 </para>
 </answer>
 </qandaentry>
@@ -258,10 +261,9 @@ How do I use non-ASCII characters in GTK+ programs ?
 <answer>
 <para>
 GTK+ uses <ulink url="http://www.unicode.org">Unicode</ulink> (more exactly 
-UTF-8) for all text. UTF-8 encodes each Unicode codepoint as a
-	      sequence of one to six bytes and has a number of nice
-	      properties which make it a good choice for working with Unicode
-	      text in C programs:
+UTF-8) for all text. UTF-8 encodes each Unicode codepoint as a sequence of 
+one to six bytes and has a number of nice properties which make it a good 
+choice for working with Unicode text in C programs:
 <itemizedlist>
 <listitem><para>
 ASCII characters are encoded by their familiar ASCII codepoints.
@@ -270,21 +272,22 @@ ASCII characters are encoded by their familiar ASCII codepoints.
 ASCII characters never appear as part of any other character.
 </para></listitem>
 <listitem><para>
-The zero byte doesn't occur as part of a character, so that UTF-8 strings can
-		    be manipulated with the usual C library functions for
-		    handling zero-terminated strings.
+The zero byte doesn't occur as part of a character, so that UTF-8 strings 
+can be manipulated with the usual C library functions for handling 
+zero-terminated strings.
 </para></listitem>
 </itemizedlist>
 More information about Unicode and UTF-8 can be found in the 
-<ulink url="http://www.cl.cam.ac.uk/~mgk25/unicode.html">UTF-8 and Unicode FAQ for Unix/Linux</ulink>.
+<ulink url="http://www.cl.cam.ac.uk/~mgk25/unicode.html">UTF-8 and Unicode i
+FAQ for Unix/Linux</ulink>.
 GLib provides functions for converting strings between UTF-8 and other
-	      encodings, see g_locale_to_utf8() and g_convert().
+encodings, see g_locale_to_utf8() and g_convert().
 </para>
 <para>
 Text coming from external sources (e.g. files or user input), has to be
-	      converted to UTF-8 before being handed over to GTK+. The
-	      following example writes the content of a IS0-8859-1 encoded text
-	      file to <literal>stdout</literal>:
+converted to UTF-8 before being handed over to GTK+. The following example 
+writes the content of a IS0-8859-1 encoded text file to 
+<literal>stdout</literal>:
 <informalexample><programlisting>
 gchar *text, *utf8_text;
 gsize length;
@@ -308,7 +311,7 @@ else
 </para>
 <para>
 For string literals in the source code, there are several alternatives for
-	      handling non-ASCII content:
+handling non-ASCII content:
 <variablelist>
 <varlistentry><term>direct UTF-8</term>
 <listitem><para>
@@ -334,8 +337,9 @@ very convenient. Be careful when mixing hexadecimal escapes with ordinary text;
 <listitem><para>
 If the string literals can be represented in an encoding which your toolchain
 can handle (e.g. IS0-8859-1), you can write your source files in that encoding
-and use g_convert() to convert the strings to UTF-8 at runtime. Note that this has 
-some runtime overhead, so you may want to move the conversion out of inner loops.
+and use g_convert() to convert the strings to UTF-8 at runtime. Note that this 
+has some runtime overhead, so you may want to move the conversion out of inner 
+loops.
 </para></listitem>
 </varlistentry>
 </variablelist>
@@ -364,7 +368,7 @@ There are two ways to approach this. The GTK+ header files use the subset
 of C that's also valid C++, so you can simply use the normal GTK+ API 
 in a C++ program. Alternatively, you can use a "C++ binding" 
 such as <ulink url="http://gtkmm.sourceforge.net/">gtkmm</ulink>
-which provides a C++-native API.
+which provides a native C++ API.
 </para>
 <para>
 When using GTK+ directly, keep in mind that only functions can be
@@ -404,7 +408,7 @@ How do I use GTK+ with other non-C languages?
 <para>
 See the <ulink url="http://www.gtk.org/bindings.html">list of language
 bindings</ulink> on <ulink
-                           url="http://www.gtk.org">http://www.gtk.org</ulink>.
+url="http://www.gtk.org">http://www.gtk.org</ulink>.
 </para>
 
 </answer>
@@ -419,15 +423,16 @@ How do I load an image or animation from a file?
 <answer>
 
 <para>
-To load an image file straight into a display widget, use gtk_image_new_from_file()
-<footnote><para> If the file load fails, gtk_image_new_from_file() will display no
-image graphic &mdash; to detect a failed load yourself, use gdk_pixbuf_new_from_file()
-directly, then gtk_image_new_from_pixbuf().</para></footnote>. 
-To load an image for another purpose, use gdk_pixbuf_new_from_file(). To load an 
-animation, use gdk_pixbuf_animation_new_from_file().
-gdk_pixbuf_animation_new_from_file() can also load non-animated images, so use it 
-in combination with gdk_pixbuf_animation_is_static_image() to load a file of unknown 
-type. 
+To load an image file straight into a display widget, use 
+gtk_image_new_from_file() <footnote><para> If the file load fails, 
+gtk_image_new_from_file() will display no image graphic &mdash; to detect 
+a failed load yourself, use gdk_pixbuf_new_from_file() directly, then 
+gtk_image_new_from_pixbuf().</para></footnote>. 
+To load an image for another purpose, use gdk_pixbuf_new_from_file(). To i
+load an animation, use gdk_pixbuf_animation_new_from_file().
+gdk_pixbuf_animation_new_from_file() can also load non-animated images, so 
+use it in combination with gdk_pixbuf_animation_is_static_image() to load a 
+file of unknown type. 
 </para>
 <para>
 To load an image or animation file asynchronously (without blocking), use 
@@ -503,21 +508,22 @@ to the GNOME 2.0 platform</ulink>.
 <qandaentry>
 <question>
 <para>
-Why are types not registered if I use their <literal>GTK_TYPE_BLAH</literal> macro ?
+Why are types not registered if I use their <literal>GTK_TYPE_BLAH</literal> 
+macro ?
 </para>
 </question>
 
 <answer>
 <para>
 The <literal>GTK_TYPE_BLAH</literal> macros are defined as calls to 
-<literal>gtk_blah_get_type()</literal>, and the <literal>_get_type()</literal> functions
-are declared as <literal>G_GNUC_CONST</literal> which allows the compiler to optimize
+<literal>gtk_blah_get_type()</literal>, and the <literal>_get_type()</literal> i
+functions are declared as %G_GNUC_CONST which allows the compiler to optimize
 the call away if it appears that the value is not being used.
 </para>
 
 <para>
-A common workaround for this problem is to store the result in a volatile variable,
-which keeps the compiler from optimizing the call away.
+A common workaround for this problem is to store the result in a volatile 
+variable, which keeps the compiler from optimizing the call away.
 <informalexample><programlisting>
 volatile GType dummy = GTK_TYPE_BLAH;
 </programlisting></informalexample>
@@ -595,9 +601,9 @@ should use the #GtkTextView widget. Do not use the deprecated widget #GtkText
 in newly-written code, it has a number of problems that are best avoided.
 </para>
 <para>
-If you only have a small amount of text, #GtkLabel may also be appropriate of course.
-It can be made selectable with gtk_label_set_selectable(). For a single-line text 
-entry, see #GtkEntry.
+If you only have a small amount of text, #GtkLabel may also be appropriate 
+of course. It can be made selectable with gtk_label_set_selectable(). For a 
+single-line text entry, see #GtkEntry.
 </para>
 </answer>
 </qandaentry>
@@ -610,9 +616,9 @@ entry, see #GtkEntry.
 
 <answer>
 <para>
-#GtkImage can display images in just about any format GTK+ understands. You can also 
-use #GtkDrawingArea if you need to do something more complex, such as draw text or 
-graphics over the top of the image.
+#GtkImage can display images in just about any format GTK+ understands. 
+You can also use #GtkDrawingArea if you need to do something more complex, 
+such as draw text or graphics over the top of the image.
 </para>
 </answer>
 </qandaentry>
@@ -644,14 +650,15 @@ How do I change the color of a widget?
 <answer><para>
 See gtk_widget_modify_fg(), gtk_widget_modify_bg(), gtk_widget_modify_base(),
 and gtk_widget_modify_text().  See <link linkend="gtk-Resource-Files">GTK+ 
-resource files</link> for more discussion. You can also change widget color by 
-installing a resource file and parsing it with gtk_rc_add_default_file().
+resource files</link> for more discussion. You can also change widget color 
+by installing a resource file and parsing it with gtk_rc_add_default_file().
 The advantage of a resource file is that users can then override the
 color you've chosen.
 </para>
 
-<para>To change the background color for widgets such as #GtkLabel that have no 
-background, place them in a #GtkEventBox and set the background of the event box.  
+<para>To change the background color for widgets such as #GtkLabel that have 
+no background, place them in a #GtkEventBox and set the background of the 
+event box.  
 </para></answer>
 </qandaentry>
 
@@ -661,9 +668,9 @@ How do I change the font of a widget?
 </para></question>
 
 <answer><para>
-This has several possible answers, depending on what exactly you want to achieve. 
-One option is gtk_widget_modify_font(). Note that this function can be used to 
-change only the font size, as in the following example:
+This has several possible answers, depending on what exactly you want to 
+achieve. One option is gtk_widget_modify_font(). Note that this function 
+can be used to change only the font size, as in the following example:
 <programlisting>
  PangoFontDesc *font_desc = pango_font_description_new (<!-- -->);
  pango_font_description_set_size (font_desc, 40);
@@ -672,23 +679,24 @@ change only the font size, as in the following example:
 </programlisting>
 </para>
 <para>
-If you want to make the text of a label larger, you can use gtk_label_set_markup():
+If you want to make the text of a label larger, you can use 
+gtk_label_set_markup():
 <programlisting>
 gtk_label_set_markup (label, "&lt;big&gt;big text&lt;/big&gt;");
 </programlisting>
 This is preferred for many apps because it's a relative size to the 
-user's chosen font size. See g_markup_escape_text() if you are constructing such 
-strings on the fly.
+user's chosen font size. See g_markup_escape_text() if you are 
+constructing such strings on the fly.
 </para>
 <para>
 You can also change the font of a widget by putting
 <programlisting>
  gtk-font-name = "Sans 30"
 </programlisting>
-in a resource file and parsing it with gtk_rc_add_default_file(). The advantage of 
-a resource file is that users can then override the font you've chosen. See 
-<link linkend="gtk-Resource-Files">GTK+ resource files</link> for more
-discussion. 
+in a resource file and parsing it with gtk_rc_add_default_file(). 
+The advantage of a resource file is that users can then override the font you
+have chosen. See <link linkend="gtk-Resource-Files">GTK+ resource files</link> 
+for more discussion. 
 </para>
 </answer>
 </qandaentry>
@@ -738,9 +746,10 @@ How do I make a text widget display its complete contents in a specific font?
 </para></question>
 
 <answer><para>
-If you use gtk_text_buffer_insert_with_tags() with appropriate tags to select the 
-font, the inserted text will have the desired appearance, but text typed in by the 
-user before or after the tagged block will appear in the default style. 
+If you use gtk_text_buffer_insert_with_tags() with appropriate tags to select 
+the font, the inserted text will have the desired appearance, but text typed 
+in by the user before or after the tagged block will appear in the default 
+style. 
 </para>
 <para>
 To ensure that all text has the desired appearance, use gtk_widget_modify_font() 
@@ -757,18 +766,21 @@ How do I make a text view scroll to the end of the buffer automatically ?
 
 <answer>
 <para>
-The "insert" <link linkend="GtkTextMark">mark</link> marks the insertion point
-where gtk_text_buffer_insert() inserts new text into the buffer. The text is inserted 
-<emphasis>before</emphasis> the "insert" mark, so that it generally stays 
-at the end of the buffer. If it gets explicitly moved to some other position, 
-e.g. when the user selects some text, use gtk_text_buffer_move_mark() to set it to 
-the desired location before inserting more text. The "insert" mark of a buffer can be 
-obtained with gtk_text_buffer_get_insert().
+A good way to keep a text buffer scrolled to the end is to place a
+<link linkend="GtkTextMark">mark</link> at the end of the buffer, and
+give it right gravity. The gravity has the effect that text inserted
+at the mark gets inserted <emphasis>before</emphasis>, keeping the mark
+at the end. 
 </para>
 
 <para> 
 To ensure that the end of the buffer remains visible, use
-gtk_text_view_scroll_to_mark() to scroll to the "insert" mark after inserting new text.
+gtk_text_view_scroll_to_mark() to scroll to the mark after
+inserting new text.
+</para>
+
+<para>
+The gtk-demo application contains an example of this technique. 
 </para>
 </answer>
 </qandaentry>
@@ -786,8 +798,8 @@ How do I associate some data with a row in the tree?
 <answer>
 <para>
 Remember that the #GtkTreeModel columns don't necessarily have to be displayed. 
-So you can put non-user-visible data in your model just like any other data, and
-retrieve it with gtk_tree_model_get(). See the 
+So you can put non-user-visible data in your model just like any other data, 
+and retrieve it with gtk_tree_model_get(). See the 
 <link linkend="TreeWidget">tree widget overview</link>.
 </para>
 </answer>
@@ -815,9 +827,10 @@ How do I put an image and some text in the same column?
 
 <answer>
 <para>
-You can pack more than one #GtkCellRenderer into a single #GtkTreeViewColumn using
-gtk_tree_view_column_pack_start() or gtk_tree_view_column_pack_end(). So pack both 
-a #GtkCellRendererPixbuf and a #GtkCellRendererText into the column.
+You can pack more than one #GtkCellRenderer into a single #GtkTreeViewColumn 
+using gtk_tree_view_column_pack_start() or gtk_tree_view_column_pack_end(). 
+So pack both a #GtkCellRendererPixbuf and a #GtkCellRendererText into the 
+column.
 </para>
 </answer>
 </qandaentry>
@@ -831,8 +844,9 @@ gtk_list_store_set() and gtk_tree_store_set(), but can't read it back?
 <answer>
 <para>
 Both the #GtkTreeStore and the #GtkListStore implement the #GtkTreeModel
-interface.  Consequentially, the can use any function this interface implements.  
-The easiest way to read a set of data back is to use gtk_tree_model_get().
+interface.  Consequentially, the can use any function this interface 
+implements. The easiest way to read a set of data back is to use 
+gtk_tree_model_get().
 </para>
 </answer>
 </qandaentry>
@@ -843,8 +857,8 @@ How do I change the way that numbers are formatted by #GtkTreeView?
 </para></question>
 <answer><para>
 Use gtk_tree_view_insert_column_with_data_func()
-or gtk_tree_view_column_set_cell_data_func() and do the conversion from number to 
-string yourself (with, say, g_strdup_printf()).
+or gtk_tree_view_column_set_cell_data_func() and do the conversion from i
+number to string yourself (with, say, g_strdup_printf()).
 </para>
 
 <para>

docs/reference/gtk/running.sgml

@@ -20,9 +20,9 @@ How to run and debug your GTK+ application
 
 <para>
 All GTK+ applications support a number of standard commandline
-options. These are removed from <literal>argv</literal> by <link
-linkend="gtk-init">gtk_init()</link>. Modules may parse and remove
-further options. The <link linkend="x11-cmdline">X11</link> and
+options. These are removed from <literal>argv</literal> by gtk_init(). 
+Modules may parse and remove further options. The 
+<link linkend="x11-cmdline">X11</link> and
 <link linkend="win32-cmdline">Windows</link> GDK backends parse
 some additional commandline options.
 </para>
@@ -80,7 +80,7 @@ list them here for completeness nevertheless.
 <title><systemitem>--class <replaceable>class</replaceable></systemitem></title>
 
 <para>
-Sets the program class; see <link linkend="gdk-set-program-class"><function>gdk_set_program_class</function>()</link>. 
+Sets the program class; see gdk_set_program_class(). 
 </para>
 </formalpara>
 
@@ -97,10 +97,9 @@ Sets the program name.
 
 <para>
 A list of <link linkend="GDK-Debug-Options">debug options</link> 
-to turn on in addition to those 
-specified in the <envar>GDK_DEBUG</envar> environment variable. 
-This option is only available if GTK+ has been configured with
-<option>--enable-debug=yes</option>.
+to turn on in addition to those specified in the <envar>GDK_DEBUG</envar> 
+environment variable. This option is only available if GTK+ has been 
+configured with <option>--enable-debug=yes</option>.
 </para>
 </formalpara>
 
@@ -109,8 +108,7 @@ This option is only available if GTK+ has been configured with
 
 <para>
 A list of <link linkend="GDK-Debug-Options">debug options</link> 
-to turn off.
-This option is only available if GTK+ has been configured with
+to turn off. This option is only available if GTK+ has been configured with
 <option>--enable-debug=yes</option>.
 </para>
 </formalpara>
@@ -184,7 +182,8 @@ additional environment variables.
     </varlistentry>
 
   </variablelist>
-  The special value <literal>all</literal> can be used to turn on all debug options.
+  The special value <literal>all</literal> can be used to turn on all 
+  debug options.
   </para>
 </formalpara>
 
@@ -202,12 +201,13 @@ additional environment variables.
   <para>
     Specifies a list of directories to search when GTK+ is looking for
     dynamically loaded objects such as the modules specified by
-    <envar>GTK_MODULES</envar>, theme engines, and input method
-    modules. If the path to the dynamically loaded object is given
-    as an absolute path name, then GTK+ loads it directly. Otherwise,
-    GTK+ goes in turn through the directories in GTK_PATH, followed
-    by the directory <filename>.gtk-2.0</filename> in the user's home
-    directory, followed by the system default directory, 
+    <envar>GTK_MODULES</envar>, theme engines, input method
+    modules, file system backends and print backends. If the path to 
+    the dynamically loaded object is given as an absolute path name, 
+    then GTK+ loads it directly. 
+    Otherwise, GTK+ goes in turn through the directories in GTK_PATH, 
+    followed by the directory <filename>.gtk-2.0</filename> in the user's 
+    home directory, followed by the system default directory, 
     which is <filename><replaceable>libdir</replaceable>/gtk-2.0/modules</filename>.
     (If <envar>GTK_EXE_PREFIX</envar> is defined, <replaceable>libdir</replaceable> is 
     <filename>$GTK_EXE_PREFIX/lib</filename>. Otherwise it is the libdir
@@ -225,9 +225,10 @@ additional environment variables.
     --variable=gtk_host gtk+-2.0</literal> to determine this from a
     script), and <replaceable>type</replaceable> is a directory
     specific to the type of modules; currently it can be
-    <literal>modules</literal>, <literal>engines</literal> or
-    <literal>immodules</literal> corresponding to the three types of
-    modules above. Either <replaceable>version</replaceable>,
+    <literal>modules</literal>, <literal>engines</literal>, 
+    <literal>immodules</literal>, <literal>filesystems</literal> or 
+    <literal>printbackends</literal>, corresponding to the types of
+    modules mentioned above. Either <replaceable>version</replaceable>,
     <replaceable>host</replaceable>, or both may be omitted. GTK+ looks
     first in the most specific directory, then in directories with
     fewer components.
@@ -328,7 +329,8 @@ nevertheless.
       <listitem><para>Information about XIM support</para></listitem>
     </varlistentry>
   </variablelist>
-  The special value <literal>all</literal> can be used to turn on all debug options.
+  The special value <literal>all</literal> can be used to turn on all 
+  debug options.
   </para>
 </formalpara>
 

docs/reference/gtk/text_widget.sgml

@@ -7,7 +7,7 @@
 
 <refnamediv>
 <refname>Text Widget Overview</refname>
-<refpurpose>Overview of #GtkTextBuffer, #GtkTextView, and friends</refpurpose>
+<refpurpose>Overview of GtkTextBuffer, GtkTextView, and friends</refpurpose>
 </refnamediv>
 
 <refsect1>
@@ -37,8 +37,8 @@ be called "bold" and make the text inside the tag bold. However, the tag
 concept is more general than that; tags don't have to affect appearance. They 
 can instead affect the behavior of mouse and key presses, "lock" a range of 
 text so the user can't edit it, or countless other things. A tag is 
-represented by a #GtkTextTag object. One #GtkTextTag can be applied to any number 
-of text ranges in any number of buffers.
+represented by a #GtkTextTag object. One #GtkTextTag can be applied to any 
+number of text ranges in any number of buffers.
 </para>
 
 <para>
@@ -57,35 +57,36 @@ is convenient if you're creating tags on-the-fly).
 <para>
 Most text manipulation is accomplished with <firstterm>iterators</firstterm>,
 represented by a #GtkTextIter. An iterator represents a position between two 
-characters in the text buffer. #GtkTextIter is a struct designed to be allocated 
-on the stack; it's guaranteed to be copiable by value and never contain any
-heap-allocated data. Iterators are not valid indefinitely; whenever the buffer
-is modified in a way that affects the number of characters in the buffer, all
-outstanding iterators become invalid. (Note that deleting 5 characters and then
-reinserting 5 still invalidates iterators, though you end up with the same
-number of characters you pass through a state with a different number).
+characters in the text buffer. #GtkTextIter is a struct designed to be 
+allocated on the stack; it's guaranteed to be copiable by value and never 
+contain any heap-allocated data. Iterators are not valid indefinitely; 
+whenever the buffer is modified in a way that affects the number of characters 
+in the buffer, all outstanding iterators become invalid. (Note that deleting 
+5 characters and then reinserting 5 still invalidates iterators, though you 
+end up with the same number of characters you pass through a state with a 
+different number).
 </para>
 
 <para>
 Because of this, iterators can't be used to preserve positions across buffer
-modifications. To preserve a position, the #GtkTextMark object is ideal. You can 
-think of a mark as an invisible cursor or insertion point; it floats in the buffer, 
-saving a position. If the text surrounding the mark is deleted, the mark remains 
-in the position the text once occupied; if text is inserted at the mark, the 
-mark ends up either to the left or to the right of the new text, depending on 
-its <firstterm>gravity</firstterm>. The standard text cursor in left-to-right
-languages is a mark with right gravity, because it stays to the right of
-inserted text.
+modifications. To preserve a position, the #GtkTextMark object is ideal. You
+can think of a mark as an invisible cursor or insertion point; it floats in 
+the buffer, saving a position. If the text surrounding the mark is deleted, 
+the mark remains in the position the text once occupied; if text is inserted 
+at the mark, the mark ends up either to the left or to the right of the new 
+text, depending on its <firstterm>gravity</firstterm>. The standard text 
+cursor in left-to-right languages is a mark with right gravity, because it 
+stays to the right of inserted text.
 </para>
 
 <para>
 Like tags, marks can be either named or anonymous. There are two marks built-in
 to #GtkTextBuffer; these are named <literal>"insert"</literal> and 
 <literal>"selection_bound"</literal> and refer to the insertion point and the 
-boundary of the selection which is not the insertion point, respectively. If no 
-text is selected, these two marks will be in the same position. You can manipulate 
-what is selected and where the cursor appears by moving these marks around.
-
+boundary of the selection which is not the insertion point, respectively. If 
+no text is selected, these two marks will be in the same position. You can 
+manipulate what is selected and where the cursor appears by moving these 
+marks around.
 <footnote>
 <para>
 If you want to place the cursor in response to a user action, be sure to use

docs/reference/gtk/tmpl/gtk-unused.sgml

@@ -213,6 +213,30 @@ GtkPacker
 Private Information
 
 
+<!-- ##### SECTION ./tmpl/gtkthemes.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkthemes.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkthemes.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtkthemes.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtkthemes.sgml:Title ##### -->
+Themes
+
+
 <!-- ##### SECTION ./tmpl/gtktreemodelsimple.sgml:Long_Description ##### -->
 <para>
 
@@ -531,6 +555,12 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
 </para>
 
 
+<!-- ##### ARG GtkAboutDialog:name ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT GtkAccelEntry ##### -->
 <para>
 This is a private struct used by GTK+ internally, don't worry about it.
@@ -619,6 +649,18 @@ Define a function pointer.  Deprecated.
 @arg: 
 @arg_id: 
 
+<!-- ##### STRUCT GtkBuilderClass ##### -->
+<para>
+
+</para>
+
+@get_type_from_name: Looks up a type by name. The default
+  implementation applies heuristics to map type names to
+  <function>_get_type</function> function names, e.g. 
+  GtkHBox to gtk_hbox_get_type(). This virtual function
+  is provided to allow language bindings to intercept the
+  type resolution process.
+
 <!-- ##### STRUCT GtkCellRendererTextPixbuf ##### -->
 <para>
 
@@ -626,6 +668,12 @@ Define a function pointer.  Deprecated.
 
 @parent: 
 
+<!-- ##### ARG GtkCellView:use-fg ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ARG GtkColorSelection:previous-alpha ##### -->
 <para>
 
@@ -1340,6 +1388,14 @@ produce superscript and subscript.
 </para>
 
 
+<!-- ##### SIGNAL GtkTextView::move-focus ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+@arg1: 
+
 <!-- ##### ARG GtkTextView:height-lines ##### -->
 <para>
 
@@ -1364,6 +1420,15 @@ produce superscript and subscript.
 </para>
 
 
+<!-- ##### SIGNAL GtkToolbar::move-focus ##### -->
+<para>
+
+</para>
+
+@toolbar: the object which received the signal.
+@arg1: 
+@Returns: 
+
 <!-- ##### ARG GtkToolbar:pack-end ##### -->
 <para>
 
@@ -1525,6 +1590,14 @@ the #GtkAdjustment which sets the range of the scale.
 
 @window: the object which received the signal.
 
+<!-- ##### SIGNAL GtkWindow::move-focus ##### -->
+<para>
+
+</para>
+
+@window: the object which received the signal.
+@arg1: 
+
 <!-- ##### ARG GtkWindow:auto-shrink ##### -->
 <para>
 If the window shrinks automatically when widgets within it shrink.
@@ -1944,6 +2017,14 @@ Sets the default size of child buttons.
 
 @Returns: 
 
+<!-- ##### FUNCTION gtk_cell_view_get_use_fg ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_cell_view_set_cell_data ##### -->
 <para>
 
@@ -1952,6 +2033,14 @@ Sets the default size of child buttons.
 @cell_view: 
 @cellview: 
 
+<!-- ##### FUNCTION gtk_cell_view_set_use_fg ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@use_fg: 
+
 <!-- ##### FUNCTION gtk_clist_construct ##### -->
 <para>
 Initializes a previously allocated #GtkCList widget for use.  This should not
@@ -2169,6 +2258,39 @@ This function is not usually used by users.
 @tree_column: 
 @titles: 
 
+<!-- ##### FUNCTION gtk_decorated_window_calculate_frame_size ##### -->
+<para>
+
+</para>
+
+@window: 
+
+<!-- ##### FUNCTION gtk_decorated_window_init ##### -->
+<para>
+
+</para>
+
+@window: 
+
+<!-- ##### FUNCTION gtk_decorated_window_move_resize_window ##### -->
+<para>
+
+</para>
+
+@window: 
+@x: 
+@y: 
+@width: 
+@height: 
+
+<!-- ##### FUNCTION gtk_decorated_window_set_title ##### -->
+<para>
+
+</para>
+
+@window: 
+@title: 
+
 <!-- ##### FUNCTION gtk_drag_dest_handle_event ##### -->
 <para>
 Internal function.

docs/reference/gtk/tmpl/gtkaboutdialog.sgml

@@ -28,6 +28,25 @@ 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>
@@ -84,7 +103,7 @@ only private fields and should not be directly accessed.
 
 </para>
 
-<!-- ##### ARG GtkAboutDialog:name ##### -->
+<!-- ##### ARG GtkAboutDialog:program-name ##### -->
 <para>
 
 </para>
@@ -140,6 +159,24 @@ only private fields and should not be directly accessed.
 @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>
 
@@ -381,7 +418,7 @@ link is activated.
 </para>
 
 @about: the #GtkAboutDialog in which the link was activated
-@link: the URL or email address to whiche the activated link points
+@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()

docs/reference/gtk/tmpl/gtkaction.sgml

@@ -246,6 +246,15 @@ and should not be accessed directly.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_action_create_menu ##### -->
+<para>
+
+</para>
+
+@action: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_action_connect_proxy ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkactiongroup.sgml

@@ -28,6 +28,40 @@ toolitems take on this accelerator path. The GTK+ accelerator map code makes
 sure that the correct shortcut is displayed next to the menu item.
 </para>
 
+<refsect2 id="GtkActionGroup-BUILDER-UI">
+<title>GtkActionGroup as GtkBuildable</title>
+<para>
+The GtkActionGroup implementation of the GtkBuildable interface accepts
+GtkAction objects as &lt;child&gt; elements in UI definitions.
+</para>
+<para>
+Note that it is probably more common to define actions and action groups
+in the code, since they are directly related to what the code can do.
+</para>
+<para>
+The GtkActionGroup implementation of the GtkBuildable interface supports a 
+custom &lt;accelerator&gt; element, which has attributes named key and
+modifiers and allows to specify accelerators. This is similar to the 
+&lt;accelerator&gt; element of GtkWidget, the main difference is that 
+it doesn't allow you to specify a signal.
+</para>
+<example>
+<title>A <structname>GtkDialog</structname> UI definition fragment.</title>
+<programlisting><![CDATA[
+<object class="GtkActionGroup" id="actiongroup">
+  <child>
+      <object class="GtkAction" id="About">
+          <property name="name">About</property>
+          <property name="stock_id">gtk-about</property>
+          <signal handler="about_activate" name="activate"/>
+      </object>
+      <accelerator key="F1" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
+  </child>
+</object>
+]]></programlisting>
+</example>
+</refsect2>
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
@@ -203,7 +237,8 @@ gtk_action_group_add_actions() to construct actions.
 @stock_id: The stock id for the action, or the name of an icon from the icon 
     theme.
 @label: The label for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain().
+    translation, see gtk_action_group_set_translation_domain(). If @label
+    is %NULL, the label of the stock item with id @stock_id is used.
 @accelerator: The accelerator for the action, in the format understood by 
     gtk_accelerator_parse().
 @tooltip: The tooltip for the action. This field should typically be marked