2.4.2

Calculate the length of the entry contents in characters, not in bytes.
Thu Jun 3 21:17:29 2004 Matthias Clasen <maclas@gmx.de> * gtk/gtkentry.c (gtk_entry_completion_timeout): Calculate the length of the entry contents in characters, not in bytes. * gtk/gtkentry.c (paste_received): Don't pop up the completion window on paste, noticed by Anders Carlsson.
2004-06-04 15:06:26 +00:00 · 2004-06-04 01:18:19 +00:00 · 2004-06-04 00:55:05 +00:00 · 2004-06-03 19:23:29 +00:00 · 2004-06-03 00:14:49 +00:00 · 2004-06-02 23:15:45 +00:00
1085 changed files with 139448 additions and 303896 deletions
--- a/2020
+++ b/2020
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
--- a/4
+++ b/4
@@ -18,8 +18,8 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================

-  % gzip -cd gtk+-2.6.1.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.6.1			   # change to the toplevel directory
+  % gzip -cd gtk+-2.4.2.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.4.2			   # change to the toplevel directory
  % ./configure				   # run the `configure' script
  % make				   # build GTK
  [ Become root if necessary ]
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,9 +13,6 @@ EXTRA_DIST =			\
 	ChangeLog.pre-1-0	\
 	ChangeLog.pre-1-2	\
 	ChangeLog.pre-2-0	\
-	ChangeLog.pre-2-2	\
-	ChangeLog.pre-2-4	\
-	ChangeLog.pre-2-6	\
 	README.cvs-commits	\
 	README.win32		\
 	config.h.win32		\
@@ -23,6 +20,7 @@ EXTRA_DIST =			\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
+	po/makefile.mingw	\
 	po/po2tbl.sed.in	\
 	examples/aspectframe/Makefile  \
 	examples/aspectframe/aspectframe.c  \
--- a/595
+++ b/595
@@ -1,577 +1,38 @@
-Overview of Changes from GTK+ 2.6.0 to GTK+ 2.6.1
+Overview of Changes from GTK+ 2.4.1 to GTK+ 2.4.2
 =================================================
-* GtkFileChooser
- - Fix some possible threading deadlocks [Matthias Clasen]
- - Don't return errors from the private GTK_FILE_SYSTEM_ERROR
-   domain [Murray Cumming]
- - Fix some crashes with unreadable directories [Federico Mena 
-   Quintero]
- - Add an "Open Location" item to the context menu [Federico]
-* GtkTreeView
- - Make sorting work again in list stores [Marcin Krzyzanowski]
- - Restrict column reordering to button 1 [Jonathan Blandford]
-* GtkComboBox
- - Make the button prelight [Ricardo Veguilla]
- - Fix state propagation [Carlos Garnacho Parro]
-* GtkMessageDialog
- - Don't show secondary label until it is set [Christian Persch]
-* GtkMenu
- - Make items activate immediately on button release [Søren Sandmann]
- - Submenus inherit their cascading direction [Matthias]
-* gdk-pixbuf
- - Fix a possible threading deadlock when loading
-   animations [Callum McKenzie]
- - Make Hyper interpolation work again [Dennis Nezic]
-* Win32
-  - Improve handling of UNC paths [Tor Lillqvist]
-  - Show the correct Desktop folder in the file chooser [Tor]
-  - Bug fixes [Tor]
-* Bug fixes [Torsten Schoenfeld, Morten Welinder,
-  Marcin, Seth Nickell, Jonathan, Owen Taylor, Søren, 
-  Iñigo Serna, John Finlay, Zeeshan Ali, Robert Ögren,
-  Billy Biggs, Brian Tarricone, Tor, Christian, Tristan 
-  Van Berkom, Elijah Newren, Federico, James M. Cape,
-  Matthias, Arnaud Charlet]
-* Documentation improvements [Masao Mutoh, Torsten,
-  Billy, Alessio Dessi, David Bourguignon, Tommi Komulainen,
-  Dave Bordoley, Robert Ancell, Kentaro Fukuchi, Matthias,
-  Christian Biere, Jonathan, Tommi, Stefan Kost]
-* New and improved translations (cs,cy,da,de,en_CA,es,ja,lt,nl,sq,sv,zh_CN)
-
-Overview of Changes from GTK+ 2.4.x to GTK+ 2.6.0
-=================================================
-
-* New widgets
-  - GtkIconView
-  - GtkAboutDialog
-  - GtkCellView 
-  - GtkFileChooserButton
-  - GtkMenuToolButton 
-
-* New cell renderers
-  - GtkCellRendererCombo 
-  - GtkCellRendererProgress
-
-* Changes in GtkFileChooser
-  - Many tweaks to keynav and other behaviour
-
-* Changes in GtkTreeView 
-  - Hover selection
-  - Hover expand
-  - Separators 
-  - Insensitive rows
-  - Typeahead
-
-* Changes in GtkComboBox
-  - Allow trees in combo boxes
-  - Hover selection
-  - Hover expand
-  - Separators 
-  - Insensitive rows
-  - Scrolling
-
-* Changes in GtkLabel
-  - Rotated text
-  - Ellipsisation
-  - Dnd from selectable labels
-  - Selectable labels in the focus chain
-  - Obey the Pango backspace-deletes-character attribute
-
-* Changes in GtkTextView
-  - Rotated text
-  - Obey the Pango backspace-deletes-character attribute
-
-* Changes in Clipboard/Selection/DND handling
-  - Selection ownerchip change notification
-  - API to handle text, image and file targets
-  - Support text/plain target
-  - Support clipboard persistency
-  - Support xdnd v5
-  - Reduce clipboard timeout to 30 seconds
-
-* Theming
-  - Follow icon theme specification for directory locations
-  - Themed window icons
-  - Themed images in GtkImage
-  - Allow themes to displace focus rectangles on click
-  - Various new stock icons
-
-* Window Manager interaction
-  - Support do-not-focus-on-map hint
-  - Support _NET_WM_USER_TIME
-
-* gdk-pixbuf:
-  - License information for image loaders
-  - Disable loaders
-  - Simple rotation
-  - Make threadsafe
-
-* Performance improvements
-  - Increase chunk size for incremental selection transfers
-  - Get rid of many PLT entries
-  - Icon theme caching
-  - Sync counter mechanism to speed up resizes
-  - Reimplement GtkListStore on top of a splay tree
-  - Fix algorithmic problems in GtkUIManager
-
-* Win32-specific changes
-  - Integrate IME input method module
-  - Integrate ms-windows (Wimp) theme engine
-
-* Other changes
-  - API for HIG-conform dialogs
-  - API for stock-like buttons
-  - New init API based on GOption
-  - Setting for alternative button order
-  - Setting for modules to load
-  - Integrate pixbuf theme engine
-  - Change notebook tabs with the scroll wheel
-  - Ellipsisation in GtkCellRendererText, GtkProgressBar, GtkStatusbar
-  - Clean up abi and enforce list of exported symbols
-
-Overview of Changes from GTK+ 2.5.6 to GTK+ 2.6.0
-=================================================
-* GtkListStore
-  - Emit rows_reordered if the list is reordered [Matthias Clasen]
-  - Add functions to allow inserting rows with values [Matthias]
-* GtkTextView
-  - Add function which allow to determine the character
-    at a position [Padraig O'Briain, Matthias]
-* GtkFileChooser
-  - Center select row during typeahead [Federico Mena Quintero]
-  - Reset filters when necessary [Carlos Garnacho Parro]
-* GtkMenu
-  - Make mnemonics without Alt work in menubars [Owen Taylor]
-  - Scroll wheel scrolling [Matthias]
-* GtkLabel
-  - Add a max-width-chars property to specify the maximal 
-    width of a label in characters [Christian Persch]
-* GtkIconView 
-  - Arrange items in a grid [Matthias]
-  - Convert hardcoded spacing constants into properties [Matthias]
-* GtkCellRendererText
-  - Add ::width-chars property [James M. Cape]
-* Win32
-  - Implement keynav for the color picker [Hans Breuer]
-  - Use GLib stdio wrappers [Tor Lillqvist]
-* Bug fixes [Kazuki IWAMOTO, Damon Chaplin, Matthias, Christian, 
-  Michael Natterer, Jonathan Blandford, Manish Singh, John Finlay, 
-  Robert Ögren, Mariano Suárez-Alvarez, Marco Pesenti Gritti,
-  Tommi Komulainen, R. McFarland, Alexander Larsson, Dennis Cranston,
-  Jorn Baayen]
-* Documentation improvements [Matthias, Jay Camp, Paolo Borelli,
-  David Lodge]
-* New and improved translations (bg,nb,no,nso,pt_BR,zh_CN)
-
-Overview of Changes from GTK+ 2.5.5 to GTK+ 2.5.6
-=================================================
-* GtkFileChooser
-  - Improve keybindings [Davyd Madeley, Federico Mena Quintero]
-  - Speed up loading of large directories [Federico]
-  - Move "Browse for other folders" expander up [Federico]
-  - Support DND from the path bar [Federico]
-* GtkColorSelectionDialog
-  - Add keynav to the color picker [Frances Keenan, Matthias Clasen]
-* GtkButton
-  - Allow construction of stock-like buttons  [Matthias,
-    Jonathan Blandford]
-* GtkLabel
-  - Support DND for selectable labels [Matthias]
-  - Support rotated text [Owen Taylor, Hans Breuer]
-* GtkTextView
-  - Support rotated text [Owen Taylor]
-  - Make it possible to select the first/last line
-    when moving by lines  [Paolo Borelli]
-* GtkTreeView
-  - Make sorting of GtkListStore stable again [Søren Sandmann]
-  - Change the behaviour of gtk_tree_sortable_get_sort_column_id() 
-    slightly to be more useful [Matthias]
 * GtkUIManager
-  - Make some functions virtual to make deriving 
-    GtkUIManager easier [Michael Natterer]
-* GtkSettings
-  - Handle changes to gtk-menu-images and gtk-button-images
-    much more efficiently [Matthias]
+ - Install signals correctly [Michael Natterer]
+ - Make the output of gtk_ui_manager_get_ui() parsable. [Michael]
+ - Add a way to suppress stock accelerators. [David A Knight]
 * GtkClipboard
-  - Reduce timeout to 30 seconds [Billy Biggs]
-* Add pixbuf theme engine [Owen]
-* GDK 
-  - Compile against X11R5 [Matthias]  
-  - Add GdkPangoRenderer [Owen]
-  - Support rotated text [Owen]
-  - Add dead_hook and dead_horn keysyms [Samuel Thibault]
-  - Determine direction of XKB groups from their content 
-    [Behdad Esfahbod, Ilya Konstantinov]
-* Win32
-  - Notice when drives are plugged in or removed [Hans]
-  - Ms-windows theme improvements: no tearoff menu items,
-    button order, toolbar and statusbar grips, combobox 
-    arrows [Dom Lachowicz]
-  - Fix im module loading [Tor Lillqvist]
-* Bug fixes [Vasco Alexandre da Silva Costa, Kazuki IWAMOTO,
-  Erwann Chenede, Tim Janik, Gavin Romig-Koch, Jonathan,
-  Manish Singh, Morten Welinder, Billy Biggs, Matthias, Owen,
-  John Finlay, Christian Neumair, Sven Neumann, Felipe
-  Heidrich, Martin Jeppensen, Kristian Høgsberg, Olivier 
-  Andrieu, Jody Goldberg, Søren, Dan Winship, Federico,
-  Alex Larsson, James Henstridge, James M. Cape, Frederic Crozat,
-  Dennis Cranston, Marcel Telka, Robert Ögren]
-* Documentation improvements [Matthias, Jonathan, Owen, Masao Mutoh,
-  Billy Biggs]
-* New and updated translations (bg,ca,cs,da,de,en_CA,en_GB,es,hu,ja,nb,nso,rw,sq,zh_CN)
-
-Overview of Changes from GTK+ 2.5.4 to GTK+ 2.5.5
-=================================================
-* gdk-pixbuf
-  - Make threadsafe [Colin Walters]
+ - Fix INCRemental transfer of MULTIPLE targets [Matthias Clasen]
+ - Increase the chunk size for INCRemental transfers [Matthias]
 * GtkFileChooser
-  - Make tooltips work better [Matthias Clasen]
-  - Show files (grayed out) in folder modes [Nickolay V. Shmyrev]
-  - Add predefined filter for image files [Anders Carlsson]
-  - Support mime subclasses, aliases and superclasses 
-    like text/* [Tommi Komulainen, David A. Knight, Matthias]
-* GtkFileChooserButton
-  - Remove support for CREATE_FOLDER and SAVE modes 
-    until a more satisfactory UI for these can be found [Seth Nickell,
-    Matthias]
-  - Make file DND work better [Christan Persch]
-* GtkAction
-  - Add a function to obtain the accel path [Michael Natterer]
-* GtkUIManager
-  - Major performance improvement [Dave Neary, Michael, 
-    Sven Neumann, Soeren Sandmann, Matthias]
-* GtkIconView
-  - Make scrolling work with large icon views [Matthias]
-* GtkWindow
-  - As a last resort, allow to use mnemonics without 
-    modifier [Pasupathi Duraisamy, Owen Taylor]
-* GtkProgressBar
-  - Support ellipsizing the text [Morten Welinder, Matthias]
-* GtkStatusbar
-  - Avoid resizing if the text of the label changes [He Qiangqiang,
-    Owen, Christian]
-  - Draw the resize grip better [Matthias, Christian]
-  - Ellipsize the text [Matthias]
-* GtkClipboard
-  - Add API for image transfer via copy-and-paste [Matthias]
-* DND
-  - Fix DND to embedded windows (e.g. panel applets) [James Henstridge, 
-    Matthias]
-* Stock icons
-  - Add RTL variants of the media icons [Bastien Nocera]
-* Win32
-  - Build fixes [Hans Breuer, Tor Lillqvist]
-  - Implement resize grips [Robert Ögren]
-  - Bug fixes [Robert, Tor, J. Ali Harlow]
-* Bug fixes [Paolo Borelli, Kjartan Maraas, Olivier Andrieu,
-  Torsten Schoenfeld, Matthias, Philip Langdale, Christian,
-  Frances Keenan, Owen, Murray Cumming, Christophe Fergeau,
-  Tristan Van Berkom, Adam Hooper, James M. Cape, Carlos Garnacho
-  Parro, Mariano Suárez-Alvarez, John Finlay, Jonathan Blandford]	
-* Documentation improvements [Masao Mutoh, Matthias, 
-  Torsten Schoenfeld, Matthew H. Plough, Salvador Fandiño, 
-  Owen, Vincent Untz, Jonathan, Bastien]
-* Updated translations (cs,da,en_CA,es,hu,ja,nl,sq)
-
-Overview of Changes from GTK+ 2.5.3 to GTK+ 2.5.4
-=================================================
-* GtkFileChooser
- - Make path bar arrows larger [Matthias Clasen]
- - Make SELECT_FOLDER mode work [Matthias]
- - Speed up the completion popup, pop it up
-   again after Tab [Matthias, Jens Bech Madsen]
- - Add some tooltips [Matthias]
- - Make path bar scroll [Matthias]
- - Improve preview updating [Tommi Komulainen]
- - Make the key / pop up the location dialog even
-   on French keyboards, insert the /. [Frederic Crozat, Warren Togami]
-* GtkFileChooserButton
- - Show icons next to entry [James M. Cape]
- - Improve ellipsisation [James]
-* GtkMessageDialog
- - API additions to create HIG-conform dialogs [David Bordoley, Carlos
-   Garnacho Parro]
-* Keyboard navigation
- - Put selectable labels in the regular tab focus 
-  chain [David Hawthorne, Matthias]
- - Skip selectable labels when looking for the initial 
-  focus widget in dialogs [Matthias]
-* Icon themes:
- - Use an mmap()ed cache for directory data. [Martijn Vernooij,
-   Owen Taylor, Anders Carlsson]
-* Clipboard, DND: 
- - Add convenience API for image and file transfers. [Matthias]
- - Add API for clipboard persistence [Anders]
- - Don't loose clipboard contents if a text buffer is
-   finalized [Anders]
-* Add a GtkMenuToolButton widget which displays a
- dropdown menu from a toolbar button.  [Paolo Borelli]
-* Make menus scroll faster [Soeren Sandmann]
-* Allow themes to displace focus recangles in buttons
- on click [Soeren, Matthias]
-* Add a public setting for button ordering [Owen Taylor, Matthias]
-* GtkImage
- - Support named icons [James Henstridge]
-* GtkAboutDialog
- - Support named icons [James Henstridge]
-* Add a function to obtain the string representation of
- accelerators used in GtkAccelLabel [John Spray, Matthias]
-* Win32 bug fixes [Robert Ögren]
- - Fix commandline option handling [Tor Lillqvist]
- - Make IME input method work better [Tor]
-* Other bug fixes [Joel Fredrikson, Darren Creutz,
- Manish Singh, Matthias, Tristan Van Berkom, Christian Persch,
- Padraig O'Briain, Owen, Jonathan Blandford, 
- Michèle Garoche, Milosz Derezynski, Christopher Blizzard,
- Paolo, John Austin, Maryn Russell, Ken Harris, Reinout van 
- Schouwen, Morten Welinder, Ross Burton, Bernd Demian, Gustavo 
- Carneiro, John Finlay, Tim Janik, Damon Chaplin,
- Peter Zelesny, Soeren, John Cupitt, Federico Mena Quintero,
- Manuel Baena García, William Jon McCann, Olexiy Avramchenko,
- Sebastien Bacher, Kazuki IWAMOTO, Dan Williams, Vincent Noel,
- Billy Biggs, Olivier Andrieu, Thomas Fitzsimmons]
-* Documentation improvements [John Finlay, Billy Biggs, Matthias,
- Martyn Russell, Dave Cook, Jonathan, Owen, Shaun McCance, Anders]
-* New and updated translations (az_IR,cs,en_CA,en_GB,es,nb,nl,no,pt_BR,
-  sq,sr,sr@Latn,zh_TW)
-
-Overview of Changes from GTK+ 2.5.2 to GTK+ 2.5.3
-=================================================
-* GtkFileChooser
- - Work better with older version of the gnome-vfs backend [Zack Cerza]
- - Keynav improvements [Jonathan Blandford]
- - Make position of pathbar down button stable [Jonathan]
- - Make autocompletion less annoying in save mode [Owen Taylor]
-* GtkFileChooserButton
- - Allow mnemonic activation [Dennis Cranston, James M. Cape]
+ - Hide the combo box when appropriate [Christian Neumair]
+ - bug fixes [Federico Mena Quintero]
 * GtkComboBox
- - Work without a model [Mariano Suarez-Alvarez
-* GtkTreeView
- - Allow sorting of tree models to be turned off [Torsten Schoenfeld]
-* GtkRange
- - Add a::change-value signal [Thomas Fitzsimmons]
+ - add mouse/wheel bindings on the cellview [Matthias]
+ - improve positioning of popup [Matthias]
+ - make the selection follow the mouse [Matthias]
 * GtkEntryCompletion
- - Improve positioning of popups [Matthias]
-* Make input methods respect editability [Noah Levitt]
-* Add an setting to specify modules to load [Alex Graveley]
-* Use GOption for commandline argument parsing [Anders Carlsson]
-* Default theme
- - Improve drawing of expanders [Matthias Clasen]
-* Add a configure option to disable the use of ELF visibility 
-  attributes for PLT reduction
-* Make selection handling robust against invalid UTF-8 [Owen]
-* gdk-pixbuf
- - Add a variant of gdk_pixbuf_new_from_file_at_size() which 
-   optionally ignores aspect ratio [Dom Lachowicz]
- - Fix saving of pixbufs with alpha-channel as jpeg [Emmanuel Pacaud]
- - Security fixes [Chris Evans]
+ - make the selection follow the mouse [Matthias]
+ - restrict popup size to monitor size [Matthias, DmD Ljungmark]
+ - don't complete on paste [Anders Carlsson]
 * Win32
- - Improve tablet handling [Robert Ögren]
- - Make tablets work on multi-monitor systems [Robert]
- - Handle screen resolution changes [Arjohn Kampman, Tor Lillqvist]
- - Add IME input method [Takuro Ashie, Kazuki IWAMOTO]
- - Add ms-windows (Wimp) theme engine [Raymond Penners, Dom Lachowicz,
-   Havoc Pennington]
- - Fix loading of input modules on Win32 [Kazuki IWAMOTO]
- - Build fixes [Tor Lillqvist, Robert]
-* Other bug fixes [Hans Petter Jonsson, Tim Janik, Manish Singh,
- Soeren Sandmann, Bill Haneman, Padraig O'Briain, Olexi Avramchenko,
- Jonathan, Frederic Croszat, Matthias, Christian Persch, Felipe Heidrich,
- Lorenzo Gil Sanchez, Richard Hoelscher, Owen, Olivier Andrieu,
- Morten Welinder, Jean Bréfort, Alexander Larsson]
-* Documentation improvements [Matthias, Jonathan]
-* New and updated translations (ang,ar,en_CA,es,ne,pt_BR,ro,ru,uk)
-
-Overview of Changes from GTK+ 2.5.1 to GTK+ 2.5.2
-=================================================
-* GtkFileChooserButton
- - New widget to go along with GtkFontButton and GtkColorButton
-   for use in preference dialogs.  [James M. Cape]
-* GtkFileChooser
- - Add getter and setter for the ::show-hidden property [Jeff Franks]
- - Allow paths to be entered as part of the filename. [Federico Mena Quintero]
- - Make separator in bookmarks pane unselectable [Matthias Clasen]
- - Improve activation on focus [Federico]
- - Avoid warnings when opened on non-default screens [Abel Daniel]
- - Fix some memory leaks [Federico]
-* GtkEntryCompletion
- - Warn if text column has wrong type [Fernando San Martin Woerner,
-   Gustavo Carneiro]
-* GtkTextView
- - Obey the Pango backspace_deletes_character 
-   attribute [Noah Levitt, Teppitak Karoonboonyanan]
-* GtkTreeView
- - Add hover-expand mode [Matthias]
- - Fix fixed height mode [Michael Vogt, Tim-Philipp Müller, Pawel Salek]
- - Reimplement GtkListStore on top of a splay tree [Soeren Sandmann]
-* GtkEntry
- - Track the selection more accurately when dragging and
-   selecting [Soeren]
-* GtkComboBox
- - Support trees in combo boxes [Matt Walton, Matthias]
- - Optimize non-spanning gridded layouts [Lorenzo Gil Sanchez, Matthias]
- - Handle sensitivity changes properly [Matthias]
- - Add a ::focus-on-click property [Matthias]
-* GtkIconView
- - Fix BROWSE selection mode [Matthias]
- - Make accessible [Padraig O'Briain]
-* GtkAboutDialog 
- - Change the API to be more binding-friendly [Oliver Andrieu]
-* GtkUIManager
- - Accept paths with leading '/' everywhere. [David Malcolm]
- - Make GtkActionEntry* arguments const [Mariano Suarez-Alvarez]
- - Add a way to suppress overflow menu items [Christian Persch]
-* GtkPlug/GtkSocket
- - Use the sync counter mechanism to speed up resizes  [Soeren]
-* GDK
- - Support XDND v5 [Owen Taylor, Matthias]
- - Complete the _NEW_WM_USER_TIME implementation [Elijah Newren]
- - Update the _NET_ACTIVE_WINDOW implementation [Elijah]
-* gdk-pixbuf
- - Avoid infinite loops for bad BMPs [Chris Evans, Manish Singh]
- - Fix a problem with GDK_INTERP_NEAREST scaling which caused
-   Nautilus thumbnails to be misdrawn [Christoph Fergeau]
- - Avoid segfaults in gdk-pixbuf-csource [Matthias]
- - Fix progressive loading of 8bit pcx files [Magnus Bergman]
- - Handle edge pixels consistently [Brian Cameron, Matthias]
- - Handle OS/2 BMPs [Jon-Kare Hellan]
-* Performance 
- - Get rid of many PLT entries for internally used exported symbols,
-   and clean up the ABI at the same time and make make check check the
-   list of exported symbols.  [Arjan van de Ven, Matthias]
-* Look up icon themes in the directories specified in the
-  icon theme spec  [Matthias]
-* Win32 bug fixes [Robert Ögren, Hans Breuer, Tor Lillqvist, Tim Evans]
-* Other bug fixes [Matthias, Soeren, Pawel, David, Tor, Gustavo,
-  Olivier, Manish, Robert, Christian Biere, Markku Vire, Markus Lausser, 
-  Thomas Leonard, Morten Welinder, Torsten Schoenfeld, Tim Janik, 
-  Tomislav Jonjic, Tommi Komulainen, Philip Langdale, Rich Wareham,
-  Christian Persch, Vincent Noel, Christophe Fergeau]
-* Documentation improvements [Matthias, Mariano, Axel Simon, 
-  Jonathan Blandford]
-* New and updated translations (ang,br,bs,eu,lt,wa,zh_CN)
-
-Overview of Changes from GTK+ 2.5.0 to GTK+ 2.5.1
-=================================================
-* GtkTreeView
- - Support ellipsisation in GtkCellRendererText [Vincent Untz, 
-  Jonathan Blandford, Anders Carlsson]
- - Add a GtkCellRenderer::editing-started signal [Matthias Clasen]
- - Typeahead support [Jonathan]
- - Align the entry in GtkCellRendererText [Matthias]
- - Make DND work again [Ernst Persson, Matthias]
- - Improve appearance of search popup [Matthias]
-* GtkFileChooser
- - Activate the last focused widget [Federico Mena Quintero]
- - Add an "Add to shortcuts" item to the context menu [Federico]
-* GtkCombobox
- - Support scrolling in list mode [Matthias]
- - Add necessary API to make GtkComboBox accessible [Padraig O'Briain]
- - Change the API for separators to use a callback function 
-   instead of a boolean model column [Matthias]
-* GtkNotebook
- - Ignore scroll events from page content [Gabriel de Perthuis]
-* GtkAboutDialog
- - Visual improvements [Anders]
-* GtkIconView
- - Use XRender to draw selection rectangle [Anders]
-* GtkLabel
- - Support ellipsisation [Tim Van Wassenhove, James M. Cape]
-* Expose the menubar accel key as an XSetting [Scott James Remnant]
-* Add example code for clipboard handling to gtk-demo [Anders]
-* Bug fixes [Peter Zelesny, Guilherme Salgado, John Finlay, 
- Tommi Komulainen, Matthias, Crispin Flowerday, Padraig,
- Morten Welinder, Olivier Sessink, Dafydd Harries, Soeren Sandmann,
- Michael Natterer, Nicolas Deves, Matthew Garrett, Lorenzo Gil Sanchez]
-* Documentation improvements [Federico, Matthias]
-* Updated translations (gu,hi,pt_BR,ru,sv,uz)
-
-Overview of Changes from GTK+ 2.4.1 to GTK+ 2.5.0
-=================================================
-* New widgets: 
- - GtkIconView [Anders Carlsson]
- - GtkAboutDialog [Matthias Clasen]
- - GtkCellView [Matthias]
-* GtkFileChooser
- - change to newly-created folders [Federico Mena Quintero]
- - always show icons [Federico]
- - bug fixes [Federico, Christian Neumair, Alex Roitman]
-* GtkComboBox, GtkComboBoxEntry
- - add missing getters and some more convience API [Matthias, 
-  Christian Neumeir, Oliver Andrieu]
- - improve placement and sizing of popups [Matthias]
- - support insensitive items [Matthias]
- - support separators [Matthias]
- - handle empty or unset models better [Mariano Suarez-Alvarez]
- - bug fixes [Matthias, Jonathan Blandford, Oliver Andrieu, Paul 
-   Pongonyshev, Christian Persch]
-* GtkEntryCompletion
- - ignore enter events when the window pops up under the 
-   pointer [Anders]
- - bug fixes [Matthias]
- - support inline autocompletion [Matthias]
-* GtkUIManager
- - fix signal registration [Michael Natterer]
- - make generated XML parseable [Sven Neumann]
- - fix get_widget to return menus [Matthias]
-* GtkTreeView
- - hover-selection mode [Matthias]
- - support insensitive cells [Matthias]
- - support separators [Matthias]
- - make entry context menu work in editable text cells [Owen Taylor, 
-  Kristian Rietveld]
- - make DND work with treeviews in modal dialogs [Federico]
- - make empty treeviews focusable [Federico]
- - new GtkCellRendererProgress [Matthias, Tommi Komulainen, 
-  Christian Persch]
- - new GtkCellRendererCombo [Matthias]
- - bug fixes [Matthias, Federico]
-* GtkNotebook
- - allow to change tabs with the mouse wheel [Gabriel de Perthuis]
-* GtkWindow
- - support named themed window icons [Matthias, Calum Benson]
-* New stock icons: file, directory, about, edit, connect, disconnect,
-  and media player icons for forward, next, pause, play, previous,
-  record, rewind and stop
-* GDK
- - support do-not-focus-on-map hint [Elijah Newren]
- - fix RGBA cursors [Michael Natterer]
-* gdk-pixbuf
- - reorganize headers [Matthias, Jeff Franks, Havoc Pennington]
- - flag to mark loaded images as scalable [Dom Lachowicz]
- - license information for loaders [Matthias]
- - simple multiple-of-90° rotation support [Matthias]
- - allow to disable loaders [Matthias]
- - bug fixes [Kouichirou Hiratsuka, Sven, Brian Cameron,
-  Manish Singh, Morten Welinder]
-* X11 selections 
- - make incremental transfer of MULTIPLE work [Matthias]
- - don't do incremental transfer in 4k chunks [Matthias]
- - add selection ownership change notification [Matthias]
- - support text/plain targets [Matthias]
-* Win32 
- - bug fixes [Hans Breuer, John Ehresman, Tor Lillqvist, 
-  Robert Ögren, Benoît Carpentier, J. Ali Harlow, Laurent Sansonetti]
-* Performance improvements
- - predict exposes for override-redirect windows [Søren Sandmann]
- - unset the background when mapping or unmapping windows [Søren]
- - support the update counter spec for smoother resizing [Søren]
-* Misc bug fixes [Matthias, Owen, Søren, Anders, Padraig O'Briain, 
-  Crispin Flowerday, Michal Pasternak, Scott Tsai, Morten,
-  Michael Natterer, Dmd Ljungmark, Sven, Billy Biggs, 
-  Mark McLoughlin, Sam Stephenson, John Finlay, David Hawthorne, 
-  Kent Sandvik, Davyd Madeley, Alexander Winston, Jean-François Wauthy, 
-  Jeff Franks, Philip Kendall, Baris Cicek Yevgen Muntyan, 
-  Bastien Nocera, Tim Janik, John Ehresman, Theppitak Karoonboonyanan, 
-  Nickolay V. Shmyrev, William Jon McCann, Paolo Maggi, Lorenzo Gil 
-  Sanchez, Jan-Marek Glogowski, Pawel Salek, Felipe Heidrich, Dmitry 
-  M. Shatrov, Alex Larsson, Michael Hallendal, Scott Bronson, Kjartan 
-  Maraas, Damien Carbery, Elke Meier]
-* Doc improvements [Matthias, Federico, Owen, Steve Chaplin, Tommi 
-  Komulainen, Bastien Nocera, Billy Biggs, Sampo Nurmentaus, Steffen 
-  Röcker, Doug Quale, Oliver Andrieu]
-* Updated translations (bg,lt,ne,tk,wa,en_GB)
-
+ - bug fixes [Benoît Carpentier, Hans Breuer, John Ehresman, 
+   Tor Lillqvist, Robert Ögren]
+* GtkButton/GtkArrow
+ - Don't draw the focus over the button child [Matthias]
+ - Increase default arrow size to compensate [Matthias]
+* Documentation improvements [Doug Quale, Matthias, 
+  Steffen Röcker, Steve Chaplin, Tommi Komulainen]
+* Other bug fixes [Billy Biggs, Crispin Flowerday, 
+  David Hawthorne, Federico, Havoc Pennington, John Finlay, 
+  Kouichirou Hiratsuka, Mark McLoughlin, Matthias, Michael, 
+  Michal Pasternak, Morten Welinder, Olivier Andrieu, 
+  Owen Taylor, Padraig O'Briain, Sam Stevenson, Scott Tsai, 
+  Soeren Sandmann, Sven Neumann]
+* Updated translations (bg,it,nl,tk,wa,zh_CN)

 Overview of Changes from GTK+ 2.4.0 to GTK+ 2.4.1
 =================================================
--- a/123
+++ b/123
@@ -1,7 +1,7 @@
 General Information
 ===================

-This is GTK+ version 2.6.1. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.4.2. 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.
@@ -28,86 +28,81 @@ See the file 'INSTALL'
 Release notes
 =============

-* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
-  a clipboard manager following the specification at
-  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
-  must be running. A sample implementation of such a clipboard manager
-  is available at 
-  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
-  Applications can use the function gdk_display_supports_clipboard_persistence() 
-  to find out if clipboard persistence is available.
-
-* Notification on clipboard ownership changes via GdkOwnerChange events 
-  requires the XFIXES X extension. Applications can use the function
-  gdk_display_supports_selection_notification() to find out if ownerchip
-  change notification is available.
-
-* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
-  specification. Setting the XDG_DATA_DIRS environtment variable may be 
-  necessary if your icons aren't installed in the default location 
-  /usr/share/icons.
-
-* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
-  to avoid a lot of disk searching overhead. GTK+ includes a utility named
-  gtk-update-icon-cache to generate these cache files. For further details,
-  see the gtk-update-icon-cache man page or the GTK+ documentation.
-
-* To reduce code size and improve efficiency, GTK+, when compiled 
-  with the GNU toolchain, has separate internal and external entry 
-  points for exported functions. The internal names, which begin with 
-  IA__, may be seen when debugging a GTK+ program.
-
-* The following functions have been deprecated in GTK+ 2.6:
-  gdk_pango_context_set_colormap
-  gtk_cell_renderer_editing_canceled
-
 * The new GtkFileChooser widget emphasizes simplicity and thus does 
  not provide a navigation entry by default when opening files. 
  Experienced command line users will likely want to make heavy use of
  the location dialog brought up by the Control-L key shortcut.

+* As compared to GTK+-1.2, the default configuration of GTK+-2 has been 
+  stream-lined to reduce confusion on the part of new users or users 
+  coming from other environments.  Users used to older versions of 
+  GTK+ may want to make some adjustments to the default configuration.
+
+   - Emacs keybindings such as Control-A and Control-E to move to the
+     ends of lines are not enabled by default in the editing widgets. To
+     turn on Emacs keybindings, add the line:
+
+      gtk-key-theme-name = "Emacs"
+   
+     To your ~/.gtkrc-2.0
+
+   - Editing of menu accelerators by pressing an accelerator over the
+     menu item is disabled by default. To enable, it, add:
+
+      gtk-can-change-accels = 1
+
+     to your ~/.gtkrc-2.0
+
+   - To improve useability for keyboard operation, GTK+ now selects the
+     contents of an entry when tabbing into it or when it is focused on
+     initial window map. To disable this behavior, add:
+
+      gtk-entry-select-on-focus = 0
+ 
+     to your ~/.gtkrc-2.0
+
 * The GTK+ libraries use an '_' prefix to indicate private symbols that
  must not be used by applications. On some platforms, symbols beginning 
  with prefixes such as _gtk, _gdk, and _pango will be exported
  from the library, on others not. In no case can applications
-  use these private symbols. In addition to that, GTK+ 2.6 makes several
-  symbols private which were not in any installed header files and
-  were never intended to be exported.
+  use these private symbols.

-* The gdk_pixbuf_xlib library included in the contrib/ directory 
-  and the framebuffer GDK backend included in the gdk/linux-fb directory
-  of GTK+ are provided on an as-is basis and have not been tested at all. 
-  No guarantees about the degree of workingness or about future
+* GTK+-2.4 now requires version 2 of Xft; old fashioned core X
+  fonts are no longer supported.
+
+* There is a bug in the Xft library in XFree86-4.1 and possibly previous
+  versions that causes random crashes when using the Pango Xft
+  backend. If you want to use Xft fonts, you should upgrade to
+  at least XFree86-4.2.
+
+* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
+  is provided on a as-is basis and has not been tested at all. No
+  guarantees about the degree of workingness or about future
  compatibility are provided.

-* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
-  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
+* While efforts have been made to make gdk-pixbuf robust against
+  invalid images, using gdk-pixbuf to load untrusted data 
+  is not recommended, due to the likelyhood that there are
+  additional problems where an invalid image could cause
+  gdk-pixbuf to crash or worse.
+
+* The assumption of GLib and GTK+ by default is that filenames on the
+  filesystem are encoded in UTF-8 rather than the encoding of the locale;
  the GTK+ developers consider that having filenames whose interpretation
  depends on the current locale is fundamentally a bad idea.

-  If you have filenames encoded in the encoding of your locale, then you 
-  may want to set the G_FILENAME_ENCODING environment variable:
+  If you have filenames encoded in the encoding of your locale, then
+  you may want to set the G_FILENAME_ENCODING environment variable:
  
-   G_FILENAME_ENCODING=@locale
+   G_FILENAME_ENCODING=@local
   export G_FILENAME_ENCODING

-  (Earlier versions of GLib 2.x required a different environment variable
+  (Earlier versions of GLib-2.x required a different environment variable
  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
  is still supported, but G_FILENAME_ENCODING is preferred.)
-  Best integration of GTK+ 2.6 with the environment is achieved by 
+  Best integration of GTK+-2.4 with the environment is achieved by 
  using a UTF-8 locale.

-  On Windows, filenames passed to GTK+ should always be in UTF-8, as
-  in GLib 2.6. This is different than in previous versions of GTK+
-  where the system codepage was used. As in GLib, for DLL ABI
-  stability, applications built against previous versions of GTK+ will
-  use entry points providing the old semantics.
-
-  When compiling against GTK+ 2.6, applications intended to be
-  portable to Windows must take the UTF-8 file name encoding into
-  consideration, and use the gstdio wrappers to access files whose 
-  names have been constructed from strings returned from GTK+ or GLib.
-
 How to report bugs
 ==================

@@ -127,10 +122,10 @@ In the bug report please include:

 * How to reproduce the bug. 

-  If you can reproduce it with one of the tests or demos built with GTK+, 
-  such as demos/gtk-demo/gtk-demo, that would be most convenient. Otherwise, 
-  please include a short test program that exhibits the behavior. As a 
-  last resort, you can also provide a pointer to a larger piece of software 
+  If you can reproduce it with the testgtk program that is built in the
+  gtk/ subdirectory, that will be most convenient.  Otherwise, please
+  include a short test program that exhibits the behavior.  As a last
+  resort, you can also provide a pointer to a larger piece of software
  that can be downloaded.

 * If the bug was a crash, the exact text that was printed out when the
@@ -152,7 +147,7 @@ Otherwise, enter a new bug report that describes the patch, and attach
 the patch to that bug report.

 Bug reports containing patches should include the PATCH keyword in their
-keyword fields. If the patch adds to or changes the GTK+ programming
+keyword fields. If the patch adds to or changes the GTK programming
 interface, the API keyword should also be included.
  
 Patches should be in unified diff form. (The -u option to GNU diff.)
--- a/README.cvs-commits
+++ b/README.cvs-commits
@@ -18,10 +18,10 @@ to ask people commiting to GTK+ to follow a few rules:
   gtk-devel-list-request@gnome.org.) This is a good place to ask
   about intended changes. 

-   #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
-   is also a good place to find GTK+ developers to discuss changes with,
-   however, email to gtk-devel-list is the most certain and preferred
-   method.
+   #gimp on byxnet (irc.gimp.org, irc2.gimp.org, irc3.gimp.org, 
+   irc.germany.gimp.org...)s also a good place to find GTK+ developers to
+   discuss changes with, however, email to gtk-devel-list is the most
+   certain and preferred method.

 1) Ask _first_.

--- a/README.in
+++ b/README.in
@@ -28,86 +28,81 @@ See the file 'INSTALL'
 Release notes
 =============

-* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
-  a clipboard manager following the specification at
-  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
-  must be running. A sample implementation of such a clipboard manager
-  is available at 
-  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
-  Applications can use the function gdk_display_supports_clipboard_persistence() 
-  to find out if clipboard persistence is available.
-
-* Notification on clipboard ownership changes via GdkOwnerChange events 
-  requires the XFIXES X extension. Applications can use the function
-  gdk_display_supports_selection_notification() to find out if ownerchip
-  change notification is available.
-
-* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
-  specification. Setting the XDG_DATA_DIRS environtment variable may be 
-  necessary if your icons aren't installed in the default location 
-  /usr/share/icons.
-
-* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
-  to avoid a lot of disk searching overhead. GTK+ includes a utility named
-  gtk-update-icon-cache to generate these cache files. For further details,
-  see the gtk-update-icon-cache man page or the GTK+ documentation.
-
-* To reduce code size and improve efficiency, GTK+, when compiled 
-  with the GNU toolchain, has separate internal and external entry 
-  points for exported functions. The internal names, which begin with 
-  IA__, may be seen when debugging a GTK+ program.
-
-* The following functions have been deprecated in GTK+ 2.6:
-  gdk_pango_context_set_colormap
-  gtk_cell_renderer_editing_canceled
-
 * The new GtkFileChooser widget emphasizes simplicity and thus does 
  not provide a navigation entry by default when opening files. 
  Experienced command line users will likely want to make heavy use of
  the location dialog brought up by the Control-L key shortcut.

+* As compared to GTK+-1.2, the default configuration of GTK+-2 has been 
+  stream-lined to reduce confusion on the part of new users or users 
+  coming from other environments.  Users used to older versions of 
+  GTK+ may want to make some adjustments to the default configuration.
+
+   - Emacs keybindings such as Control-A and Control-E to move to the
+     ends of lines are not enabled by default in the editing widgets. To
+     turn on Emacs keybindings, add the line:
+
+      gtk-key-theme-name = "Emacs"
+   
+     To your ~/.gtkrc-2.0
+
+   - Editing of menu accelerators by pressing an accelerator over the
+     menu item is disabled by default. To enable, it, add:
+
+      gtk-can-change-accels = 1
+
+     to your ~/.gtkrc-2.0
+
+   - To improve useability for keyboard operation, GTK+ now selects the
+     contents of an entry when tabbing into it or when it is focused on
+     initial window map. To disable this behavior, add:
+
+      gtk-entry-select-on-focus = 0
+ 
+     to your ~/.gtkrc-2.0
+
 * The GTK+ libraries use an '_' prefix to indicate private symbols that
  must not be used by applications. On some platforms, symbols beginning 
  with prefixes such as _gtk, _gdk, and _pango will be exported
  from the library, on others not. In no case can applications
-  use these private symbols. In addition to that, GTK+ 2.6 makes several
-  symbols private which were not in any installed header files and
-  were never intended to be exported.
+  use these private symbols.

-* The gdk_pixbuf_xlib library included in the contrib/ directory 
-  and the framebuffer GDK backend included in the gdk/linux-fb directory
-  of GTK+ are provided on an as-is basis and have not been tested at all. 
-  No guarantees about the degree of workingness or about future
+* GTK+-2.4 now requires version 2 of Xft; old fashioned core X
+  fonts are no longer supported.
+
+* There is a bug in the Xft library in XFree86-4.1 and possibly previous
+  versions that causes random crashes when using the Pango Xft
+  backend. If you want to use Xft fonts, you should upgrade to
+  at least XFree86-4.2.
+
+* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
+  is provided on a as-is basis and has not been tested at all. No
+  guarantees about the degree of workingness or about future
  compatibility are provided.

-* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
-  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
+* While efforts have been made to make gdk-pixbuf robust against
+  invalid images, using gdk-pixbuf to load untrusted data 
+  is not recommended, due to the likelyhood that there are
+  additional problems where an invalid image could cause
+  gdk-pixbuf to crash or worse.
+
+* The assumption of GLib and GTK+ by default is that filenames on the
+  filesystem are encoded in UTF-8 rather than the encoding of the locale;
  the GTK+ developers consider that having filenames whose interpretation
  depends on the current locale is fundamentally a bad idea.

-  If you have filenames encoded in the encoding of your locale, then you 
-  may want to set the G_FILENAME_ENCODING environment variable:
+  If you have filenames encoded in the encoding of your locale, then
+  you may want to set the G_FILENAME_ENCODING environment variable:
  
-   G_FILENAME_ENCODING=@locale
+   G_FILENAME_ENCODING=@local
   export G_FILENAME_ENCODING

-  (Earlier versions of GLib 2.x required a different environment variable
+  (Earlier versions of GLib-2.x required a different environment variable
  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
  is still supported, but G_FILENAME_ENCODING is preferred.)
-  Best integration of GTK+ 2.6 with the environment is achieved by 
+  Best integration of GTK+-2.4 with the environment is achieved by 
  using a UTF-8 locale.

-  On Windows, filenames passed to GTK+ should always be in UTF-8, as
-  in GLib 2.6. This is different than in previous versions of GTK+
-  where the system codepage was used. As in GLib, for DLL ABI
-  stability, applications built against previous versions of GTK+ will
-  use entry points providing the old semantics.
-
-  When compiling against GTK+ 2.6, applications intended to be
-  portable to Windows must take the UTF-8 file name encoding into
-  consideration, and use the gstdio wrappers to access files whose 
-  names have been constructed from strings returned from GTK+ or GLib.
-
 How to report bugs
 ==================

@@ -127,10 +122,10 @@ In the bug report please include:

 * How to reproduce the bug. 

-  If you can reproduce it with one of the tests or demos built with GTK+, 
-  such as demos/gtk-demo/gtk-demo, that would be most convenient. Otherwise, 
-  please include a short test program that exhibits the behavior. As a 
-  last resort, you can also provide a pointer to a larger piece of software 
+  If you can reproduce it with the testgtk program that is built in the
+  gtk/ subdirectory, that will be most convenient.  Otherwise, please
+  include a short test program that exhibits the behavior.  As a last
+  resort, you can also provide a pointer to a larger piece of software
  that can be downloaded.

 * If the bug was a crash, the exact text that was printed out when the
@@ -152,7 +147,7 @@ Otherwise, enter a new bug report that describes the patch, and attach
 the patch to that bug report.

 Bug reports containing patches should include the PATCH keyword in their
-keyword fields. If the patch adds to or changes the GTK+ programming
+keyword fields. If the patch adds to or changes the GTK programming
 interface, the API keyword should also be included.
  
 Patches should be in unified diff form. (The -u option to GNU diff.)
--- a/README.win32
+++ b/README.win32
@@ -86,7 +86,7 @@ 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
+pass the --with-ie55 flag to configure specifyin the location of the
 ie55_lib directory created by downloading the IE5.5 headers and libs
 from the above URL.

--- a/autogen.sh
+++ b/autogen.sh
@@ -91,8 +91,6 @@ if test -z "$ACLOCAL_FLAGS"; then
 	done
 fi

-rm -rf autom4te.cache
-
 $ACLOCAL $ACLOCAL_FLAGS || exit $?

 libtoolize --force || exit $?
--- a/configure.in
+++ b/configure.in
@@ -11,28 +11,26 @@ 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], [7])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_minor_version], [4])
+m4_define([gtk_micro_version], [2])
 m4_define([gtk_version],
          [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_interface_age], [2])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 # This is the X.Y used in -lgtk-FOO-X.Y
 m4_define([gtk_api_version], [2.0])

 # Define a string for the earliest version that this release has
-# backwards binary compatibility with for all interfaces a module
-# might. Unless we add module-only API with lower stability
-# guarantees, this should be unchanged until we break binary compat
-# for GTK+.
+# forward/backwards binary compatibility with. This is used for module
+# locations. (Should this be backwards-compat instead?)
 #
 #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
 m4_define([gtk_binary_version], [2.4.0])

 # required versions of other packages
-m4_define([glib_required_version], [2.6.0])
-m4_define([pango_required_version], [1.8.0])
+m4_define([glib_required_version], [2.4.0])
+m4_define([pango_required_version], [1.4.0])
 m4_define([atk_required_version], [1.0.1])


@@ -50,7 +48,6 @@ AM_CONFIG_HEADER(config.h)

 #
 # For each of the libraries we build, we define the following
- 
 # substituted variables:
 #
 # foo_PACKAGES:     pkg-config packages this library requires
@@ -125,11 +122,6 @@ case "$host" in
 esac
 AC_MSG_RESULT([$os_win32])

-case $host in
-  *-*-linux*)
-    os_linux=yes
-    ;;
-esac
 dnl Initialize libtool
 AC_PROG_CC
 AM_DISABLE_STATIC
@@ -169,7 +161,6 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")

 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
-AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")

 if test "$os_win32" = "yes"; then
  AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
@@ -200,10 +191,6 @@ AC_ARG_ENABLE(rebuilds,
              [AC_HELP_STRING([--disable-rebuilds],
                              [disable all source autogeneration rules])],,
              [enable_rebuilds=yes])
-AC_ARG_ENABLE(visibility,
-              [AC_HELP_STRING([--disable-visibility],
-                              [don't use ELF visibility attributes])],,
-              [enable_visibility=yes])

 AC_ARG_WITH(xinput,
            [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
@@ -215,13 +202,15 @@ AC_ARG_WITH(ie55,
            [AC_HELP_STRING([--with-ie55=DIRECTORY],
                            [IE5.5 libs and headers (for Active IMM)])])

+GLIB_AC_DIVERT_BEFORE_HELP([
 if test "$platform_win32" = yes; then
  gdktarget=win32
 else
  gdktarget=x11
 fi
+])

-AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/linux-fb/win32]] select non-default GDK target],
+AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/linux-fb/win32]] select GDK target [default=$gdktarget]],
 	gdktarget=$with_gdktarget)

 AC_SUBST(gdktarget)
@@ -257,11 +246,6 @@ else
  fi
 fi

-if test "x$enable_visibility" = "xno"; then
-  GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
-fi
-
-
 AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}")

 			
@@ -400,18 +384,6 @@ AC_SUBST(REBUILD)

 AC_CHECK_FUNCS(lstat mkstemp flockfile)

-# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
-AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
-AC_TRY_LINK([#include <langinfo.h>], [
-char c;
-c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
-], gtk_ok=yes, gtk_ok=no)
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
-	    [Define if _NL_TIME_FIRST_WEEKDAY is available])
-fi
-
 # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
 AC_MSG_CHECKING(for sigsetjmp)
 AC_TRY_LINK([#include <setjmp.h>], [
@@ -429,7 +401,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 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 ia id is it ja ko li lt lv mi mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tk tr uk uz uz@Latn vi wa xh yi zh_CN zh_TW"
+ALL_LINGUAS="af am ar az be bg bn br ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu ia id is it ja ko li lt lv mi mk ml mn mr ms ne nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@ije sr@Latn sv ta th tk tr uk uz uz@Latn vi wa yi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
 AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
@@ -489,13 +461,13 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
 # 

-GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
+GLIB_PACKAGES="gobject-2.0 gmodule-2.0"

 AM_PATH_GLIB_2_0(glib_required_version, :,
  AC_MSG_ERROR([
 *** GLIB glib_required_version or better is required. The latest version of 
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
-  gobject gmodule-no-export gthread)
+  gobject gmodule gthread)

 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@@ -589,7 +561,6 @@ AC_C_CONST
 AC_TYPE_SIGNAL
 AC_FUNC_MMAP

-AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_FUNCS(getresuid)
 AC_TYPE_UID_T

@@ -657,14 +628,6 @@ fi
 AC_MSG_RESULT($gdk_working_wctype)
 AC_SUBST(GDK_WLIBS)

-# Check for uxtheme.h (for MS-Windows Engine)
-AC_MSG_CHECKING(for uxtheme.h)
-AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no)
-if test $gtk_uxtheme_h = yes; then
-   AC_DEFINE(HAVE_UXTHEME_H,1,[Have uxtheme.h include file])
-fi
-AC_MSG_RESULT($gtk_uxtheme_h)
-

 ##################################################
 # Checks for gdk-pixbuf
@@ -698,7 +661,7 @@ else
    AC_MSG_RESULT(yes)
    AC_MSG_CHECKING(whether dynamic modules work)
    ## for loop is to strip newline 
-    tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
+    tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-2.0`
    for I in $tmp; do
        dynworks=$I
    done
@@ -752,7 +715,7 @@ dnl Test for libtiff
          [AC_CHECK_HEADER(tiffio.h,
            TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-        AC_MSG_WARN(*** TIFF loader will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
+        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
  fi

  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
@@ -985,7 +948,7 @@ fi

 AC_SUBST(REBUILD_PNGS)

-GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0"
+GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
 GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
 GDK_PIXBUF_EXTRA_CFLAGS= 
 GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
@@ -1058,7 +1021,7 @@ if test "x$gdktarget" = "xx11"; then
      AC_MSG_ERROR([Xft Pango backend found but did not find freetype libraries])
    fi
  else
-    AC_MSG_ERROR([Xft Pango backend is required for x11 target])
+    AC_MSG_ERROR([Pango 1.2.0 and Xft backend is required for x11 target])
  fi

  if $PKG_CONFIG --exists xft ; then : ; else
@@ -1136,15 +1099,12 @@ if test "x$gdktarget" = "xx11"; then
          # Check for solaris
 	  use_solaris_xinerama=yes
 	  AC_CHECK_LIB(Xext, XineramaGetInfo,
-			use_solaris_xinerama=yes, 
-			use_solaris_xinerama=no,
-			-lXext $x_libs_for_checks)
+			use_solaris_xinerama=yes, use_solaris_xinerama=no)
 	  if test "x$use_solaris_xinerama" = "xyes"; then
 	      AC_CHECK_HEADER(X11/extensions/xinerama.h,
 	        [GTK_ADD_LIB(x_extra_libs,Xext)
 		AC_DEFINE(HAVE_SOLARIS_XINERAMA)
-		AC_DEFINE(HAVE_XINERAMA)], 
-		use_solaris_xinerama=no,[#include <X11/Xlib.h>])
+		AC_DEFINE(HAVE_XINERAMA)], use_solaris_xinerama=no, -lXext $x_libs_for_checks)
 	  fi	
 	  AC_MSG_CHECKING(for Xinerama support on Solaris)
 	  AC_MSG_RESULT($use_solaris_xinerama);
@@ -1168,26 +1128,6 @@ if test "x$gdktarget" = "xx11"; then

  CPPFLAGS="$gtk_save_cppflags"

-  # Check for xReply
-
-  gtk_save_cppflags="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
-  AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
-  AC_TRY_COMPILE([#include <X11/Xlibint.h>],
-      [xReply *rep;],
-      [AC_MSG_RESULT([no])],
-      [AC_TRY_COMPILE([#include <X11/extensions/XIproto.h>
-#include <X11/Xlibint.h>],
-           [xReply *rep;],
-           [AC_MSG_RESULT([yes])
-            AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
-                [Define if <X11/extensions/XIproto.h> needed for xReply])],
-           [AC_MSG_RESULT([unknown])
-            AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
-
-  CPPFLAGS="$gtk_save_cppflags"
-
  # Check for shaped window extension

  AC_CHECK_LIB(Xext, XShapeCombineMask,
@@ -1203,18 +1143,10 @@ if test "x$gdktarget" = "xx11"; then
      ,
      $x_libs_for_checks)

-  # Check for XInternAtoms (X11R6 specific)
-
-  AC_CHECK_LIB(X11, XInternAtoms,
-      AC_DEFINE([HAVE_XINTERNATOMS], 1,
-          [Define to 1 if you have the `XInternAtoms' function.]),
-      ,
-      $x_libs_for_checks)
-
  # Generic X11R6 check needed for XIM support; we could
  # probably use this to replace the above, but we'll
-  # leave the separate checks for XConvertCase and XInternAtoms 
-  # for clarity
+  # leave the separate XConvertCase check for clarity
+
  have_x11r6=false
  AC_CHECK_LIB(X11, XAddConnectionWatch,
      have_x11r6=true,
@@ -1275,25 +1207,6 @@ if test "x$gdktarget" = "xx11"; then
    GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags xcursor` $GDK_EXTRA_CFLAGS"
    GDK_EXTRA_LIBS="`$PKG_CONFIG --libs xcursor` $GDK_EXTRA_LIBS"
  fi
-
-  # X SYNC check
-  AC_CHECK_LIB(Xext, XSyncQueryExtension,
-      [AC_CHECK_HEADER(X11/extensions/sync.h,
-          [GTK_ADD_LIB(x_extra_libs, Xext)
-	  AC_DEFINE(HAVE_XSYNC, 1, Have the SYNC extension library)],
-	  :, [#include <X11/Xlib.h>])], : ,
-       $X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
-
-  # Checks for XFixes extension
-  
-  have_xfixes=false
-  PKG_CHECK_MODULES(XFIXES, xfixes, have_xfixes=true, :)
-
-  if $have_xfixes ; then
-    AC_DEFINE(HAVE_XFIXES, 1, Have the XFIXES X extension)
-    GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags xfixes` $GDK_EXTRA_CFLAGS"
-    GDK_EXTRA_LIBS="`$PKG_CONFIG --libs xfixes` $GDK_EXTRA_LIBS"
-  fi
    
  # Xshm checks

@@ -1405,7 +1318,7 @@ fi
 #

 if test "x$gdktarget" = "xx11"; then
-        PANGO_PACKAGES="pangoxft pangocairo"
+        PANGO_PACKAGES=pangoxft
 	
        # We no longer use pangox, but if we find it, we link to it 
 	# for binary compatibility.
@@ -1413,11 +1326,11 @@ if test "x$gdktarget" = "xx11"; then
 		PANGO_PACKAGES="$PANGO_PACKAGES pangox"
 	fi
 elif test "x$gdktarget" = "xwin32"; then
-        PANGO_PACKAGES="pangowin32 pangocairo"
+        PANGO_PACKAGES=pangowin32
 elif test "x$gdktarget" = "xlinux-fb"; then
-        PANGO_PACKAGES="pangoft2 pangocairo"
+        PANGO_PACKAGES=pangoft2
 else
-        PANGO_PACKAGES="pango pangocairo"
+        PANGO_PACKAGES=pango
 fi

 # Check for Pango flags
@@ -1430,8 +1343,10 @@ if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
        AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
 else
        AC_MSG_ERROR([
-*** Pango not found. Pango built with Cairo support is required
-*** to build GTK+. See http://www.pango.org for Pango information.
+*** Pango not found. Pango is required to build GTK+.
+*** See http://www.pango.org for Pango information.
+*** For the framebuffer target, you will need to build 
+*** Pango with freetype support.
 ])
 fi

@@ -1525,9 +1440,7 @@ AC_SUBST(GTK_XIM_FLAGS)
 #  the effect is undefined; what it causes on Linux is that the
 #  export list from -export-symbols-regex is ignored and everything
 #  is exported
-#
-# 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_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//"`
@@ -1569,7 +1482,6 @@ fi

 AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)

-
 ##################################################
 # Output commands
 ##################################################
@@ -1670,7 +1582,6 @@ docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
 docs/reference/gtk/version.xml
 docs/faq/Makefile
-docs/tools/Makefile
 docs/tutorial/Makefile
 gdk-pixbuf/Makefile
 gdk-pixbuf/gdk_pixbuf.rc
@@ -1691,23 +1602,9 @@ gtk/theme-bits/Makefile
 gtk/xdgmime/Makefile
 modules/Makefile
 modules/input/Makefile
-modules/engines/Makefile
-modules/engines/pixbuf/Makefile
-modules/engines/ms-windows/Makefile
-modules/engines/ms-windows/Theme/Makefile
-modules/engines/ms-windows/Theme/gtk-2.0/Makefile
 contrib/Makefile
 contrib/gdk-pixbuf-xlib/Makefile
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
 ])

 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
-
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,43 +1,3 @@
-2005-01-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.6.1 ===
-	
-2004-12-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.6.0 ===
-
-2004-12-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.6 ===
-
-2004-11-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.5 ===
-
-2004-10-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.4 ===
-
-2004-09-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.3 ===
-
-2004-08-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.2 ===
-
-2004-08-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.1 ===
-
-Tue Jul 20 23:26:10 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf-xlibrgb.c:  Include config.h first.  (#148034)
-
-Sun Jul 18 20:17:41 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
-
-	* === released 2.5.0 ==
-
 Tue Mar  9 09:33:54 2004  Owen Taylor  <otaylor@redhat.com>

 	* === Released 2.3.6 ===
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
@@ -547,11 +547,7 @@ rgb565amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 	bpl = image->bytes_per_line;

 	for (yy = 0; yy < height; yy++) {
-#ifdef LITTLE
 		s = srow;
-#else
-		s = (guint16 *) srow;
-#endif
 		o = (guint32 *) orow;
 		for (xx = 0; xx < width; xx ++) {
 			register guint32 data;
@@ -674,11 +670,7 @@ rgb555msb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	bpl = image->bytes_per_line;

 	for (yy = 0; yy < height; yy++) {
-#ifdef LITTLE
 		s = srow;
-#else
-		s = (guint32 *) srow;
-#endif
 		o = (guint16 *) orow;
 		for (xx = 1; xx < width; xx += 2) {
 			register guint32 data;
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
@@ -47,6 +47,8 @@
 * Shawn T. Amundson    <amundson@gtk.org>
 */

+#include <math.h>
+
 #if HAVE_CONFIG_H
 #  include <config.h>
 #  if STDC_HEADERS
@@ -59,8 +61,6 @@
 #  include <stdlib.h>
 #endif

-#include <math.h>
-
 #define ENABLE_GRAYSCALE

 /* include this before so that we can get endian definitions if
@@ -821,7 +821,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)

      image_info->stage_buf = NULL;

-      image_info->own_gc = NULL;
+      image_info->own_gc = 0;
      
      image_info->red_shift = 0;
      image_info->red_prec = 0;
@@ -908,7 +908,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 					 image_info->x_visual_info->visual,
 					 1,
 					 XYBitmap,
-					 0, NULL, IMAGE_WIDTH, IMAGE_HEIGHT,
+					 0, 0, IMAGE_WIDTH, IMAGE_HEIGHT,
 					 8,
 					 0);
 	  static_image[i]->data = malloc(IMAGE_WIDTH * IMAGE_HEIGHT >> 3);
@@ -920,7 +920,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 					 image_info->x_visual_info->visual,
 					 (unsigned int)image_info->x_visual_info->depth,
 					 ZPixmap,
-					 0, NULL,
+					 0, 0,
 					 IMAGE_WIDTH,
 					 IMAGE_HEIGHT,
 					 32, 0);
@@ -3651,7 +3651,7 @@ xlib_rgb_get_visual (void)
  if (image_info)
    return image_info->x_visual_info->visual;
  else
-    return NULL;
+    return 0;
 }

 /**
@@ -3668,7 +3668,7 @@ xlib_rgb_get_visual_info (void)
  if (image_info)
    return image_info->x_visual_info;
  else
-    return NULL;
+    return 0;
 }

 /**
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -8,7 +8,6 @@ demos =						\
 	appwindow.c				\
 	button_box.c				\
 	changedisplay.c				\
-	clipboard.c				\
 	colorsel.c				\
 	dialog.c				\
 	drawingarea.c				\
@@ -16,13 +15,11 @@ demos =						\
 	entry_completion.c			\
 	expander.c  				\
 	hypertext.c				\
-	iconview.c				\
 	images.c				\
 	list_store.c				\
 	menus.c					\
 	panes.c					\
 	pixbufs.c				\
-	rotated_text.c				\
 	sizegroup.c				\
 	stock_browser.c				\
 	textview.c				\
@@ -75,14 +72,12 @@ IMAGEFILES=	alphatest.png		\
 		floppybuddy.gif		\
 		gnome-applets.png	\
 		gnome-calendar.png	\
-		gnome-fs-directory.png	\
-		gnome-fs-regular.png	\
 		gnome-foot.png		\
 		gnome-gimp.png		\
 		gnome-gmush.png		\
 		gnome-gsame.png		\
 		gnu-keys.png		\
-		gtk-logo-rgb.gif		
+		gtk-logo-rgb.gif

 democode_DATA = $(demos) $(IMAGEFILES)

--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -3,6 +3,7 @@
 * Demonstrates a typical application window, with menubar, toolbar, statusbar.
 */

+#include <config.h>
 #include <gtk/gtk.h>
 #include "demo-common.h"

@@ -61,89 +62,6 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)
    }
 }

-static void 
-activate_email (GtkAboutDialog *about,
-		const gchar    *link,
-		gpointer        data)
-{
-  g_print ("send mail to %s\n", link);
-}
-
-static void 
-activate_url (GtkAboutDialog *about,
-	      const gchar    *link,
-	      gpointer        data)
-{
-  g_print ("show url %s\n", link);
-}
-
-static void
-about_cb (GtkAction *action,
-	  GtkWidget *window)
-{
-  GdkPixbuf *pixbuf, *transparent;
-  gchar *filename;
-
-  const gchar *authors[] = {
-    "Peter Mattis",
-    "Spencer Kimball",
-    "Josh MacDonald",
-    "and many more...",
-    NULL
-  };
-
-  const gchar *documentors[] = {
-    "Owen Taylor",
-    "Tony Gale",
-    "Matthias Clasen <mclasen@redhat.com>",
-    "and many more...",
-    NULL
-  };
-
-  const gchar *license =
-    "This library is free software; you can redistribute it and/or\n"
-    "modify it under the terms of the GNU Library General Public License as\n"
-    "published by the Free Software Foundation; either version 2 of the\n"
-    "License, or (at your option) any later version.\n"
-    "\n"
-    "This library is distributed in the hope that it will be useful,\n"
-    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
-    "Library General Public License for more details.\n"
-    "\n"
-    "You should have received a copy of the GNU Library General Public\n"
-    "License along with the Gnome Library; see the file COPYING.LIB.  If not,\n"
-    "write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
-    "Boston, MA 02111-1307, USA.\n";
-
-  pixbuf = NULL;
-  transparent = NULL;
-  filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
-  if (filename)
-    {
-      pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-      g_free (filename);
-      transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-      g_object_unref (pixbuf);
-    }
-
-  gtk_about_dialog_set_email_hook (activate_email, NULL, NULL);
-  gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
-  gtk_show_about_dialog (GTK_WINDOW (window),
-			 "name", "GTK+ Code Demos",
-			 "version", "2.4.3",
-			 "copyright", "(C) 1997-2004 The GTK+ Team",
-			 "license", license,
-			 "website", "http://www.gtk.org",
-			 "comments", "Program to demonstrate GTK+ functions.",
-			 "authors", authors,
-			 "documenters", documentors,
-			 "logo", transparent,
-			 NULL);
-
-  g_object_unref (transparent);
-}
-

 static GtkActionEntry entries[] = {
  { "FileMenu", NULL, "_File" },               /* name, stock id, label */
@@ -174,7 +92,7 @@ static GtkActionEntry entries[] = {
  { "About", NULL,                             /* name, stock id */
    "_About", "<control>A",                    /* label, accelerator */     
    "About",                                   /* tooltip */  
-    G_CALLBACK (about_cb) },
+    G_CALLBACK (activate_action) },
  { "Logo", "demo-gtk-logo",                   /* name, stock id */
     NULL, NULL,                               /* label, accelerator */     
    "GTK+",                                    /* tooltip */
@@ -214,7 +132,7 @@ static guint n_color_entries = G_N_ELEMENTS (color_entries);
 enum {
  SHAPE_SQUARE,
  SHAPE_RECTANGLE,
-  SHAPE_OVAL
+  SHAPE_OVAL,
 };

 static GtkRadioActionEntry shape_entries[] = {
@@ -422,7 +340,7 @@ do_appwindow (GtkWidget *do_widget)
      action_group = gtk_action_group_new ("AppWindowActions");
      gtk_action_group_add_actions (action_group, 
 				    entries, n_entries, 
-				    window);
+				    NULL);
      gtk_action_group_add_toggle_actions (action_group, 
 					   toggle_entries, n_toggle_entries, 
 					   NULL);
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -3,6 +3,7 @@
 * The Button Box widgets are used to arrange buttons with padding.
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static GtkWidget *
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -26,6 +26,7 @@
 *
 *  - Using GtkDialog
 */
+#include <config.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include "demo-common.h"
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -1,123 +0,0 @@
-/* Clipboard
- *
- * GtkClipboard is used for clipboard handling. This demo shows how to
- * copy and paste text to and from the clipboard.
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-
-static GtkWidget *window = NULL;
-
-void
-copy_button_clicked (GtkWidget *button,
-		     gpointer   user_data)
-{
-  GtkWidget *entry;
-  GtkClipboard *clipboard;
-
-  entry = GTK_WIDGET (user_data);
-  
-  /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry,
-					GDK_SELECTION_CLIPBOARD);
-
-  /* Set clipboard text */
-  gtk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)), -1);
-}
-
-void
-paste_received (GtkClipboard *clipboard,
-		const gchar  *text,
-		gpointer      user_data)
-{
-  GtkWidget *entry;
-
-  entry = GTK_WIDGET (user_data);
-  
-  /* Set the entry text */
-  gtk_entry_set_text (GTK_ENTRY (entry), text);
-}
-
-void
-paste_button_clicked (GtkWidget *button,
-		     gpointer   user_data)
-{
-  GtkWidget *entry;
-  GtkClipboard *clipboard;
-
-  entry = GTK_WIDGET (user_data);
-  
-  /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry,
-					GDK_SELECTION_CLIPBOARD);
-
-  /* Request the contents of the clipboard, contents_received will be
-     called when we do get the contents.
-   */
-  gtk_clipboard_request_text (clipboard,
-			      paste_received, entry);
-}
-
-GtkWidget *
-do_clipboard (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *vbox, *hbox;
-      GtkWidget *label;
-      GtkWidget *entry, *button;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      vbox = gtk_vbox_new (FALSE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
-      
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      hbox = gtk_hbox_new (FALSE, 4);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-      /* Create the first entry */
-      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-      
-      /* Create the button */
-      button = gtk_button_new_from_stock (GTK_STOCK_COPY);
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (copy_button_clicked), entry);
-
-      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      hbox = gtk_hbox_new (FALSE, 4);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-      /* Create the second entry */
-      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-      
-      /* Create the button */
-      button = gtk_button_new_from_stock (GTK_STOCK_PASTE);
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (paste_button_clicked), entry);
-      
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -5,6 +5,7 @@
 *
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static GtkWidget *window = NULL;
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -3,6 +3,7 @@
 * Dialog widgets are used to pop up a transient window for user feedback.
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static GtkWidget *window = NULL;
@@ -21,9 +22,8 @@ message_dialog_clicked (GtkButton *button,
 				   GTK_MESSAGE_INFO,
 				   GTK_BUTTONS_OK,
 				   "This message box has been popped up the following\n"
-				   "number of times:");
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            "%d", i);
+				   "number of times:\n\n"
+				   "%d", i);
  gtk_dialog_run (GTK_DIALOG (dialog));
  gtk_widget_destroy (dialog);
  i++;
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -13,6 +13,7 @@
 * to clear the area.
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static GtkWidget *window = NULL;
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -6,6 +6,7 @@
 *
 */

+#include <config.h>
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -5,6 +5,7 @@
 *
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static GtkWidget *window = NULL;
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -5,6 +5,7 @@
 *
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static GtkWidget *window = NULL;
--- a/demos/gtk-demo/gnome-fs-directory.png
+++ b/demos/gtk-demo/gnome-fs-directory.png
--- a/demos/gtk-demo/gnome-fs-regular.png
+++ b/demos/gtk-demo/gnome-fs-regular.png
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -6,6 +6,7 @@
 * shows.
 */

+#include <config.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>

@@ -280,13 +281,13 @@ do_hypertext (GtkWidget *do_widget)

      view = gtk_text_view_new ();
      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
-      g_signal_connect (view, "key-press-event", 
+      g_signal_connect (G_OBJECT (view), "key-press-event", 
 			G_CALLBACK (key_press_event), NULL);
-      g_signal_connect (view, "event-after", 
+      g_signal_connect (G_OBJECT (view), "event-after", 
 			G_CALLBACK (event_after), NULL);
-      g_signal_connect (view, "motion-notify-event", 
+      g_signal_connect (G_OBJECT (view), "motion-notify-event", 
 			G_CALLBACK (motion_notify_event), NULL);
-      g_signal_connect (view, "visibility-notify-event", 
+      g_signal_connect (G_OBJECT (view), "visibility-notify-event", 
 			G_CALLBACK (visibility_notify_event), NULL);

      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -1,359 +0,0 @@
-/* Icon View
- *
- * The GtkIconView widget is used to display and manipulate icons.  It
- * uses a GtkTreeModel for data storage, so the list store example
- * might be helpful.
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-
-#define FOLDER_NAME "gnome-fs-directory.png"
-#define FILE_NAME "gnome-fs-regular.png"
-
-enum
-{
-  COL_PATH,
-  COL_DISPLAY_NAME,
-  COL_PIXBUF,
-  COL_IS_DIRECTORY,
-  NUM_COLS
-};
-
-
-static GdkPixbuf *file_pixbuf, *folder_pixbuf;
-gchar *parent;
-GtkToolItem *up_button;
-
-/* Loads the images for the demo and returns whether the operation succeeded */
-static gboolean
-load_pixbufs (GError **error)
-{
-  char *filename;
-
-  if (file_pixbuf)
-    return TRUE; /* already loaded earlier */
-
-  /* demo_find_file() looks in the the current directory first,
-   * so you can run gtk-demo without installing GTK, then looks
-   * in the location where the file is installed.
-   */
-  filename = demo_find_file (FILE_NAME, error);
-  if (!filename)
-    return FALSE; /* note that "error" was filled in and returned */
-
-  file_pixbuf = gdk_pixbuf_new_from_file (filename, error);
-  g_free (filename);
-  
-  if (!file_pixbuf)
-    return FALSE; /* Note that "error" was filled with a GError */
-  
-  filename = demo_find_file (FOLDER_NAME, error);
-  if (!filename)
-    return FALSE; /* note that "error" was filled in and returned */
-
-  folder_pixbuf = gdk_pixbuf_new_from_file (filename, error);
-  g_free (filename);
-
-  return TRUE;
-}
-
-static void
-fill_store (GtkListStore *store)
-{
-  GDir *dir;
-  const gchar *name;
-  GtkTreeIter iter;
-  
-  /* First clear the store */
-  gtk_list_store_clear (store);
-
-  /* Now go through the directory and extract all the file
-   * information */
-  dir = g_dir_open (parent, 0, NULL);
-  if (!dir)
-    return;
-
-  name = g_dir_read_name (dir);
-  while (name != NULL)
-    {
-      gchar *path, *display_name;
-      gboolean is_dir;
-      
-      /* We ignore hidden files that start with a '.' */
-      if (name[0] != '.')
-	{
-	  path = g_build_filename (parent, name, NULL);
-
-	  is_dir = g_file_test (path, G_FILE_TEST_IS_DIR);
-	  
-	  display_name = g_filename_to_utf8 (name, -1, NULL, NULL, NULL);
-
-	  gtk_list_store_append (store, &iter);
-	  gtk_list_store_set (store, &iter,
-			      COL_PATH, path,
-			      COL_DISPLAY_NAME, display_name,
-			      COL_IS_DIRECTORY, is_dir,
-			      COL_PIXBUF, is_dir ? folder_pixbuf : file_pixbuf,
-			      -1);
-	  g_free (path);
-	  g_free (display_name);
-	}
-
-      name = g_dir_read_name (dir);      
-    }
-}
-
-static gint
-sort_func (GtkTreeModel *model,
-	   GtkTreeIter  *a,
-	   GtkTreeIter  *b,
-	   gpointer      user_data)
-{
-  gboolean is_dir_a, is_dir_b;
-  gchar *name_a, *name_b;
-  int ret;
-
-  /* We need this function because we want to sort
-   * folders before files.
-   */
-
-  
-  gtk_tree_model_get (model, a,
-		      COL_IS_DIRECTORY, &is_dir_a,
-		      COL_DISPLAY_NAME, &name_a,
-		      -1);
-
-  gtk_tree_model_get (model, b,
-		      COL_IS_DIRECTORY, &is_dir_b,
-		      COL_DISPLAY_NAME, &name_b,
-		      -1);
-
-  if (!is_dir_a && is_dir_b)
-    ret = 1;
-  else if (is_dir_a && !is_dir_b)
-    ret = -1;
-  else
-    {
-      ret = g_utf8_collate (name_a, name_b);
-    }
-
-  g_free (name_a);
-  g_free (name_b);
-
-  return ret;
-}
-
-GtkListStore *
-create_store (void)
-{
-  GtkListStore *store;
-
-  store = gtk_list_store_new (NUM_COLS,
-			      G_TYPE_STRING, 
-			      G_TYPE_STRING, 
-			      GDK_TYPE_PIXBUF,
-			      G_TYPE_BOOLEAN);
-
-  /* Set sort column and function */ 
-  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
-					   sort_func,
-					   NULL, NULL);
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-					GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
-					GTK_SORT_ASCENDING);
-
-  return store;
-}
-
-static void
-item_activated (GtkIconView *icon_view,
-		GtkTreePath *tree_path,
-		gpointer     user_data)
-{
-  GtkListStore *store;
-  gchar *path;
-  GtkTreeIter iter;
-  gboolean is_dir;
-  
-  store = GTK_LIST_STORE (user_data);
-
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (store),
-			   &iter, tree_path);
-  gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
-		      COL_PATH, &path,
-		      COL_IS_DIRECTORY, &is_dir,
-		      -1);
-
-  if (!is_dir)
-    {
-      g_free (path);
-      return;
-    }
-  
-  /* Replace parent with path and re-fill the model*/
-  g_free (parent);
-  parent = path;
-
-  fill_store (store);
-
-  /* Sensitize the up button */
-  gtk_widget_set_sensitive (GTK_WIDGET (up_button), TRUE);
-}
-
-static void
-up_clicked (GtkToolItem *item,
-	    gpointer     user_data)
-{
-  GtkListStore *store;
-  gchar *dir_name;
-
-  store = GTK_LIST_STORE (user_data);
-
-  dir_name = g_path_get_dirname (parent);
-  g_free (parent);
-  
-  parent = dir_name;
-
-  fill_store (store);
-
-  /* Maybe de-sensitize the up button */
-  gtk_widget_set_sensitive (GTK_WIDGET (up_button),
-			    strcmp (parent, "/") != 0);
-}
-
-static void
-home_clicked (GtkToolItem *item,
-	      gpointer     user_data)
-{
-  GtkListStore *store;
-
-  store = GTK_LIST_STORE (user_data);
-
-  g_free (parent);
-  parent = g_strdup (g_get_home_dir ());
-
-  fill_store (store);
-
-  /* Sensitize the up button */
-  gtk_widget_set_sensitive (GTK_WIDGET (up_button),
-			    TRUE);
-}
-
-GtkWidget *
-do_iconview (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GError *error;
-            
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
-      
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");
-
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      error = NULL;
-      if (!load_pixbufs (&error))
-	{
-	  GtkWidget *dialog;
-
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "Failed to load an image: %s",
-					   error->message);
-
-	  g_error_free (error);
-
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-
-	  gtk_widget_show (dialog);
-	}
-      else
-	{
-	  GtkWidget *sw;
-	  GtkWidget *icon_view;
-	  GtkListStore *store;
-	  GtkWidget *vbox;
-	  GtkWidget *tool_bar;
-	  GtkToolItem *home_button;
-	  
-	  vbox = gtk_vbox_new (FALSE, 0);
-	  gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	  tool_bar = gtk_toolbar_new ();
-	  gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0);
-	  
-	  up_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
-	  gtk_tool_item_set_is_important (up_button, TRUE);
-	  gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
-	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), up_button, -1);
-
-	  home_button = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
-	  gtk_tool_item_set_is_important (home_button, TRUE);
-	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);
-	  
-	  
-	  sw = gtk_scrolled_window_new (NULL, NULL);
-	  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-					       GTK_SHADOW_ETCHED_IN);
-	  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-					  GTK_POLICY_AUTOMATIC,
-					  GTK_POLICY_AUTOMATIC);
-	  
-	  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
-	  
-	  /* Create the store and fill it with the contents of '/' */
-	  parent = g_strdup ("/");
-	  store = create_store ();
-	  fill_store (store);
-
-	  icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
-	  gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
-					    GTK_SELECTION_MULTIPLE);
-	  g_object_unref (store);
-	  
-	  /* Connect to the "clicked" signal of the "Up" tool button */
-	  g_signal_connect (up_button, "clicked",
-			    G_CALLBACK (up_clicked), store);
-
-	  /* Connect to the "clicked" signal of the "Home" tool button */
-	  g_signal_connect (home_button, "clicked",
-			    G_CALLBACK (home_clicked), store);
-	  
-	  /* We now set which model columns that correspont to the text
-	   * and pixbuf of each item
-	   */
-	  gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);
-	  gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF);
-
-	  /* Connect to the "item_activated" signal */
-	  g_signal_connect (icon_view, "item_activated",
-			    G_CALLBACK (item_activated), store);
-	  gtk_container_add (GTK_CONTAINER (sw), icon_view);
-
-	  gtk_widget_grab_focus (icon_view);
-	}
-    }
-  
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -12,8 +12,8 @@
 * application binary can be self-contained.
 */

+#include <config.h>
 #include <gtk/gtk.h>
-#include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
 #include "demo-common.h"
@@ -196,7 +196,7 @@ progressive_timeout (gpointer data)
 	}
      else
 	{
-	  image_stream = g_fopen (filename, "rb");
+	  image_stream = fopen (filename, "r");
 	  g_free (filename);

 	  if (!image_stream)
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -7,6 +7,7 @@
 *
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static GtkWidget *window = NULL;
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -5,7 +5,6 @@
 #include <string.h>

 #include <gtk/gtk.h>
-#include <glib/gstdio.h>

 #include <demos.h>

@@ -387,7 +386,7 @@ parse_chars (gchar     *text,

 /* While not as cool as c-mode, this will do as a quick attempt at highlighting */
 static void
-fontify (void)
+fontify ()
 {
  GtkTextIter start_iter, next_iter, tmp_iter;
  gint state;
@@ -466,7 +465,7 @@ load_file (const gchar *filename)
      return;
    }

-  file = g_fopen (full_filename, "r");
+  file = fopen (full_filename, "r");

  if (!file)
    g_warning ("Cannot open %s: %s\n", full_filename, g_strerror (errno));
@@ -666,7 +665,7 @@ create_text (GtkTextBuffer **buffer,
  
  if (is_source)
    {
-      font_desc = pango_font_description_from_string ("monospace");
+      font_desc = pango_font_description_from_string ("Courier 12");
      gtk_widget_modify_font (text_view, font_desc);
      pango_font_description_free (font_desc);

--- a/demos/gtk-demo/makefile.msc.in
+++ b/demos/gtk-demo/makefile.msc.in
@@ -38,27 +38,20 @@ all :	\
 DEMOS = \
 	appwindow.c	\
 	button_box.c	\
-	clipboard.c	\
 	colorsel.c	\
-	dialog.c		\
+	dialog.c	\
 	drawingarea.c	\
-	editable_cells.c	\
-	entry_completion.c	\
-	expander.c	\
-	hypertext.c	\
-	iconview.c	\
-	images.c		\
+	editable_cells.c \
+	images.c	\
+	item_factory.c	\
 	list_store.c	\
 	menus.c		\
 	panes.c		\
-	pixbufs.c		\
-	rotated_text.c	\
+	pixbufs.c	\
 	sizegroup.c	\
 	stock_browser.c	\
 	textview.c	\
 	tree_store.c	\
-	ui_manager.c	\
-

 demos.h: $(DEMOS) geninclude.pl
 	$(PERL) geninclude.pl $(DEMOS) > demos.h
@@ -66,27 +59,20 @@ demos.h: $(DEMOS) geninclude.pl
 OBJECTS = \
 	appwindow.obj	\
 	button_box.obj	\
-	changedisplay.obj	\
-	clipboard.obj	\
 	colorsel.obj	\
 	dialog.obj	\
 	drawingarea.obj	\
-	editable_cells.obj	\
-	entry_completion.obj	\
-	expander.obj	\
-	hypertext.obj	\
-	iconview.obj	\
+	editable_cells.obj \
 	images.obj	\
+	item_factory.obj	\
 	list_store.obj	\
 	menus.obj		\
 	panes.obj		\
 	pixbufs.obj	\
-	rotated_text.obj \
 	sizegroup.obj	\
 	stock_browser.obj	\
 	textview.obj	\
 	tree_store.obj	\
-	ui_manager.obj	\
 	main.obj \

 gtk-demo.exe : demos.h $(OBJECTS)
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -25,6 +25,7 @@
 * 
 */

+#include <config.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>

--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -11,6 +11,7 @@
 * each side of each widget.
 */

+#include <config.h>
 #include <gtk/gtk.h>

 void
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -12,6 +12,7 @@
 *
 */

+#include <config.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <math.h>
@@ -264,7 +265,6 @@ do_pixbufs (GtkWidget *do_widget)
    {
      gtk_widget_destroy (window);
      window = NULL;
-      g_object_unref (frame);
    }

  return window;
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -1,142 +0,0 @@
-/* Rotated Text
- *
- * This demo shows how to use GDK and Pango to draw rotated and transformed
- * text. The use of GdkPangoRenderer in this example is a somewhat advanced
- * technique; most applications can simply use gdk_draw_layout(). We use
- * it here mostly because that allows us to work in user coordinates - that is,
- * coordinates prior to the application of the transformation matrix, rather
- * than device coordinates.
- *
- * As of GTK+-2.6, the ability to draw transformed and anti-aliased graphics
- * as shown in this example is only present for text. With GTK+-2.8, a new
- * graphics system called "Cairo" will be introduced that provides these
- * capabilities and many more for all types of graphics.
- */
-#include <math.h>
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static gboolean
-rotated_text_expose_event (GtkWidget      *widget,
-			   GdkEventExpose *event,
-			   gpointer	   data)
-{
-#define RADIUS 150
-#define N_WORDS 10
-#define FONT "Sans Bold 27"
-  
-  PangoRenderer *renderer;
-  PangoMatrix matrix = PANGO_MATRIX_INIT;
-  PangoContext *context;
-  PangoLayout *layout;
-  PangoFontDescription *desc;
-
-  int width = widget->allocation.width;
-  int height = widget->allocation.height;
-  double device_radius;
-  int i;
-
-  /* Get the default renderer for the screen, and set it up for drawing  */
-  renderer = gdk_pango_renderer_get_default (gtk_widget_get_screen (widget));
-  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), widget->window);
-  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), widget->style->black_gc);
-
-  /* Set up a transformation matrix so that the user space coordinates for
-   * the centered square where we draw are [-RADIUS, RADIUS], [-RADIUS, RADIUS]
-   * We first center, then change the scale */
-  device_radius = MIN (width, height) / 2.;
-  pango_matrix_translate (&matrix,
-			  device_radius + (width - 2 * device_radius) / 2,
-			  device_radius + (height - 2 * device_radius) / 2);
-  pango_matrix_scale (&matrix, device_radius / RADIUS, device_radius / RADIUS);
-
-  /* Create a PangoLayout, set the font and text */
-  context = gtk_widget_create_pango_context (widget);
-  layout = pango_layout_new (context);
-  pango_layout_set_text (layout, "Text", -1);
-  desc = pango_font_description_from_string (FONT);
-  pango_layout_set_font_description (layout, desc);
-  pango_font_description_free (desc);
-
-  /* Draw the layout N_WORDS times in a circle */
-  for (i = 0; i < N_WORDS; i++)
-    {
-      GdkColor color;
-      PangoMatrix rotated_matrix = matrix;
-      int width, height;
-      double angle = (360. * i) / N_WORDS;
-
-      /* Gradient from red at angle == 60 to blue at angle == 300 */
-      color.red   = 65535 * (1 + cos ((angle - 60) * G_PI / 180.)) / 2;
-      color.green = 0;
-      color.blue  = 65535  - color.red;
-    
-      gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-					     PANGO_RENDER_PART_FOREGROUND, &color);
-                                             
-      pango_matrix_rotate (&rotated_matrix, angle);
-
-      pango_context_set_matrix (context, &rotated_matrix);
-    
-      /* Inform Pango to re-layout the text with the new transformation matrix */
-      pango_layout_context_changed (layout);
-    
-      pango_layout_get_size (layout, &width, &height);
-      pango_renderer_draw_layout (renderer, layout,
-				  - width / 2, - RADIUS * PANGO_SCALE);
-    }
-
-  /* Clean up default renderer, since it is shared */
-  gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-					 PANGO_RENDER_PART_FOREGROUND, NULL);
-  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), NULL);
-  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), NULL);
-
-  /* free the objects we created */
-  g_object_unref (layout);
-  g_object_unref (context);
-  
-  return FALSE;
-}
-
-GtkWidget *
-do_rotated_text (GtkWidget *do_widget)
-{
-  GtkWidget *drawing_area;
-  
-  if (!window)
-    {
-      const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-
-      drawing_area = gtk_drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), drawing_area);
-
-      /* This overrides the background color from the theme */
-      gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
-
-      g_signal_connect (drawing_area, "expose-event",
-			G_CALLBACK (rotated_text_expose_event), NULL);
-
-      gtk_window_set_default_size (GTK_WINDOW (window), 2 * RADIUS, 2 * RADIUS);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -13,6 +13,7 @@
 * into a table, you would not include the GTK_FILL flag.
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static GtkWidget *window = NULL;
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -6,6 +6,7 @@
 * and stock items.
 */

+#include <config.h>
 #include <string.h>

 #include <gtk/gtk.h>
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -7,6 +7,7 @@
 *
 */

+#include <config.h>
 #include <gtk/gtk.h>
 #include <stdlib.h> /* for exit() */

--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -8,6 +8,7 @@
 *
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static GtkWidget *window = NULL;
--- a/demos/gtk-demo/ui_manager.c
+++ b/demos/gtk-demo/ui_manager.c
@@ -4,6 +4,7 @@
 * from an array of actions and a description of the menu hierarchy.
 */

+#include <config.h>
 #include <gtk/gtk.h>

 static void
@@ -88,7 +89,7 @@ static guint n_color_entries = G_N_ELEMENTS (color_entries);
 enum {
  SHAPE_SQUARE,
  SHAPE_RECTANGLE,
-  SHAPE_OVAL
+  SHAPE_OVAL,
 };

 static GtkRadioActionEntry shape_entries[] = {
--- a/demos/testpixbuf-save.c
+++ b/demos/testpixbuf-save.c
@@ -85,7 +85,7 @@ buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
        if (gdk_pixbuf_loader_write (loader, buf, count, err) && 
            gdk_pixbuf_loader_close (loader, err)) {
                pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
-                g_object_unref (loader);
+                g_object_unref (G_OBJECT (loader));
                return pixbuf;
        } else {
                return NULL;
@@ -138,7 +138,7 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                        do_compare (pixbuf,
                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
                                    err);
-                        g_object_unref (loader);
+                        g_object_unref (G_OBJECT (loader));
                }
        }
        else if (evt->keyval == 'S') {
@@ -194,7 +194,7 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                        do_compare (pixbuf,
                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
                                    err);
-                        g_object_unref (loader);
+                        g_object_unref (G_OBJECT (loader));
                }
        }
        else if (evt->keyval == 'P') {
@@ -248,7 +248,7 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                        do_compare (pixbuf,
                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
                                    err);
-                        g_object_unref (loader);
+                        g_object_unref (G_OBJECT (loader));
                }
        }
        else if (evt->keyval == 'I') {
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -427,7 +427,7 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)

 	gtk_widget_show (window);

-        return drawing_area;
+        return window;
 }


@@ -508,7 +508,7 @@ extern void pixbuf_init ();

 void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
 {
-        gdk_pixbuf_loader_set_size (loader, width*2, height*2);
+  gdk_pixbuf_loader_set_size (loader, width*2, height*2);
 }


@@ -525,7 +525,7 @@ main (int argc, char **argv)

 	gtk_init (&argc, &argv);

-	//	gdk_rgb_set_verbose (TRUE);
+	gdk_rgb_set_verbose (TRUE);

 	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());

@@ -611,10 +611,8 @@ main (int argc, char **argv)

 			status.buf = g_malloc (readlen);

-#if 0
 			g_signal_connect (pixbuf_loader, "size_prepared", 
 					  G_CALLBACK (size_func), NULL);
-#endif

                        g_signal_connect (pixbuf_loader, "area_prepared",
 					  G_CALLBACK (progressive_prepared_callback),
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in

-SUBDIRS = tutorial faq reference tools
+SUBDIRS = tutorial faq reference

 EXTRA_DIST = \
 	defsformat.txt			\
--- a/docs/RELEASE-HOWTO
+++ b/docs/RELEASE-HOWTO
@@ -19,27 +19,20 @@ Without those packages make distcheck will *not* pass.
 3) Verify that the version in configure.in has been bumped after the last
 release. (Note that this is critical, a slip-up here will cause the soname 
 to change).
-4) Make sure that make check is happy (If you don't do it here, make distcheck
-will also catch it, but it is kind of disheartening to see make distcheck fail
-due to an extraneous symbol after watching it build the docs for an hour...)
-5) Add === Released 2.x.y === at the top of all ChangeLog files
-6) make distcheck
-7) Fix broken stuff found by 5) repeat
-8) cvs commit; you'll have a bunch of po file changes, and maybe some
+4) Add === Released 2.x.y === at the top of all ChangeLog files
+5) make distcheck
+6) Fix broken stuff found by 5) repeat
+7) cvs commit; you'll have a bunch of po file changes, and maybe some
 doc changes too (NOTE: be sure to use cvs with compression, else you'll
 end up waiting for a long time :).
-9) If 7) fails because someone else committed inbetween, curse, cvs up,
+8) If 7) fails because someone else committed inbetween, curse, cvs up,
 fix conflicts and go to 5)
-10) type 'cvs tag GTK_2_x_y' in the toplevel directory
-11) You now have the tarball, and the CVS tag, now upload the tarball to
+9) type 'cvs tag GTK_2_x_y' in the toplevel directory
+10) You now have the tarball, and the CVS tag, now upload the tarball to
 gnome.org and gtk.org
-12) Go to the gnome-announce list archives, find the last announce message,
+11) Go to the gnome-announce list archives, find the last announce message,
 create a new message in the same form, replacing version numbers, commentary
 at the top about "what this release is about" and the Summary of changes.
-13) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
+12) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
 gtk-devel-list. Set reply-to to gnome-hackers.
-14) Bump the version number in configure.in. 
-15) Create a new milestone in bugzilla and move the remaining bugs from the
-2.x.y milestone over to the new one.
-16) Add a link to the release announcement to www.gtk.org which lives in
-the gtk-web cvs module.
+13) Bump the version number in configure.in. 
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
@@ -429,7 +429,7 @@ in which they need to be installed:</para>

 <itemizedlist spacing=compact>
 <listitem><simpara> pkg-config
-(<ulink url="http://www.freedesktop.org/software/pkgconfig">
+(<ulink url="http://www.freedesktop.org/software/pkgconfig/">
 pkg-config Site</ulink>)</simpara>
 </listitem>

--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,837 +1,27 @@
-2005-02-08  Matthias Clasen  <mclasen@redhat.com>
+2004-06-04  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/tmpl/gtkuimanager.sgml: Mention the expanding
-	toolbar separators.
+	* === Released 2.4.2 ===

-2005-02-03  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_stock_set_translate_func.
-
-2005-02-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/tmpl/event_structs.sgml: 
-	* gdk/tmpl/events.sgml: Mark GdkEventOwnerChange and
-	GdkOwnerChange as 2.6 additions.  (#165823, Masao Mutoh)
-
-2005-02-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-update-icon-cache.xml:
-	* gtk/gtk-update-icon-cache.1: Document the --quiet option.
-
-2005-01-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtksocket.sgml:
-	* gtk/tmpl/gtkplug.sgml: Add note on limited
-	availability.  (#164347, Roger Light)
-
-2005-01-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdk-sections.txt: Add gdk_x11_display_get_user_time.
-
-2005-01-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-docs.sgml: Add an index for 2.8 symbols.
-
-	* gdk/gdk-docs.sgml: Add an index for 2.8 symbols.
-
-	* gdk/gdk-sections.txt: Add gdk_display_warp_pointer.
-
-2005-01-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/building.sgml: Some updates.  (#164147, #164108, 
-	Karel Kulhavy)
-
-2005-01-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.6.1 ===
-	
-2005-01-03  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/tmpl/threads.sgml: Improve the threads 
-	examples.  (#161618, Stefan Kost)
-
-2004-12-26  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkexpander.sgml: Typo fix. (#162219, Masao Mutoh)
-
-2004-12-20  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkitemfactory.sgml: Document GtkTranslateFunc
-
-2004-12-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/tmpl/x_interaction.sgml: Remove a no longer needed
-	note.  (#161544, Tommi Komulainen)
-
-Fri Dec 17 13:51:17 2004  Jonathan Blandford  <jrb@redhat.com>
-
-	* gtk/Makefile.am (HTML_IMAGES): spell missing stock icons
-	correctly.
-
-2004-12-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkfeatures.sgml: Improve wording.  (#161484,
-	Christian Biere)
-
-	* gtk/Makefile.am (HTML_IMAGES): Add some missing stock
-	icons..
-
-	* gtk/tmpl/gtkstock.sgml: Fix some stock icon names.
-
-	* === Released 2.6.0 ===
-
-2004-12-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/tmpl/drawing.sgml: Document GdkTrapezoid.
-
-	* gtk/tmpl/gtkcelleditable.sgml: 
-	* gtk/tmpl/gtkcellview.sgml: 
-	* gtk/tmpl/gtktreeviewcolumn.sgml: 
-	* gtk/tmpl/gtktreeview.sgml: 
-	* gtk/tmpl/gtktreesortable.sgml: Add/improve long
-	descriptions.
-
-	* gtk/glossary.xml: Remove a dangling link.
-
-2004-12-14  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add new iconview methods.
-	Remove gtk_cell_view_set_value[s] for now.
-
-2004-12-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add new label methods.
-
-2004-12-09  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add new list store methods.
-	Add gtk_cell_renderer_stop_editing.
-
-2004-12-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_text_view_get_iter_at_position.
-
-2004-12-07  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/images/colorsel.png:
-	* gtk/images/fontsel.png:
-	* gtk/images/filechooser.png:
-	* gtk/visual_index.xml: 
-	* gtk/Makefile.am (HTML_IMAGES): Add new images.
-
-2004-12-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.6 ===
-
-2004-12-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkcombobox.sgml: 
-	* gtk/tmpl/gtkcomboboxentry.sgml: Add long descriptions.
-
-2004-12-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/tmpl/windows.sgml: Document all window types.  (#160149,
-	Billy Biggs)
-	
-2004-11-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Remove gtk_cell_view_set_cell_data().
-
-	* gtk/tmpl/gtkfilefilter.sgml: Mention subclassing, aliasing
-	and supertypes.
-
-2004-11-28  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/images/combo-box.png: New image
-
-	* gtk/visual_index.xml: 
-	* gtk/Makefile.am (HTML_IMAGES): Add combo-box.png
-
-Sat Nov 20 16:01:51 2004  Owen Taylor  <otaylor@redhat.com>
-
-        * gdk/gdk-sections.txt gdk/gdk.types : Update for GdkPangoRenderer
-	* gdk/Makefile.am gdk/images/rotated-text.png:
-
-	* gdk/tmpl/pango_interaction.sgml: Add a long
-	description and an extensive example (more or less the same as 
-	demos/gtk-demo/rotated_text.c)
-
-	* gtk/gtk-sections.txt: Add gtk_label_set/get_angle.
-
-2004-11-20  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_dialog_set_alternative_button_order_from_array
-
-2004-11-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk.types: Sort alphabetically, add gtk_clipboard_get_type
-
-2004-11-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/visual_index.xml: Sort alphabetically.
-
-2004-11-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkfilefilter.sgml: Add docs.
-
-	* === Released 2.5.5 ===
-	
-	* gtk/Makefile.am (content_files): Add migrating-GtkColorButton.sgml
-
-2004-11-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf/tmpl/module_interface.sgml: Document 
-	GDK_PIXBUF_FORMAT_THREADSAFE.
-
-2004-11-09  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_action_get_accel_path.
-
-	* gtk/migrating-GtkAction.sgml: Explain how to migrate
-	non-stock icons.
-
-	* gtk/gtk-sections.txt: Add gtk_label_[gs]et_single_line_mode.
-
-2004-11-07  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_file_filter_add_pixbuf_formats.
-
-2004-11-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkaboutdialog.sgml: 
-	* gtk/migrating-GtkColorButton.sgml: 
-	* gtk/migrating-GtkIconView.sgml: 
-	* gtk/migrating-GtkAboutDialog.sgml: Markup fixes. 
-
-2004-11-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-docs.sgml: 
-	* gtk/migrating-GtkColorButton.sgml: Add some hints about
-	GnomeColorPicker --> GtkColorButton migration.
-
-	* gtk/migrating-GtkAboutDialog.sgml: Fix links.
-
-	* gtk/Makefile.am (content_files): Add new migration chapters.
-
-	* gtk/tmpl/gtkaboutdialog.sgml: Markup fix.
-
-	* gtk/tmpl/gtkstock.sgml: Fix markup.
-
-2004-11-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-docs.sgml: 
-	* gtk/migrating-GtkAboutDialog.sgml: Add a first version
-	of a GnomeAbout --> GtkAboutDialog migration chapter.
-
-	* gtk/tmpl/gtkaboutdialog.sgml: Update.
-
-2004-11-04  Bastien Nocera  <hadess@hadess.net>
-
-	* gtk/tmpl/gtkstock.sgml: add RTL variants for all the media icons
-	needing it
-
-2004-11-03  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-docs.sgml: 
-	* gtk/migrating-GtkIconView.sgml: Add a first version of
-	a GnomeIconList --> GtkIconView migration chapter.
-
-2004-11-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkcellrenderercombo.sgml: 
-	* gtk/tmpl/gtkcellrenderertoggle.sgml: 
-	* gtk/tmpl/gtkcellrenderertext.sgml: Add introductions.
-	
-	* gtk/tmpl/gtkcellrenderer.sgml: Additions.
-
-	* gtk/gtk-sections.txt: Remove GtkFileChooserEmbed, since
-	it is not in the headers we parse.
-
-2004-11-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkcellrendererpixbuf.sgml: Add an intro.
-
-	* gtk/tmpl/gtkfilechooserbutton.sgml: Move some docs inline.
-
-	* gtk/tmpl/gtkaboutdialog.sgml: Small update.
-
-	* gdk-pixbuf/tmpl/initialization_versions.sgml: Document
-	gdk_pixbuf_{major,minor,micro}_version.
-
-Mon Nov  1 13:37:31 2004  Jonathan Blandford  <jrb@redhat.com>
-
-	* gtk/question_index.sgml (linkend): add missing tag.
-
-2004-11-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/question_index.sgml: Add a "ref and sink" question.  
-	(#156865, Philip Langdale, text based on a comment by Owen
-	Taylor)
-
-	* gtk/tmpl/gtkrc.sgml: Document im_module_file and settings
-	assignments as toplevel statements.
-	
-2004-10-31  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/windows.sgml: s/PRETEND_WIN9X/G_WIN32_PRETEND_WIN9X/.
-
-	* gtk/tmpl/gtktreemodel.sgml: Small correction for
-	gtk_tree_path_new_root().  (#156956, Vincent Untz)
-
-	* gtk/gtk-sections.txt: Additions.
-
-2004-10-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/question_index.sgml: Move the "tail" question to the
-	text view section.
-	Add an entry for "why are my types not registered".  (#156809,
-	Q by Salvador Fandiño, A by Owen Taylor)
-	
-2004-10-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.4 ===
-
-2004-10-26  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Additions.
-
-	* gdk-pixbuf/tmpl/scaling.sgml: Document GdkPixbufRotation. 
-
-	* gtk/gtk-update-icon-cache.1: Regenerated.
-
-2004-10-25  Anders Carlsson  <andersca@gnome.org>
-
-	* gdk/gdk-sections.txt:
-	* gtk/gtk-sections.txt:
-	Add new clipboard persistence api.
-	
-2004-10-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add new named icon api in GtkImage.
-	Add new button order api.
-
-Sun Oct 24 02:54:36 2004  Jonathan Blandford  <jrb@redhat.com>
-
-	* gtk/gtk.types: Add GtkAboutDialog and GtkFileChooserButton
-
-	* gtk/tmpl/GtkFileChooserButton.sgml: Write docs
-
-	* gtk/tmpl/GtkListStore.sgml: Update performance comment now that
-	we use GSequence.
-
-	* gtk/visual_index.xml: Fix up a couple of errors.
-
-	* gtk/images/*png: update
-
-2004-10-22  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add new DND functions.
-
-2004-10-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-update-icon-cache.xml: A man page for gtk-update-icon-cache.
-
-	* gtk/gtk-docs.sgml: Add it here	
-
-	* gtk/Makefile.am (man_MANS): ...and here.
-
-2004-10-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/glossary.xml: Additions.
-
-2004-10-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkaboutdialog.sgml: More short description 
-	unification.
-
-	* gtk/tmpl/gtkenums.sgml: Note that GTK_RESIZE_IMMEDIATE 
-	is deprecated.
-
-2004-10-14  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/glossary.xml: Some more additions.
-
-2004-10-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/glossary.xml: Some more additions.
-
-Tue Oct 12 11:04:47 2004  Owen Taylor  <otaylor@redhat.com>
-
-	* gtk/glossary.xml: Fix SGML errors.
-
-2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
-
-	* gtk/glossary.xml: Add some terms.
-
-	* gtk/tmpl/*.sgml: Make the short descriptions a bit more
-	consistent.
-
-	* gtk/images/image.png:
-	* gtk/images/scales.png:
-	* gtk/images/statusbar.png: New images.
-
-	* gtk/visual_index.xml:
-	* gtk/Makefile.am (HTML_IMAGES): Add statusbar, scale 
-	and image images.
-
-2004-10-11  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/migrating-GtkComboBox.sgml: Remove chapterinfo.
-
-	* gtk/tmpl/gtkdialog.sgml: Document GtkDialogFlags and GtkResponseType,
-	and fix an error in the introduction.  (#155055, Shaun McCance)
-
-	* gtk/tmpl/gtktreesortable.sgml: Document GtkTreeIterCompareFunc
-	(#154943)
-
-2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
-
-	* gtk/images/spinbutton.png:
-	* gtk/images/scrolledwindow.png: New images.
-
-	* gtk/Makefile.am (HTML_IMAGES): 
-	* gtk/visual_index.xml: Add scrolled window and spinbutton.
-
-	* gtk/images/progressbar.png:
-	* gtk/images/notebook.png:
-	* gtk/images/toolbar.png:
-	* gtk/images/menubar.png:
-	* gtk/images/messagedialog.png: New images.
-
-	* gtk/Makefile.am (HTML_IMAGES): 
-	* gtk/visual_index.xml: Add toolbar, menubar, progressbar, 
-	notebook and message dialog.
-
-2004-10-09  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/visual_index.xml: Correct some linkends.
-
-	* gtk/tmpl/gtkfontbutton.sgml: Remove test image.
-
-	* gtk/Makefile.am (IGNORE_HFILES): Remove some no longer
-	private headers.
-	(HTML_IMAGES): Remove a duplicate entry.
-
-2004-10-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add some missing functions.
-
-	* gdk/gdk-sections.txt: Add some missing functions.
-
-	* gtk/running.sgml: Update list of supported debug flags.
-
-2004-10-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkenums.sgml: Clarify documentation for selection
-	modes.  (#154188, Jonathan Blandford, new wording proposed by
-	Owen Taylor)
-
-2004-10-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_accelerator_get_label().
-
-2004-09-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.3 ===
-
-Wed Sep 15 01:01:11 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* docs/reference/gtk/images/accel-label.png:
-	* docs/reference/gtk/images/file-button.png:
-	* docs/reference/gtk/images/icon-view.png:
-	* gtk/visual_index.xml: 
-	* gtk/Makefile.am (HTML_IMAGES): Add accel label, file button
-	and icon view.
-
-Tue Sep 14 22:13:51 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/building.sgml: Document --disable-visibility.
-
-2004-09-14  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/tmpl/event_structs.sgml: Document GdkEventOwnerChange and
-	GdkOwnerChange.
-
-	* gdk/tmpl/rgb.sgml: Document gdk_rgb_colormap_ditherable().
-
-2004-09-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdk-sections.txt: Updates.
-
-	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add some missing
-	declarations.
-
-	* gtk/running.sgml: Mention that modules can also
-	be specified in a setting.
-
-Thu Aug 26 01:31:42 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add 
-	gdk_pixbuf_new_from_file_at_scale().
-
-2004-08-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.2 ===
-
-2004-08-24  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf/gdk-pixbuf-csource.xml: Document bugs of
-	the runlength encoder.
-
-Tue Aug 24 02:28:21 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-docs.sgml: Include visual index.
-
-	* gtk/visual_index.xml: New file listing images for 
-	visual index.
-
-	* gtk/Makefile.am (HTML_IMAGES): Add visual index images.
-
-Mon Aug 23 16:56:15 2004  Jonathan Blandford  <jrb@redhat.com>
-
-	* gtk/Makefile.am: add images to the doc build.
-
-2004-08-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkfilechooserbutton.sgml: 
-	* gtk/gtk-sections.txt: 
-	* gtk/gtk-docs.sgml: Add section for GtkFileChooserButton.
-
-Mon Aug 16 01:44:30 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Updates.
-
-Thu Aug 12 00:00:12 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkuimanager.sgml: Add some information about
-	allowed values for the name and action attributes.
-
-Wed Aug 11 23:13:02 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add new GtkAction setters.
-
-2004-08-11  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf/Makefile.am (IGNORE_HFILES): Add gdk-pixbuf-alias.h
-
-Tue Aug 10 18:58:15 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk/Makefile.am (IGNORE_HFILES): Add gdkalias.h
-	
-	* gtk/Makefile.am (IGNORE_HFILES): Add gtkalias.h.
-
-Mon Aug  9 10:52:23 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add gtk_entry_layout_index_to_text_index() 
-	and its inverse. 
-
-2004-08-07  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkrc.sgml: Fix a typo (#164470, Mariano 
-	Suarez-Alvarez)
-
-2004-08-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdk-sections.txt: Add gdk_drag_drop_succeeded.
-
-2004-08-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_file_chooser_[sg]et_show_hidden.
-
-2004-08-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add hover-expand setter and getter.
-
-2004-08-01  Matthias Clasen  <mclasen@redhat.com>
-                                                                                
-        * === Released 2.5.1 ===
-                                                                                
-Sat Jul 31 17:20:22 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add some forgotten functions.
-
-Sat Jul 31 17:18:57 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/framebuffer.sgml: 
-	* gtk/windows.sgml: 
-	* gtk/x11.sgml: 
-	* gtk/running.sgml: Reorganize backend-specific cmdline
-	arguments and environment variables, fill the Windows
-	sections, add XDG_DATA_HOME, XDG_DATA_DIRS.
-
-Sat Jul 31 14:06:32 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/running.sgml: We use GTK2_RC_FILES instead of 
-	GTK_RC_FILES...
-
-2004-07-30  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Update to combo box api changes.
-
-2004-07-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_combo_box_get_popup_accessible.
-
-Thu Jul 22 01:04:14 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add new ellipsistation api.
-
-Sun Jul 18 20:17:41 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
-
-	* === released 2.5.0 ==
-
-2004-07-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkcellview.sgml: New template.
-
-	* gtk/Makefile.am (IGNORE_HFILES): Remove gtkcellview.h
-	and gtkcellviewmenuitem.h
-
-	* gtk/gtk-docs.sgml: Add GtkCellView section.
-
-	* gtk/gtk-sections.txt: Add new entry completion api.
-	Add GtkCellView section.
-
-Sat Jul 17 23:42:09 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add gtk_icon_view_[sg]et_orientation.
-
-Sat Jul 17 00:55:54 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add new text target list handling
-	functions.
-
-Fri Jul 16 23:54:18 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add new GtkWindow and GtkIconTheme 
-	functions for named themed window icons.
-
-2004-07-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: 
-	* gtk/gtk-docs.sgml: Add GtkCellRendererCombo.
-
-2004-07-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_parse_args.
-
-Tue Jul 13 02:01:56 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkaboutdialog.sgml: Additions.
-
-Tue Jul 13 01:16:20 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkiconview.sgml: Updates.
-
-Tue Jul 13 00:45:14 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-docs.sgml: Move GtkAboutDialog to Windows section. 
-
-2004-07-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* gtk/glossary.xml: Start of the GTK+ glossary.
-
-	* gtk/Makefile.am (content_files): Added glossary.xml.
-
-	* gtk/gtk-docs.sgml: Likewise.
-
-2004-07-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-docs.sgml: Add GtkAboutDialog to "Display 
-	Widgets" for now.
-
-	* gtk/gtk-sections.txt: Add GtkAboutDialog section.
-	* gtk/tmpl/gtkaboutdialog.sgml: New file.
-
-Mon Jul 12 00:57:32 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkstock.sgml: 
-	* gtk/Makefile.am (HTML_IMAGES): 
-	* gtk/gtk-sections.txt: Add new stock items.
-
-Thu Jul  8 00:00:20 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/tmpl/module_interface.sgml: Add new functions.
-
-Wed Jul  7 23:57:43 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add new functions.
-
-2004-07-07  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/*: Misc additions.
-
-	* gtk/gtk-sections.txt: Updates.
-
-	* gtk/tmpl/gtkcellrendererprogress.sgml: New file.
-
-	* gtk/gtk-docs.sgml: Add GtkCellRendererProgress.
-
-	* gtk/Makefile.am (HTML_IMAGES): Add file and directory icons.
-
-2004-07-04  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-docs.sgml: 
-	Actually add the iconview docs somewhere (in the tree view
-	section, for lack of a better place).
-
-2004-07-04  Anders Carlsson  <andersca@gnome.org>
-
-	* gtk/gtk-docs.sgml:
-	* gtk/gtk-sections.txt:
-	* gtk/gtk.types:
-	Add GtkIconView to the documentation.
-	
-Sat Jul  3 23:44:45 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtksocket.sgml: 
-	* gtk/tmpl/gtkicontheme.sgml: 
-	* gtk/building.sgml: 
-	* gdk/tmpl/windows.sgml: Fix links to www.freedesktop.org.  
-	(#145210, Billy Biggs)
-
-Tue Jun 22 21:54:24 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/composite.dia: 
-	* gdk-pixbuf/composite.png: Flip the y axes in the diagrams. 
-
-2004-06-22  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkmenu.sgml: Document the push_in parameter
-	of GtkMenuPositionFunc.
-
-	* gtk/tmpl/gtkeditable.sgml: Make example UTF-8 
-	safe.  (#143264, Tommi Komulainen)
-
-	* gdk/tmpl/gcs.sgml: Move function docs inline.
-
-Mon Jun 21 00:46:20 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add 
-	gdk_pixbuf_rotate_simple() and gdk_pixbuf_flip();
-
-Sat Jun 19 01:42:20 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/composite.png: Add a figure which tries
-	to expain pixbuf compositing.
-	
-	* gdk-pixbuf/composite.dia: 
-	* gdk-pixbuf/apple-red-1a.png: 
-	* gdk-pixbuf/apple-red-2c.png: 
-	* gdk-pixbuf/gnome-gmush-1.png: Sources for composite.png.
-	
-	* gdk-pixbuf/Makefile.am (HTML_IMAGES): Add composite.png.
-
-Fri Jun 18 21:20:42 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtktreemodelfilter.sgml: Fix the docs for
-	GtkTreeModelFilterVisibleFunc (#144583, Olivier Andrieu)
-
-Mon May 31 00:16:36 2004  Matthias Clasen  <maclas@gmx.de>
+Mon May 31 00:18:29 2004  Matthias Clasen  <maclas@gmx.de>

 	* gtk/tmpl/gtktable.sgml: Document the default attach
 	options for gtk_table_attach_defaults().  (#143391,
 	Steve Chaplin)

-Fri May 28 14:34:36 2004  Matthias Clasen  <maclas@gmx.de>
+Fri May 28 14:35:53 2004  Matthias Clasen  <maclas@gmx.de>

 	* gtk/tmpl/gtkcontainer.sgml: Fix docs for 
 	gtk_container_border_width().  (#143309, Doug Quale)

-Thu May 27 00:44:48 2004  Matthias Clasen  <maclas@gmx.de>
+Fri May  7 01:36:30 2004  Matthias Clasen  <maclas@gmx.de>

-	* gtk/gtk-sections.txt: Add gtk_entry_completion_get_text_column.
+	* gdk-pixbuf/gdk-pixbuf-csource.xml: Add an "Environment" 
+	section.  (Jens Elkner)

-Thu May 27 00:20:52 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkentrycompletion.sgml: Add notes about 
-	GtkEntryCompletionMatchFunc.
-
-Tue May 25 21:54:55 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkframe.sgml: Move docs inline.
-
-Wed May 19 23:42:40 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk/gdk-sections.txt: Add the right include for the "X interaction"
-	section.
-
-2004-05-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdk-sections.txt: Add gdk_display_supports_selection_notification
-	and gdk_display_request_selection_notification, GdkEventOwnerChange,
-	and GdkOwnerChange.
-
-2004-05-14  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tree_widget.sgml: Minor update.
-
-2004-05-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk.types: Add gtk_cell_renderer_toggle_get_type.
-
-	* gtk/gtk-sections.txt: Add section for GtkCellRendererProgress.
-
-Wed May 12 00:30:57 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk/tmpl/gcs.sgml: Additions.
-
-2004-05-11  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkenums.sgml: Document the selection modes here,
-	rather than in the docs of deprecated list widgets.
-
-Tue May 11 00:29:53 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkpixmap.sgml: 
-	* gtk/tmpl/gtkoldeditable.sgml: 
-	* gtk/tmpl/gtklistitem.sgml: 
-	* gtk/tmpl/gtklist.sgml: 
-	* gtk/tmpl/gtkitemfactory.sgml: 
-	* gtk/tmpl/gtkctree.sgml: 
-	* gtk/tmpl/gtkclist.sgml: Add deprecation notes.
-
-2004-05-10  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_menu_get_for_attach_widet,
-	gtk_tree_view_get_fixed_height_mode,
-	gtk_tree_view_set_fixed_height_mode,
-	gtk_tree_view_get_hover_selection,
-	gtk_tree_view_set_hover_selection
-
-	* gdk/gdk-sections.txt: Add gdk_window_set_user_time().
-
-	* gdk-pixbuf/gdk-pixbuf.sgml: 
-	* gtk/gtk-docs.sgml: 
-	* gdk/gdk-docs.sgml: Add an index for 2.6 additions.
-
-Fri May  7 01:21:14 2004  Matthias Clasen  <maclas@gmx.de>
+Fri May  7 01:23:03 2004  Matthias Clasen  <maclas@gmx.de>

 	* gtk/tmpl/gtkicontheme.sgml: Fix example.  (Steffen Röcker)

-Thu May  6 00:22:38 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add gtk_action_group_translate_string()
-
-Thu May  6 00:04:03 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add missing getters.
-
-Wed May  5 23:46:19 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add gtk_combo_box_get_active_text().
-
-Wed May  5 23:12:36 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add 
-	gdk_pixbuf_format_is_scalable().
-
-2004-05-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-docs.sgml: 
-	* gdk-pixbuf/gdk-pixbuf.sgml: 
-	* gdk/gdk-docs.sgml: Add multiple indices.
-
 2004-05-04  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/tmpl/gtkuimanager.sgml: Fixes to the DTD.
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -21,7 +21,6 @@ CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
 	pixops				\
-	gdk-pixbuf-alias.h		\
 	gdk-pixbuf-marshal.h		\
 	gdk-pixbuf-xlib-private.h 	\
 	gdk-pixbuf-i18n.h 		\
@@ -58,7 +57,7 @@ content_files =				\
 	gdk-pixbuf-query-loaders.xml

 # Images to copy into HTML directory
-HTML_IMAGES = composite.png
+HTML_IMAGES = 

 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=
@@ -66,12 +65,7 @@ FIXXREF_OPTIONS=
 include $(top_srcdir)/gtk-doc.make

 # Other files to distribute
-EXTRA_DIST += version.xml.in \
-	composite.png \
-	composite.dia \
-	apple-red-1a.png \
-	apple-red-2c.png \
-	gnome-gmush-1.png
+EXTRA_DIST += version.xml.in

 ########################################################################

--- a/docs/reference/gdk-pixbuf/apple-red-1a.png
+++ b/docs/reference/gdk-pixbuf/apple-red-1a.png
--- a/docs/reference/gdk-pixbuf/apple-red-2c.png
+++ b/docs/reference/gdk-pixbuf/apple-red-2c.png
--- a/docs/reference/gdk-pixbuf/composite.dia
+++ b/docs/reference/gdk-pixbuf/composite.dia
--- a/docs/reference/gdk-pixbuf/composite.png
+++ b/docs/reference/gdk-pixbuf/composite.png
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1
@@ -21,81 +21,77 @@
 .SH NAME
 gdk-pixbuf-csource \- C code generation utility for GdkPixbuf images
 .SH "SYNOPSIS"
-.ad l
-.hy 0
-.HP 19
-\fBgdk\-pixbuf\-csource\fR [options] [image]
-.ad
-.hy
-.ad l
-.hy 0
-.HP 19
-\fBgdk\-pixbuf\-csource\fR [options] \-\-build\-list [[name]\ [image]...]
-.ad
-.hy
+
+.nf
+\fBgdk-pixbuf-csource\fR [options] [image]
+.fi
+
+.nf
+\fBgdk-pixbuf-csource\fR [options] --build-list [[name] [image]...]
+.fi

 .SH "DESCRIPTION"

 .PP
- \fBgdk\-pixbuf\-csource\fR is a small utility that generates C code containing images, useful for compiling images directly into programs\&.
+ \fBgdk-pixbuf-csource\fR is a small utility that generates C code containing images, useful for compiling images directly into programs\&.

 .SH "INVOCATION"

 .PP
- \fBgdk\-pixbuf\-csource\fR either takes as input one image file name to generate code for, or, using the \fB\-\-build\-list\fR option, a list of (\fIname\fR, \fIimage\fR) pairs to generate code for a list of images into named variables\&.
+ \fBgdk-pixbuf-csource\fR either takes as input one image file name to generate code for, or, using the \fB--build-list\fR option, a list of (\fIname\fR, \fIimage\fR) pairs to generate code for a list of images into named variables\&.

 .SS "Options"

 .TP
-\fB\-\-stream\fR
+\fB--stream\fR
 Generate pixbuf data stream (a single string containing a serialized GdkPixdata structure in network byte order)\&.

 .TP
-\fB\-\-struct\fR
-Generate GdkPixdata structure (needs the GdkPixdata structure definition from \fIgdk\-pixdata\&.h\fR)\&.
+\fB--struct\fR
+Generate GdkPixdata structure (needs the GdkPixdata structure definition from \fIgdk-pixdata\&.h\fR)\&.

 .TP
-\fB\-\-macros\fR
+\fB--macros\fR
 Generate *_ROWSTRIDE, *_WIDTH, *_HEIGHT, *_BYTES_PER_PIXEL and *_RLE_PIXEL_DATA or *_PIXEL_DATA macro definitions for the image\&.

 .TP
-\fB\-\-rle\fR
-Enables run\-length encoding for the generated pixel data (default)\&.
+\fB--rle\fR
+Enables run-length encoding for the generated pixel data (default)\&.

 .TP
-\fB\-\-raw\fR
-Disables run\-length encoding for the generated pixel data\&.
+\fB--raw\fR
+Disables run-length encoding for the generated pixel data\&.

 .TP
-\fB\-\-extern\fR
+\fB--extern\fR
 Generate extern symbols\&.

 .TP
-\fB\-\-static\fR
+\fB--static\fR
 Generate static symbols (default)\&.

 .TP
-\fB\-\-decoder\fR
-Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition to decode run\-length encoded image data\&.
+\fB--decoder\fR
+Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition to decode run-length encoded image data\&.

 .TP
-\fB\-\-name=identifier\fR
-Specifies the identifier name (prefix) for the generated variables or macros (useful only if \fB\-\-build\-list\fR was not specified)\&.
+\fB--name=identifier\fR
+Specifies the identifier name (prefix) for the generated variables or macros (useful only if \fB--build-list\fR was not specified)\&.

 .TP
-\fB\-\-build\-list\fR
+\fB--build-list\fR
 Enables (\fIname\fR, \fIimage\fR) pair parsing mode\&.

 .TP
-\fB\-h\fR, \fB\-\-help\fR
+\fB-h\fR, \fB--help\fR
 Print brief help and exit\&.

 .TP
-\fB\-v\fR, \fB\-\-version\fR
+\fB-v\fR, \fB--version\fR
 Print version and exit\&.

 .TP
-\fB\-\-g\-fatal\-warnings\fR
+\fB--g-fatal-warnings\fR
 Make warnings fatal (causes the program to abort)\&.

 .SH "SEE ALSO"
@@ -106,12 +102,12 @@ The GdkPixbuf documentation, shipped with the Gtk+ distribution, available from
 .SH "BUGS"

 .PP
-The runlength encoder gets out of sync with the pixel boundaries, since it includes the rowstride padding in the encoded stream\&. Furthermore, it generates pixbufs with suboptimal rowstride in some cases\&.
+None known yet\&.

 .SH "AUTHOR"

 .PP
- \fBgdk\-pixbuf\-csource\fR was written by Tim Janik <timj@gtk\&.org>\&.
+ \fBgdk-pixbuf-csource\fR was written by Tim Janik <timj@gtk\&.org>\&.

 .PP
 This manual page was provided by Tim Janik <timj@gtk\&.org>\&.
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
@@ -154,9 +154,7 @@ Gtk+ distribution, available from <ulink url="http://www.gtk.org">www.gtk.org</u

 <refsect1><title>Bugs</title>
 <para>
-The runlength encoder gets out of sync with the pixel boundaries, since
-it includes the rowstride padding in the encoded stream. Furthermore, it
-generates pixbufs with suboptimal rowstride in some cases.
+None known yet.
 </para>
 </refsect1>

--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
@@ -6,16 +6,10 @@

 <SUBSECTION>
 gdk_pixbuf_version
-gdk_pixbuf_major_version
-gdk_pixbuf_minor_version
-gdk_pixbuf_micro_version
 GDK_PIXBUF_VERSION
 GDK_PIXBUF_MAJOR
 GDK_PIXBUF_MINOR
 GDK_PIXBUF_MICRO
-
-<SUBSECTION Private>
-GDK_PIXBUF_VAR
 </SECTION>

 <SECTION>
@@ -63,7 +57,6 @@ GdkPixbufDestroyNotify
 <FILE>file-loading</FILE>
 gdk_pixbuf_new_from_file
 gdk_pixbuf_new_from_file_at_size
-gdk_pixbuf_new_from_file_at_scale
 gdk_pixbuf_get_file_info
 </SECTION>

@@ -150,17 +143,12 @@ gdk_pixbuf_scale
 gdk_pixbuf_composite_color_simple
 gdk_pixbuf_composite
 gdk_pixbuf_composite_color
-GdkPixbufRotation
-gdk_pixbuf_rotate_simple
-gdk_pixbuf_flip

 <SUBSECTION Standard>
 GDK_TYPE_INTERP_TYPE
-GDK_TYPE_PIXBUF_ROTATION

 <SUBSECTION Private>
 gdk_interp_type_get_type
-gdk_pixbuf_rotation_get_type
 </SECTION>

 <SECTION>
@@ -198,10 +186,6 @@ gdk_pixbuf_format_get_description
 gdk_pixbuf_format_get_mime_types
 gdk_pixbuf_format_get_extensions
 gdk_pixbuf_format_is_writable
-gdk_pixbuf_format_is_scalable
-gdk_pixbuf_format_is_disabled
-gdk_pixbuf_format_set_disabled
-gdk_pixbuf_format_get_license
 GdkPixbufFormat
 GdkPixbufFormatFlags
 GdkPixbufModulePattern
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
@@ -130,21 +130,7 @@
    &gdk-pixbuf-query-loaders;
  </reference>

-  <index>
-    <title>Index</title>
-  </index>
-  <index role="deprecated">
-    <title>Index of deprecated symbols</title>
-  </index>
-  <index role="2.2">
-    <title>Index of new symbols in 2.2</title>
-  </index>
-  <index role="2.4">
-    <title>Index of new symbols in 2.4</title>
-  </index>  
-  <index role="2.6">
-    <title>Index of new symbols in 2.6</title>
-  </index>  
+  <index/>

  &Porting-From-Imlib;

--- a/docs/reference/gdk-pixbuf/gnome-gmush-1.png
+++ b/docs/reference/gdk-pixbuf/gnome-gmush-1.png
--- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
@@ -52,21 +52,6 @@ End:
@Returns: 


-<!-- ##### FUNCTION gdk_pixbuf_new_from_file_at_scale ##### -->
-<para>
-
-</para>
-
-@filename: 
-@width: 
-@height: 
-@preserve_aspect_ratio: 
-@error: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@keep_aspect_ratio: 
-
-
 <!-- ##### FUNCTION gdk_pixbuf_get_file_info ##### -->
 <para>

--- a/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
@@ -23,48 +23,6 @@ This is the version currently in use by a running program.
 </para>


-<!-- ##### VARIABLE gdk_pixbuf_major_version ##### -->
-<para>
-The major version number of the &gdk-pixbuf; library.  (e.g. in 
-&gdk-pixbuf; version 1.2.5 this is 1.) 
-</para>
-
-<para>
-This variable is in the library, so represents the
-&gdk-pixbuf; library you have linked against. Contrast with the
-#GDK_PIXBUF_MAJOR macro, which represents the major version of the
-&gdk-pixbuf; headers you have included.
-</para>
-
-
-<!-- ##### VARIABLE gdk_pixbuf_minor_version ##### -->
-<para>
-The minor version number of the &gdk-pixbuf; library.  (e.g. in 
-&gdk-pixbuf; version 1.2.5 this is 2.) 
-</para>
-
-<para>
-This variable is in the library, so represents the
-&gdk-pixbuf; library you have linked against. Contrast with the
-#GDK_PIXBUF_MINOR macro, which represents the minor version of the
-&gdk-pixbuf; headers you have included.
-</para>
-
-
-<!-- ##### VARIABLE gdk_pixbuf_micro_version ##### -->
-<para>
-The micro version number of the &gdk-pixbuf; library.  (e.g. in 
-&gdk-pixbuf; version 1.2.5 this is 5.) 
-</para>
-
-<para>
-This variable is in the library, so represents the
-&gdk-pixbuf; library you have linked against. Contrast with the
-#GDK_PIXBUF_MICRO macro, which represents the micro version of the
-&gdk-pixbuf; headers you have included.
-</para>
-
-
 <!-- ##### MACRO GDK_PIXBUF_VERSION ##### -->
 <para>
 Contains the full version of the &gdk-pixbuf; header as a string.
--- a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
@@ -129,42 +129,6 @@ They are not covered by the same stability guarantees as the regular
@Returns: 


-<!-- ##### FUNCTION gdk_pixbuf_format_is_scalable ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_is_disabled ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_set_disabled ##### -->
-<para>
-
-</para>
-
-@format: 
-@disabled: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_license ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
 <!-- ##### STRUCT GdkPixbufFormat ##### -->
 <para>
 A #GdkPixbufFormat contains information about the image format accepted by a
@@ -180,9 +144,6 @@ use the <function>gdk_pixbuf_format_*</function> functions.
@extensions: a %NULL-terminated array of typical filename extensions for the
 image format.
@flags: a combination of #GdkPixbufFormatFlags.
-@disabled: a boolean determining whether the loader is disabled.
-@license: a string containing license information, typically set to 
- shorthands like "GPL", "LGPL", etc.
@Since: 2.2

 <!-- ##### ENUM GdkPixbufFormatFlags ##### -->
@@ -192,10 +153,6 @@ operations.
 </para>

@GDK_PIXBUF_FORMAT_WRITABLE: the module can write out images in the format.
-@GDK_PIXBUF_FORMAT_SCALABLE: the image format is scalable
-@GDK_PIXBUF_FORMAT_THREADSAFE: the module is threadsafe. If this flag is not
-  set, &gdk-pixbuf; will use a lock to prevent multiple threads from using
-  this module at the same time. (Since 2.6)
@Since: 2.2

 <!-- ##### STRUCT GdkPixbufModulePattern ##### -->
--- a/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
@@ -200,34 +200,3 @@ End:
@color2: 


-<!-- ##### ENUM GdkPixbufRotation ##### -->
-<para>
-The possible rotations which can be passed to gdk_pixbuf_rotate_simple().
-To make them easier to use, their numerical values are the actual degrees.
-</para>
-
-@GDK_PIXBUF_ROTATE_NONE: No rotation.
-@GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE: Rotate by 90 degrees.
-@GDK_PIXBUF_ROTATE_UPSIDEDOWN: Rotate by 180 degrees.
-@GDK_PIXBUF_ROTATE_CLOCKWISE: Rotate by 270 degrees.
-
-<!-- ##### FUNCTION gdk_pixbuf_rotate_simple ##### -->
-<para>
-
-</para>
-
-@src: 
-@angle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_flip ##### -->
-<para>
-
-</para>
-
-@src: 
-@horizontal: 
-@Returns: 
-
-
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -20,7 +20,6 @@ CFILE_GLOB=$(top_srcdir)/gdk/*.c

 # Header files to ignore when scanning
 IGNORE_HFILES=			\
-	gdkalias.h		\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
@@ -59,8 +58,6 @@ content_files = 		\

 # Images to copy into HTML directory
 HTML_IMAGES =				\
-	images/rotated-text.png		\
-					\
 	images/X_cursor.png 		\
 	images/arrow.png 		\
 	images/based_arrow_down.png 	\
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -85,23 +85,6 @@
    &gdk-X-Window-System-Interaction;
  </reference>

-  <index>
-    <title>Index</title>
-  </index>
-  <index role="deprecated">
-    <title>Index of deprecated symbols</title>
-  </index>
-  <index role="2.2">
-    <title>Index of new symbols in 2.2</title>
-  </index>
-  <index role="2.4">
-    <title>Index of new symbols in 2.4</title>
-  </index>  
-  <index role="2.6">
-    <title>Index of new symbols in 2.6</title>
-  </index>  
-  <index role="2.6">
-    <title>Index of new symbols in 2.8</title>
-  </index>  
+  <index/>

 </book>
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -61,6 +61,8 @@ GDK_TYPE_GRAB_STATUS

 <SUBSECTION Private>
 GDK_TYPE_STATUS
+
+<SUBSECTION Private>
 GdkStatus
 GDKVAR
 gdk_axis_use_get_type
@@ -108,10 +110,6 @@ gdk_window_type_get_type
 gdk_window_type_hint_get_type
 gdk_wm_decoration_get_type
 gdk_wm_function_get_type
-gdk_pointer_grab_info_libgtk_only
-gdk_keyboard_grab_info_libgtk_only
-gdk_add_option_entries_libgtk_only
-gdk_pre_parse_libgtk_only
 </SECTION>

 <SECTION>
@@ -142,16 +140,12 @@ gdk_display_get_pointer
 gdk_display_get_window_at_pointer
 GdkDisplayPointerHooks
 gdk_display_set_pointer_hooks
-gdk_display_warp_pointer
 gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
 gdk_display_get_maximal_cursor_size
 gdk_display_get_default_group
-gdk_display_supports_selection_notification
-gdk_display_request_selection_notification
-gdk_display_supports_clipboard_persistence
-gdk_display_store_clipboard
+
 <SUBSECTION Standard>
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
@@ -326,7 +320,6 @@ gdk_rgb_get_visual
 gdk_rgb_get_colormap
 gdk_rgb_get_cmap
 gdk_rgb_ditherable
-gdk_rgb_colormap_ditherable
 gdk_rgb_set_verbose

 <SUBSECTION Standard>
@@ -465,10 +458,7 @@ GdkSegment
 gdk_draw_rectangle
 gdk_draw_arc
 gdk_draw_polygon
-gdk_draw_trapezoids
-GdkTrapezoid
 gdk_draw_glyphs
-gdk_draw_glyphs_transformed
 gdk_draw_layout_line
 gdk_draw_layout_line_with_colors
 gdk_draw_layout
@@ -496,7 +486,6 @@ GDK_IS_DRAWABLE_CLASS
 <SUBSECTION Private>
 GdkDrawableClass
 gdk_draw_bitmap
-gdk_draw_rectangle_alpha_libgtk_only
 </SECTION>

 <SECTION>
@@ -671,14 +660,11 @@ gdk_window_process_all_updates
 gdk_window_process_updates
 gdk_window_set_debug_updates
 gdk_window_get_internal_paint_info
-gdk_window_enable_synchronized_configure
-gdk_window_configure_finished

 <SUBSECTION>
 gdk_window_set_user_data
 gdk_window_set_override_redirect
 gdk_window_set_accept_focus
-gdk_window_set_focus_on_map
 gdk_window_add_filter
 gdk_window_remove_filter
 GdkFilterFunc
@@ -831,14 +817,6 @@ GDK_TYPE_PROP_MODE
 <SECTION>
 <TITLE>Pango Interaction</TITLE>
 <FILE>pango_interaction</FILE>
-GdkPangoRenderer
-GdkPangoRendererClass
-gdk_pango_renderer_new
-gdk_pango_renderer_get_default
-gdk_pango_renderer_set_drawable
-gdk_pango_renderer_set_gc
-gdk_pango_renderer_set_stipple
-gdk_pango_renderer_set_override_color
 gdk_pango_context_get
 gdk_pango_context_get_for_screen
 gdk_pango_context_set_colormap
@@ -848,17 +826,6 @@ gdk_pango_attr_embossed_new
 gdk_pango_attr_stipple_new
 gdk_pango_layout_get_clip_region
 gdk_pango_layout_line_get_clip_region
-<SUBSECTION Standard>
-GDK_TYPE_PANGO_RENDERER
-GDK_PANGO_RENDERER
-GDK_IS_PANGO_RENDERER
-GDK_PANGO_RENDERER_CLASS
-GDK_IS_PANGO_RENDERER_CLASS
-GDK_PANGO_RENDERER_GET_CLASS
-
-<SUBSECTION Private>
-gdk_pango_renderer_get_type
-GdkPangoRendererPrivate
 </SECTION>

 <SECTION>
@@ -1087,7 +1054,6 @@ GdkEventClient
 GdkEventNoExpose
 GdkEventWindowState
 GdkEventSetting
-GdkEventOwnerChange

 <SUBSECTION>
 GdkScrollDirection
@@ -1097,7 +1063,6 @@ GdkNotifyType
 GdkPropertyState
 GdkWindowState
 GdkSettingAction
-GdkOwnerChange

 <SUBSECTION Standard>
 GDK_TYPE_CROSSING_MODE
@@ -1108,11 +1073,9 @@ GDK_TYPE_SCROLL_DIRECTION
 GDK_TYPE_SETTING_ACTION
 GDK_TYPE_VISIBILITY_STATE
 GDK_TYPE_WINDOW_STATE
-GDK_TYPE_OWNER_CHANGE

 <SUBSECTION Private>
 gdk_event_get_type
-gdk_owner_change_get_type
 </SECTION>

 <SECTION>
@@ -1172,7 +1135,6 @@ gdk_drag_context_unref
 GdkDragContext
 GdkDragAction
 gdk_drag_status
-gdk_drag_drop_succeeded

 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -1190,7 +1152,6 @@ gdk_drag_context_get_type
 </SECTION>

 <SECTION>
-<INCLUDE>gdk/gdkx.h</INCLUDE>
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
@@ -1239,8 +1200,6 @@ gdk_net_wm_supports
 gdk_x11_screen_supports_net_wm_hint
 gdk_x11_screen_get_window_manager_name
 gdk_x11_screen_lookup_visual
-gdk_x11_window_set_user_time
-gdk_x11_display_get_user_time
 gdk_x11_colormap_foreign_new
 gdk_x11_colormap_get_xcolormap
 gdk_x11_colormap_get_xdisplay
--- a/docs/reference/gdk/gdk.types
+++ b/docs/reference/gdk/gdk.types
@@ -5,7 +5,6 @@ gdk_display_manager_get_type
 gdk_screen_get_type
 gdk_drawable_get_type
 gdk_window_object_get_type
-gdk_pango_renderer_get_type
 gdk_pixmap_get_type
 gdk_gc_get_type
 gdk_keymap_get_type
--- a/docs/reference/gdk/images/rotated-text.png
+++ b/docs/reference/gdk/images/rotated-text.png
--- a/docs/reference/gdk/tmpl/dnd.sgml
+++ b/docs/reference/gdk/tmpl/dnd.sgml
@@ -213,12 +213,3 @@ should do with the dropped data.
@time_: 


-<!-- ##### FUNCTION gdk_drag_drop_succeeded ##### -->
-<para>
-
-</para>
-
-@context: 
-@Returns: 
-
-
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -285,31 +285,6 @@ function.
@npoints: 


-<!-- ##### FUNCTION gdk_draw_trapezoids ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@gc: 
-@trapezoids: 
-@n_trapezoids: 
-
-
-<!-- ##### STRUCT GdkTrapezoid ##### -->
-<para>
-Specifies a trapezpoid for use by the gdk_draw_trapezoids().
-The trapezoids used here have parallel, horizontal top and 
-bottom edges. 
-</para>
-
-@y1: the y coordinate of the start point.
-@x11: the x coordinate of the top left corner
-@x21: the x coordinate of the top right corner
-@y2: the y coordinate of the end point.
-@x12: the x coordinate of the bottom left corner
-@x22: the x coordinate of the bottom right corner
-
 <!-- ##### FUNCTION gdk_draw_glyphs ##### -->
 <para>

@@ -323,20 +298,6 @@ bottom edges.
@glyphs: 


-<!-- ##### FUNCTION gdk_draw_glyphs_transformed ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@gc: 
-@matrix: 
-@font: 
-@x: 
-@y: 
-@glyphs: 
-
-
 <!-- ##### FUNCTION gdk_draw_layout_line ##### -->
 <para>

--- a/docs/reference/gdk/tmpl/event_structs.sgml
+++ b/docs/reference/gdk/tmpl/event_structs.sgml
@@ -405,22 +405,6 @@ Generated when a setting is modified.
  %GDK_SETTING_ACTION_CHANGED or %GDK_SETTING_ACTION_DELETED).
@name: the name of the setting.

-<!-- ##### STRUCT GdkEventOwnerChange ##### -->
-<para>
-Generated when the owner of a selection changes. On X11, this information is
-only available if the X server supports the XFIXES extension.
-</para>
-
-@type: the type of the event (%GDK_OWNER_CHANGE).
-@window: the window which received the event
-@send_event: %TRUE if the event was sent explicitly (e.g. using <function>XSendEvent</function>).
-@owner: the new owner of the selection
-@reason: the reason for the ownership change as a #GdkOwnerChange value
-@selection: the atom identifying the selection
-@time: the timestamp of the event
-@selection_time: the time at which the selection ownership was taken over
-@Since: 2.6
-
 <!-- ##### ENUM GdkScrollDirection ##### -->
 <para>
 Specifies the direction for #GdkEventScroll. 
@@ -502,12 +486,3 @@ Specifies the kind of modification applied to a setting in a #GdkEventSetting.
@GDK_SETTING_ACTION_CHANGED: a setting was changed.
@GDK_SETTING_ACTION_DELETED: a setting was deleted.

-<!-- ##### ENUM GdkOwnerChange ##### -->
-<para>
-Specifies why a selection ownership was changed.
-</para>
-
-@GDK_OWNER_CHANGE_NEW_OWNER: some other app claimed the ownership
-@GDK_OWNER_CHANGE_DESTROY: the window was destroyed
-@GDK_OWNER_CHANGE_CLOSE: the client was closed
-
--- a/docs/reference/gdk/tmpl/events.sgml
+++ b/docs/reference/gdk/tmpl/events.sgml
@@ -84,8 +84,6 @@ when parts of a drawable were copied. This is not very useful.
@GDK_SCROLL: 
@GDK_WINDOW_STATE: 
@GDK_SETTING: 
-@GDK_OWNER_CHANGE: the owner of a selection has changed. This event type
-  was added in 2.6

 <!-- ##### ENUM GdkEventMask ##### -->
 <para>
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/docs/reference/gdk/tmpl/gcs.sgml
@@ -44,10 +44,8 @@ The #GdkGCValues structure holds a set of values used
 to create or modify a graphics context.
 </para>

-@foreground: the foreground color. Note that gdk_gc_get_values()
-  only sets the pixel value.
-@background: the background color. Note that gdk_gc_get_values()
-  only sets the pixel value.
+@foreground: the foreground color.
+@background: the background color.
@font: the default font.
@function: the bitwise operation used when drawing.
@fill: the fill style.
@@ -119,21 +117,25 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.

 <!-- ##### FUNCTION gdk_gc_new ##### -->
 <para>
+Create a new graphics context with default values. 
 </para>

-@drawable: 
-@Returns: 
+@drawable: a #GdkDrawable. The created GC must always be used
+ with drawables of the same depth as this one.
+@Returns: the new graphics context.


 <!-- ##### FUNCTION gdk_gc_new_with_values ##### -->
 <para>
-
+Create a new GC with the given initial values.
 </para>

-@drawable: 
-@values: 
-@values_mask: 
-@Returns: 
+@drawable: a #GdkDrawable. The created GC must always be used
+ with drawables of the same depth as this one.
+@values: a structure containing initial values for the GC.
+@values_mask: a bit mask indicating which fields in @values
+   are set.
+@Returns: the new graphics context.


 <!-- ##### FUNCTION gdk_gc_get_screen ##### -->
@@ -164,10 +166,10 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.

 <!-- ##### MACRO gdk_gc_destroy ##### -->
 <para>
-This function is obsolete and should not be used.
+Identical to gdk_gc_unref(). This function is obsolete
+and should not be used.
 </para>

-@Deprecated: Use gdk_object_unref() instead
 <!-- # Unused Parameters # -->
@gc: a #GdkGC.

@@ -184,29 +186,29 @@ This function is obsolete and should not be used.

 <!-- ##### FUNCTION gdk_gc_get_values ##### -->
 <para>
-
+Retrieves the current values from a graphics context.
 </para>

-@gc: 
-@values: 
+@gc: a #GdkGC.
+@values: the #GdkGCValues structure in which to store the results.


 <!-- ##### FUNCTION gdk_gc_set_foreground ##### -->
 <para>
-
+Sets the foreground color for a graphics context.
 </para>

-@gc: 
-@color: 
+@gc: a #GdkGC.
+@color: the new foreground color.


 <!-- ##### FUNCTION gdk_gc_set_background ##### -->
 <para>
-
+Sets the background color for a graphics context.
 </para>

-@gc: 
-@color: 
+@gc: a #GdkGC.
+@color: the new background color.


 <!-- ##### FUNCTION gdk_gc_set_rgb_fg_color ##### -->
@@ -229,29 +231,34 @@ This function is obsolete and should not be used.

 <!-- ##### FUNCTION gdk_gc_set_font ##### -->
 <para>
-
+Sets the font for a graphics context. (Note that
+all text-drawing functions in GDK take a @font
+argument; the value set here is used when that
+argument is %NULL.)
 </para>

-@gc: 
-@font: 
+@gc: a #GdkGC.
+@font: the new font.


 <!-- ##### FUNCTION gdk_gc_set_function ##### -->
 <para>
-
+Determines how the current pixel values and the
+pixel values being drawn are combined to produce
+the final pixel values.
 </para>

-@gc: 
+@gc: a #GdkGC.
@function: 


 <!-- ##### FUNCTION gdk_gc_set_fill ##### -->
 <para>
-
+Set the fill mode for a graphics context.
 </para>

-@gc: 
-@fill: 
+@gc: a #GdkGC.
+@fill: the new fill mode.


 <!-- ##### ENUM GdkFill ##### -->
@@ -272,75 +279,93 @@ Determines how primitives are drawn.

 <!-- ##### FUNCTION gdk_gc_set_tile ##### -->
 <para>
-
+Set a tile pixmap for a graphics context.
+This will only be used if the fill mode
+is %GDK_TILED.
 </para>

-@gc: 
-@tile: 
+@gc: a #GdkGC.
+@tile: the new tile pixmap.


 <!-- ##### FUNCTION gdk_gc_set_stipple ##### -->
 <para>
-
+Set the stipple bitmap for a graphics context. The
+stipple will only be used if the fill mode is
+%GDK_STIPPLED or %GDK_OPAQUE_STIPPLED.
 </para>

-@gc: 
-@stipple: 
+@gc: a #GdkGC.
+@stipple: the new stipple bitmap.


 <!-- ##### FUNCTION gdk_gc_set_ts_origin ##### -->
 <para>
-
+Set the origin when using tiles or stipples with
+the GC. The tile or stipple will be aligned such
+that the upper left corner of the tile or stipple
+will coincide with this point.
 </para>

-@gc: 
-@x: 
-@y: 
+@gc: a #GdkGC.
+@x: the x-coordinate of the origin.
+@y: the y-coordinate of the origin.


 <!-- ##### FUNCTION gdk_gc_set_clip_origin ##### -->
 <para>
-
+Sets the origin of the clip mask. The coordinates are
+interpreted relative to the upper-left corner of
+the destination drawable of the current operation.
 </para>

-@gc: 
-@x: 
-@y: 
+@gc: a #GdkGC.
+@x: the x-coordinate of the origin.
+@y: the y-coordinate of the origin.


 <!-- ##### FUNCTION gdk_gc_set_clip_mask ##### -->
 <para>
-
+Sets the clip mask for a graphics context from a bitmap.
+The clip mask is interpreted relative to the clip
+origin. (See gdk_gc_set_clip_origin()).
 </para>

-@gc: 
-@mask: 
+@gc: the #GdkGC.
+@mask: a bitmap.


 <!-- ##### FUNCTION gdk_gc_set_clip_rectangle ##### -->
 <para>
+Sets the clip mask for a graphics context from a
+rectangle. The clip mask is interpreted relative to the clip
+origin. (See gdk_gc_set_clip_origin()).
+
 </para>

-@gc: 
-@rectangle: 
+@gc: a #GdkGC.
+@rectangle: the rectangle to clip to.


 <!-- ##### FUNCTION gdk_gc_set_clip_region ##### -->
 <para>
-
+Sets the clip mask for a graphics context from a region structure.
+The clip mask is interpreted relative to the clip origin. (See
+gdk_gc_set_clip_origin()).
 </para>

-@gc: 
-@region: 
+@gc: a #GdkGC.
+@region: the #GdkRegion.


 <!-- ##### FUNCTION gdk_gc_set_subwindow ##### -->
 <para>
-
+Sets how drawing with this GC on a window will affect child
+windows of that window. 
 </para>

-@gc: 
-@mode: 
+@gc: a #GdkGC.
+@mode: the subwindow mode.


 <!-- ##### ENUM GdkSubwindowMode ##### -->
@@ -354,23 +379,28 @@ windows of that window.

 <!-- ##### FUNCTION gdk_gc_set_exposures ##### -->
 <para>
-
+Sets whether copying non-visible portions of a drawable
+using this graphics context generate exposure events
+for the corresponding regions of the destination
+drawable. (See gdk_draw_drawable()).
 </para>

-@gc: 
-@exposures: 
+@gc: a #GdkGC.
+@exposures: if %TRUE, exposure events will be generated.


 <!-- ##### FUNCTION gdk_gc_set_line_attributes ##### -->
 <para>
-
+Sets various attributes of how lines are drawn. See
+the corresponding members of #GdkGCValues for full
+explanations of the arguments.
 </para>

-@gc: 
-@line_width: 
-@line_style: 
-@cap_style: 
-@join_style: 
+@gc: a #GdkGC.
+@line_width: the width of lines.
+@line_style: the dash-style for lines.
+@cap_style: the manner in which the ends of lines are drawn.
+@join_style: the in which lines are joined together.


 <!-- ##### ENUM GdkLineStyle ##### -->
@@ -410,22 +440,28 @@ Determines how the joins between segments of a polygon are drawn.

 <!-- ##### FUNCTION gdk_gc_set_dashes ##### -->
 <para>
-
+Sets the way dashed-lines are drawn. Lines will be
+drawn with alternating on and off segments of the
+lengths specified in @dash_list. The manner in
+which the on and off segments are drawn is determined
+by the @line_style value of the GC. (This can
+be changed with gdk_gc_set_line_attributes())
 </para>

-@gc: 
-@dash_offset: 
-@dash_list: 
-@n: 
+@gc: a #GdkGC.
+@dash_offset: the
+@dash_list: an array of dash lengths.
+@n: the number of elements in @dash_list.


 <!-- ##### FUNCTION gdk_gc_copy ##### -->
 <para>
-
+Copy the set of values from one graphics context
+onto another graphics context.
 </para>

-@dst_gc: 
-@src_gc: 
+@dst_gc: the destination graphics context.
+@src_gc: the source graphics context.


 <!-- ##### FUNCTION gdk_gc_set_colormap ##### -->
--- a/docs/reference/gdk/tmpl/gdkdisplay.sgml
+++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml
@@ -278,17 +278,6 @@ Applications should never have any reason to use this facility
@Returns: 


-<!-- ##### FUNCTION gdk_display_warp_pointer ##### -->
-<para>
-
-</para>
-
-@display: 
-@screen: 
-@x: 
-@y: 
-
-
 <!-- ##### FUNCTION gdk_display_supports_cursor_color ##### -->
 <para>

@@ -335,43 +324,3 @@ Applications should never have any reason to use this facility
@Returns: 


-<!-- ##### FUNCTION gdk_display_supports_selection_notification ##### -->
-<para>
-
-</para>
-
-@display: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_display_request_selection_notification ##### -->
-<para>
-
-</para>
-
-@display: 
-@selection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_display_supports_clipboard_persistence ##### -->
-<para>
-
-</para>
-
-@display: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_display_store_clipboard ##### -->
-<para>
-
-</para>
-
-@display: 
-@clipboard_window: 
-@time_: 
-@targets: 
-@n_targets: 
-
-
--- a/docs/reference/gdk/tmpl/pango_interaction.sgml
+++ b/docs/reference/gdk/tmpl/pango_interaction.sgml
@@ -2,206 +2,18 @@
 Pango Interaction

 <!-- ##### SECTION Short_Description ##### -->
-Using Pango in GDK
+Low-level access to Pango

 <!-- ##### SECTION Long_Description ##### -->
 <para>
-Pango is the text layout system used by GDK and GTK+. The functions
-and types in this section are used to render Pango objects to GDK.
-drawables, and also extend the set of Pango attributes to include
-stippling and embossing.
+
 </para>
-<para>
-Creating a #PangoLayout object is the first step in rendering text,
-and requires getting a handle to a #PangoContext. For GTK+ programs,
-you'll usually want to use gtk_widget_get_context(), or
-gtk_widget_create_pango_layout(), rather than using the lowlevel
-gdk_pango_context_get_for_screen(). Once you have a #PangoLayout, you
-can set the text and attributes of it with Pango functions like
-pango_layout_set_text() and get its size with pango_layout_get_size().
-(Note that Pango uses a fixed point system internally, so converting
-between Pango units and pixels using <link
-linkend="PANGO-SCALE-CAPS">PANGO_SCALE</link> or the PANGO_PIXELS() macro.)
-</para>
-<para>
-Rendering a Pango layout is done most simply with gdk_draw_layout();
-you can also draw pieces of the layout with gdk_draw_layout() or
-gdk_draw_glyphs(). #GdkPangoRenderer is a subclass of #PangoRenderer
-that is used internally to implement these functions. Using it
-directly or subclassing it can be useful in some cases. See the
-#GdkPangoRenderer documentation for details.
-</para>
-<example id="rotated-example">
-<title>Using #GdkPangoRenderer to draw transformed text</title>
-<!-- Note that this example is basically the same as
-     demos/gtk-demo/rotated_text.c -->
-<programlisting>
-#define RADIUS 100
-#define N_WORDS 10
-#define FONT "Sans Bold 18"
-  
-GdkScreen *screen = gdk_drawable_get_screen (drawable);
-PangoRenderer *renderer;
-GdkGC *gc;
-
-PangoMatrix matrix = PANGO_MATRIX_INIT;
-PangoContext *context;
-PangoLayout *layout;
-PangoFontDescription *desc;
-
-double device_radius;
-int width, height;
-int i;
-
-/* Get the default renderer for the screen, and set it up for drawing  */
-renderer = gdk_pango_renderer_get_default (screen);
-gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), drawable);
-
-gc = gdk_gc_new (drawable);
-gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), gc);
-
-/* Set up a transformation matrix so that the user space coordinates for
- * where we are drawing are [-RADIUS, RADIUS], [-RADIUS, RADIUS]
- * We first center, then change the scale */
-gdk_drawable_get_size (drawable, &amp;width, &amp;height);
-device_radius = MIN (width, height) / 2.;
-
-pango_matrix_translate (&amp;matrix,
-                        device_radius + (width - 2 * device_radius) / 2,
-                        device_radius + (height - 2 * device_radius) / 2);
-pango_matrix_scale (&amp;matrix, device_radius / RADIUS, device_radius / RADIUS);
-
-/* Create a PangoLayout, set the font and text */
-context = gdk_pango_context_get_for_screen (screen);
-layout = pango_layout_new (context);
-pango_layout_set_text (layout, "Text", -1);
-desc = pango_font_description_from_string (FONT);
-pango_layout_set_font_description (layout, desc);
-pango_font_description_free (desc);
-
-/* Draw the layout N_WORDS times in a circle */
-for (i = 0; i &lt; N_WORDS; i++)
-  {
-    GdkColor color;
-    PangoMatrix rotated_matrix = matrix;
-    int width, height;
-    double angle = (360. * i) / N_WORDS;
-
-    /* Gradient from red at angle == 60 to blue at angle == 300 */
-    color.red   = 65535 * (1 + cos ((angle - 60) * M_PI / 180.)) / 2;
-    color.green = 0;
-    color.blue  = 65535  - color.red;
-    
-    gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-                                           PANGO_RENDER_PART_FOREGROUND, &amp;color);
-                                             
-    pango_matrix_rotate (&amp;rotated_matrix, angle);
-
-    pango_context_set_matrix (context, &amp;rotated_matrix);
-    
-    /* Inform Pango to re-layout the text with the new transformation matrix */
-    pango_layout_context_changed (layout);
-    
-    pango_layout_get_size (layout, &amp;width, &amp;height);
-    pango_renderer_draw_layout (renderer, layout,
-                                - width / 2, - RADIUS * PANGO_SCALE);
-  }
-
-/* Clean up default renderer, since it is shared */
-gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-                                       PANGO_RENDER_PART_FOREGROUND, NULL);
-gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), NULL);
-gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), NULL);
-
-/* free the objects we created */
-g_object_unref (layout);
-g_object_unref (context);
-g_object_unref (gc);
-</programlisting>
-</example>
-<figure>
-  <title>Output of <xref linkend="rotated-example"/></title>
-  <graphic fileref="rotated-text.png" format="PNG"/>
-</figure>

 <!-- ##### SECTION See_Also ##### -->
 <para>

 </para>

-<!-- ##### STRUCT GdkPangoRenderer ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GdkPangoRenderer:screen ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GdkPangoRendererClass ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gdk_pango_renderer_new ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pango_renderer_get_default ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pango_renderer_set_drawable ##### -->
-<para>
-
-</para>
-
-@gdk_renderer: 
-@drawable: 
-
-
-<!-- ##### FUNCTION gdk_pango_renderer_set_gc ##### -->
-<para>
-
-</para>
-
-@gdk_renderer: 
-@gc: 
-
-
-<!-- ##### FUNCTION gdk_pango_renderer_set_stipple ##### -->
-<para>
-
-</para>
-
-@gdk_renderer: 
-@part: 
-@stipple: 
-
-
-<!-- ##### FUNCTION gdk_pango_renderer_set_override_color ##### -->
-<para>
-
-</para>
-
-@gdk_renderer: 
-@part: 
-@color: 
-
-
 <!-- ##### FUNCTION gdk_pango_context_get ##### -->
 <para>

--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/docs/reference/gdk/tmpl/rgb.sgml
@@ -433,25 +433,13 @@ visual should be used when creating windows that will be drawn in by GdkRGB.

 <!-- ##### FUNCTION gdk_rgb_ditherable ##### -->
 <para>
-Determines whether the preferred visual is ditherable. This function may be
+Determines whether the visual is ditherable. This function may be
 useful for presenting a user interface choice to the user about which
 dither mode is desired; if the display is not ditherable, it may make
 sense to gray out or hide the corresponding UI widget.
 </para>

-@Returns: %TRUE if the preferred visual is ditherable.
-
-
-<!-- ##### FUNCTION gdk_rgb_colormap_ditherable ##### -->
-<para>
-Determines whether the visual associated with @cmap is ditherable. This 
-function may be useful for presenting a user interface choice to the user 
-about which dither mode is desired; if the display is not ditherable, it may 
-make sense to gray out or hide the corresponding UI widget.
-</para>
-
-@cmap: a #GdkColormap
-@Returns: %TRUE if the visual associated with @cmap is ditherable.
+@Returns: %TRUE if the visual is ditherable.


 <!-- ##### FUNCTION gdk_rgb_set_verbose ##### -->
--- a/docs/reference/gdk/tmpl/threads.sgml
+++ b/docs/reference/gdk/tmpl/threads.sgml
@@ -65,13 +65,12 @@ main (int argc, char *argv[])

  g_thread_init (NULL);
  gdk_threads_init (<!-- -->);
-  gdk_threads_enter (<!-- -->);
-
  gtk_init (&amp;argc, &amp;argv);

  window = create_window (<!-- -->);
  gtk_widget_show (window);

+  gdk_threads_enter (<!-- -->);
  gtk_main (<!-- -->);
  gdk_threads_leave (<!-- -->);

@@ -194,7 +193,6 @@ int main (int argc, char *argv[])
  /* init threads */
  g_thread_init (NULL);
  gdk_threads_init (<!-- -->);
-  gdk_threads_enter (<!-- -->);

  /* init gtk */
  gtk_init(&amp;argc, &amp;argv);
@@ -228,6 +226,7 @@ int main (int argc, char *argv[])
  pthread_create (&amp;no_tid, NULL, argument_thread, &amp;no_args);

  /* enter the GTK main loop */
+  gdk_threads_enter (<!-- -->);
  gtk_main (<!-- -->);
  gdk_threads_leave (<!-- -->);

--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -155,7 +155,7 @@ ratio.
 Defines the reference point of a window and the meaning of coordinates
 passed to gtk_window_move(). See gtk_window_move() and the "implementation 
 notes" section of the 
-<ulink url="http://www.freedesktop.org/standards/wm-spec">extended 
+<ulink url="http://www.freedesktop.org/standards/wm-spec.html">extended 
 window manager hints</ulink> specification for more details.
 </para>

@@ -191,24 +191,15 @@ These are hints for the window manager that indicate what type of function
 the window has. The window manager can use this when determining decoration 
 and behaviour of the window. The hint must be set before mapping the window.
 </para>
-<para>
-See the
-<ulink url="http://www.freedesktop.org/standards/wm-spec">extended 
-window manager hints</ulink> specification for more details about 
-window types.
-</para>

@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_TOOLBAR: Window used to implement toolbars.
-@GDK_WINDOW_TYPE_HINT_SPLASHSCREEN: Window used to display a splash 
-  screen during application startup.
-@GDK_WINDOW_TYPE_HINT_UTILITY: Utility windows which are not detached 
-  toolbars or dialogs.
-@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_SPLASHSCREEN: 
+@GDK_WINDOW_TYPE_HINT_UTILITY: 
+@GDK_WINDOW_TYPE_HINT_DOCK: 
+@GDK_WINDOW_TYPE_HINT_DESKTOP: 

 <!-- ##### STRUCT GdkWindowAttr ##### -->
 <para>
@@ -732,22 +723,6 @@ Registers a window as a potential drop destination.
@y_offset: 


-<!-- ##### FUNCTION gdk_window_enable_synchronized_configure ##### -->
-<para>
-
-</para>
-
-@window: 
-
-
-<!-- ##### FUNCTION gdk_window_configure_finished ##### -->
-<para>
-
-</para>
-
-@window: 
-
-
 <!-- ##### FUNCTION gdk_window_set_user_data ##### -->
 <para>

@@ -775,15 +750,6 @@ Registers a window as a potential drop destination.
@accept_focus: 


-<!-- ##### FUNCTION gdk_window_set_focus_on_map ##### -->
-<para>
-
-</para>
-
-@window: 
-@focus_on_map: 
-
-
 <!-- ##### FUNCTION gdk_window_add_filter ##### -->
 <para>

--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -224,6 +224,11 @@ Returns the display of a #GdkCursor.
 <para>
 Returns the X GC of a #GdkGC.
 </para>
+<note><para>
+Note that the clip origin, clip region and tile/stipple origin fields of the
+returned GC may not be in sync with @gc. If you need that, 
+use GDK_GC_GET_XGC().  
+</para></note>

@gc: a #GdkGC.
@Returns: an Xlib <type>GC</type>.
@@ -431,24 +436,6 @@ Since: 2.2
@Returns: 


-<!-- ##### FUNCTION gdk_x11_window_set_user_time ##### -->
-<para>
-
-</para>
-
-@window: 
-@timestamp: 
-
-
-<!-- ##### FUNCTION gdk_x11_display_get_user_time ##### -->
-<para>
-
-</para>
-
-@display: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_x11_colormap_foreign_new ##### -->
 <para>

--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -23,9 +23,11 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c

 # Header files to ignore when scanning
 IGNORE_HFILES=				\
-	gtkalias.h			\
 	fnmatch.h			\
 	gdk-pixbuf-loader.h		\
+	gtkcellrendererseptext.h	\
+	gtkcellview.h			\
+	gtkcellviewmenuitem.h		\
 	gtkdebug.h			\
 	gtkentryprivate.h		\
 	gtkfilechooserdefault.h		\
@@ -91,14 +93,10 @@ content_files =					\
 	changes-2.0.sgml			\
 	compiling.sgml				\
 	framebuffer.sgml			\
-	glossary.xml				\
 	migrating-checklist.sgml		\
 	migrating-GtkAction.sgml		\
 	migrating-GtkComboBox.sgml		\
 	migrating-GtkFileChooser.sgml		\
-	migrating-GtkIconView.sgml		\
-	migrating-GtkAboutDialog.sgml		\
-	migrating-GtkColorButton.sgml		\
 	objects_grouped.sgml			\
 	question_index.sgml			\
 	resources.sgml				\
@@ -106,13 +104,10 @@ content_files =					\
 	tree_widget.sgml			\
 	windows.sgml				\
 	x11.sgml				\
-	gtk-query-immodules-2.0.xml		\
-	gtk-update-icon-cache.xml		\
-	visual_index.xml
+	gtk-query-immodules-2.0.xml

 # Images to copy into HTML directory
 HTML_IMAGES = \
-	$(top_srcdir)/gtk/stock-icons/stock_about_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_add_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_apply_20.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_text_bold_24.png		\
@@ -120,7 +115,6 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/stock_cdrom_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_clear_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_close_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_connect_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_convert_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_copy_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_cut_24.png			\
@@ -130,13 +124,9 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/stock_dialog_info_48.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_dialog_question_48.png	\
 	$(top_srcdir)/gtk/stock-icons/stock_dialog_warning_48.png	\
-	$(top_srcdir)/gtk/stock-icons/stock_directory_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_disconnect_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_dnd_32.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_dnd_multiple_32.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_edit_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_exec_24.png			\
-	$(top_srcdir)/gtk/stock-icons/stock_file_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_search_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_search_replace_24.png	\
 	$(top_srcdir)/gtk/stock-icons/stock_bottom_24.png		\
@@ -147,13 +137,9 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/stock_down_arrow_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_right_arrow_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_up_arrow_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_harddisk_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_network_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_help_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_home_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_index_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_text_indent_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_text_unindent_24.png	\
 	$(top_srcdir)/gtk/stock-icons/stock_text_italic_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_jump_to_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_jump_to_rtl_24.png		\
@@ -197,48 +183,7 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/stock_zoom_1_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_zoom_fit_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_zoom_in_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_zoom_out_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_media_forward_24.png	\
-	$(top_srcdir)/gtk/stock-icons/stock_media_next_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_media_pause_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_media_play_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_media_play_rtl_24.png	\
-	$(top_srcdir)/gtk/stock-icons/stock_media_previous_24.png	\
-	$(top_srcdir)/gtk/stock-icons/stock_media_record_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_media_rewind_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_media_stop_24.png		\
-	$(srcdir)/images/accel-label.png				\
-	$(srcdir)/images/button.png					\
-	$(srcdir)/images/check-button.png				\
-	$(srcdir)/images/color-button.png				\
-	$(srcdir)/images/colorsel.png					\
-	$(srcdir)/images/combo-box.png					\
-	$(srcdir)/images/combo-box-entry.png				\
-	$(srcdir)/images/entry.png					\
-	$(srcdir)/images/file-button.png				\
-	$(srcdir)/images/filechooser.png				\
-	$(srcdir)/images/font-button.png				\
-	$(srcdir)/images/fontsel.png					\
-	$(srcdir)/images/frame.png					\
-	$(srcdir)/images/icon-view.png					\
-	$(srcdir)/images/image.png					\
-	$(srcdir)/images/label.png					\
-	$(srcdir)/images/list-and-tree.png				\
-	$(srcdir)/images/menubar.png					\
-	$(srcdir)/images/messagedialog.png				\
-	$(srcdir)/images/multiline-text.png				\
-	$(srcdir)/images/notebook.png					\
-	$(srcdir)/images/panes.png					\
-	$(srcdir)/images/progressbar.png				\
-	$(srcdir)/images/radio-group.png				\
-	$(srcdir)/images/scales.png					\
-	$(srcdir)/images/scrolledwindow.png				\
-	$(srcdir)/images/separator.png					\
-	$(srcdir)/images/spinbutton.png					\
-	$(srcdir)/images/statusbar.png					\
-	$(srcdir)/images/toggle-button.png				\
-	$(srcdir)/images/toolbar.png					\
-	$(srcdir)/images/window.png
+	$(top_srcdir)/gtk/stock-icons/stock_zoom_out_24.png

 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
@@ -250,7 +195,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 

 if ENABLE_MAN

--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -98,8 +98,8 @@ How to compile GTK+ itself
      a search path that <command>pkg-config</command> (see below)
      uses when looking for for file describing how to compile
      programs using different libraries. If you were installing GTK+
-      and it's dependencies into <filename>/opt/gtk</filename>, you 
-      might want to set these variables as:
+      and it's dependencies into <filename>/opt/gtk</filename>, you might want to set
+      these variables as:
    </para>
    <programlisting>
      CPPFLAGS="-I/opt/gtk/include"
@@ -134,15 +134,15 @@ How to compile GTK+ itself
      <listitem>
 	<para>
 	  <ulink
-	  url="http://www.freedesktop.org/software/pkgconfig">pkg-config</ulink>
+	  url="http://www.freedesktop.org/software/pkgconfig/">pkg-config</ulink>
 	  is a tool for tracking the compilation flags needed for
 	  libraries that are used by the GTK+ libraries. (For each
-	  library, a small <literal>.pc</literal> text file is installed 
-          in a standard location that contains the compilation flags 
-          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
+	  library, a small <literal>.pc</literal> text file is installed in a standard
+	  location that contains the compilation flags 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.2/">GTK+ FTP
 	  site.</ulink>
 	</para>
      </listitem>
@@ -169,7 +169,7 @@ How to compile GTK+ itself
 	  The GLib library provides core non-graphical functionality
 	  such as high level data types, Unicode manipulation, and
 	  an object and type system to C programs. It is available
-	  from the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+
+	  from the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">GTK+
 	  FTP site.</ulink>
 	</para>
      </listitem>
@@ -177,8 +177,9 @@ How to compile GTK+ itself
 	<para>
 	  <ulink url="http://www.pango.org">Pango</ulink> is a library
 	  for internationalized text handling. It is available from
-	  the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP
-	  site.</ulink>. 
+	  the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">GTK+ FTP
+	  site.</ulink>. Either Pango-1.0 or Pango-1.2 can be used
+	  with GTK+-2.2, though Pango-1.2 is recommended.
 	</para>
      </listitem>
      <listitem>
@@ -187,7 +188,7 @@ How to compile GTK+ itself
 	  interfaces allowing accessibility technologies such as
 	  screen readers to interact with a graphical user interface.
 	  It is available from the <ulink
-	  url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP site.</ulink>
+	  url="ftp://ftp.gtk.org/pub/gtk/v2.2/">GTK+ FTP site.</ulink>
 	</para>
      </listitem>
      <listitem>
@@ -214,12 +215,11 @@ How to compile GTK+ itself
 	  The <ulink
 	    url="ftp://ftp.uu.net/graphics/jpeg/">JPEG</ulink>,
 	  <ulink url="http://www.libpng.org">PNG</ulink>, and
-	  <ulink url="http://www.libtiff.org">TIFF</ulink> image 
-          loading libraries are needed to compile GTK+. You probably 
-          already have these libraries installed, but if not, the 
-          versions you need are available in the 
-           <filename>dependencies</filename> directory on the the
-	  <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/dependencies/">GTK+
+	  <ulink url="http://www.libtiff.org">TIFF</ulink> image loading libraries are needed to
+	  compile GTK+. You probably already have these libraries
+	  installed, but if not, the versions you need are available in
+	  the <filename>dependencies</filename> directory on the the
+	  <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/dependencies/">GTK+
 	    FTP site.</ulink>. (Before installing these libraries
 	  from source, you should check if your operating system
 	  vendor has prebuilt packages of these libraries that you
@@ -239,14 +239,13 @@ How to compile GTK+ itself
 	<para>
 	  The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
 	  library provides Pango with a standard way of locating
-	  fonts and matching them against font names. The 
-          <ulink url="http://www.freedesktop.org/wiki/Software/Xft">Xft2</ulink>
+	  fonts and matching them against font names. The Xft2
 	  library, distributed with fontconfig, provides support for
 	  scalable and antialiased fonts on X. Pango includes two
 	  backends that work on top of fontconfig: an Xft2 backend
 	  and a backend that uses fontconfig and the underlying
-	  <ulink url="http://www.freetype.org">FreeType</ulink>
-	  library directly. Neither backend is mandatory, but the
+	  <ulink url="http://www.freetype.org">FreeType
+	  library</ulink> directly. Neither backend is mandatory, but the
 	  Xft2 backend is the preferred backend for X and the FreeType
 	  backend is needed by many applications.
 	</para>
@@ -312,10 +311,6 @@ How to compile GTK+ itself
 	  <group>
 	    <arg>--enable-debug=[no|minimum|yes]</arg>
 	  </group>
-          <group>
-	    <arg>--disable-visibility</arg>
-	    <arg>--enable-visibility</arg>
-	  </group>
          <group>
 	    <arg>--disable-shm</arg>
 	    <arg>--enable-shm</arg>
@@ -395,19 +390,6 @@ How to compile GTK+ itself
        </para>
      </formalpara>

-      <formalpara>
-        <title><systemitem>--disable-visibility</systemitem> and
-          <systemitem>--enable-visibility</systemitem></title>
-        <para>
-          The option <systemitem>--disable-visibility</systemitem>
-          turns off the use of ELF visibility attributes for linking
-          optimizations. This makes sense while changing GTK+ itself,
-          since the way in which GTK+ uses visibility attributes 
-          forces a full rebuild of all source files for any header
-          modification.
-        </para>
-      </formalpara>
-
      <formalpara>
        <title><systemitem>--enable-explicit-deps</systemitem> and
          <systemitem>--disable-explicit-deps</systemitem></title>
--- a/docs/reference/gtk/framebuffer.sgml
+++ b/docs/reference/gtk/framebuffer.sgml
@@ -92,7 +92,7 @@ virtual console in the current resolution and bit-depth. This can be
 changed by specifying environment variables:
 </para>

-<para id="fb-envar">
+<para>
 <programlisting>
 <envar>GDK_VT</envar>:
 unset means open on the current VT.
--- a/docs/reference/gtk/glossary.xml
+++ b/docs/reference/gtk/glossary.xml
@@ -1,380 +0,0 @@
-<glossary id="glossary">
-  <title>Glossary</title>
-
-  <glossentry id="allocation">
-    <glossterm>allocation</glossterm>
-    <glossdef>
-      <para>
-	The final size of a <glossterm
-	linkend="widget">widget</glossterm> within its <glossterm
-	linkend="parent">parent</glossterm>.  For example, a widget
-	may request a minimum size of 20&times;20 pixels, but its
-	parent may decide to allocate 50&times;20 pixels for it
-	instead.
-      </para>
-      <glossseealso>
-	<glossterm linkend="requisition">requisition</glossterm>
-      </glossseealso>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="bin">
-    <glossterm>bin</glossterm>
-    <glossdef>
-      <para>
-	A <glossterm linkend="container">container</glossterm> that
-	can hold at most one child widget.  The base class for bins is
-	<link linkend="GtkBin">GtkBin</link>.
-      </para>
-      <glossseealso>
-	<glossterm linkend="container">container</glossterm>
-      </glossseealso>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="child">
-    <glossterm>child</glossterm>
-    <glossdef>
-      <para>
-	A <glossterm linkend="container">container's</glossterm> child
-	is a <glossterm linkend="widget">widget</glossterm> contained
-	inside it.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="column">
-    <glossterm>column</glossterm>
-    <glossdef>
-      <para>
-	GTK+ contains several widgets which display data in columns,
-        e.g. the <link linkend="GtkTreeView">GtkTreeView</link>. 
-        These <glossterm linkend="view-column">view columns</glossterm> in 
-        the tree view are represented by 
-        <link linkend="GtkTreeViewColumn">GtkTreeViewColumn</link>
-        objects inside GTK+. They should not be confused with 
-        <glossterm linkend="model-column">model columns</glossterm> which
-        are used to organize the data in tree models.
-      </para>
-      <glossseealso>model-view widget</glossseealso>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="container">
-    <glossterm>container</glossterm>
-    <glossdef>
-      <para>
-	A <glossterm linkend="widget">widget</glossterm> that contains
-	other widgets; in that case, the container is the
-	<emphasis>parent</emphasis> of the <emphasis>child</emphasis>
-	widgets.  Some containers don't draw anything on their own,
-	but rather just organize their children's <glossterm
-	linkend="geometry">geometry</glossterm>; for example, <link
-	linkend="GtkVBox">GtkVBox</link> lays out its children
-	vertically without painting anything on its own.  Other
-	containers include decorative elements; for example, <link
-	linkend="GtkFrame">GtkFrame</link> contains the frame's child
-	and a label in addition to the shaded frame it draws.  The
-	base class for containers is <link
-	linkend="GtkContainer">GtkContainer</link>.
-      </para>
-      <glossseealso>
-	<glossterm linkend="container">widget</glossterm>
-	<glossterm linkend="container">geometry</glossterm>
-      </glossseealso>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="display">
-    <glossterm>display</glossterm>
-    <glossdef>
-      <para>
-        GDK inherited the concept of display from the X window system,
-        which considers a display to be the combination
-        of a keyboard, a pointing device and one or more 
-        <glossterm linkend="screen">screens</glossterm>. 
-        Applications open a display to show windows and interact with the user.
-        In GDK, a display is represented by a 
-        <link linkend="GdkDisplay">GdkDisplay</link>.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="event">
-    <glossterm>event</glossterm>
-    <glossdef>
-      <para>
-        Events are the way in which GDK informs GTK+ about external events
-        like pointer motion, button clicks, key presses, etc. 
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="geometry">
-    <glossterm>geometry</glossterm>
-    <glossdef>
-      <para>
-	A <glossterm linkend="widget">widget's</glossterm> position
-	and size.  Within its parent, this is called the widget's
-	<glossterm linkend="allocation">allocation</glossterm>.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="mapping">
-    <glossterm>mapping</glossterm>
-    <glossdef>
-      <para>
-	This is the step in a <glossterm
-	linkend="widget">widget's</glossterm> life cycle where it
-	actually shows the GdkWindows it created when it was
-	<glossterm linkend="realization">realized</glossterm>.  When a
-	widget is mapped, it must turn on its
-	<constant>GTK_MAPPED</constant> <link
-	linkend="GtkWidgetFlags">flag</link>.
-      </para>
-
-      <para>
-	Note that due to the asynchronous nature of the X window
-	system, a widget's window may not appear on the screen
-	immediatly after one calls <link
-	linkend="gdk-window-show"><function>gdk_window_show()</function></link>:
-	you must wait for the corresponding map <glossterm
-	linkend="event">event</glossterm> to be received.  You can do
-	this with the <link
-	linkend="GtkWidget-map-event"><methodname>GtkWidget::map-event</methodname>
-	signal</link>.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="model-column">
-    <glossterm>model column</glossterm>
-    <glossdef>
-      <para>
-        A column in a tree model, holding data of a certain type. 
-        The types which can be stored in the columns of a model 
-        have to be specified when the model is constructed, see 
-        e.g. <link linkend="gtk-list-store-new">gtk_list_store_new()</link>.
-      </para>
-      <glossseealso>
-	<glossterm linkend="view-column">view column</glossterm>
-      </glossseealso>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="model-view">
-    <glossterm>model-view widget</glossterm>
-    <glossdef>
-      <para>
-        These widgets follow the well-known model-view pattern, which separates
-        the data (the model) to be displayed from the component which does the 
-        actual visualization (the view). Examples of this pattern in GTK+ are 
-        the <link linkend="GtkTreeView">GtkTreeView</link>/<link linkend="GtkTreeModel">GtkTreeModel</link>
-        and 
-        <link linkend="GtkTextView">GtkTextView</link>/<link linkend="GtkTextBuffer">GtkTextBuffer</link>
-      </para>
-      <para>
-        One important advantage of this pattern is that it is possible to 
-        display the same model in multiple views; another one that the 
-        separation of the model allows a great deal of flexibility, as 
-        demonstrated by e.g. 
-        <link linkend="GtkTreeModelSort">GtkTreeModelSort</link> or 
-        <link linkend="GtkTreeModelFilter">GtkTreeModelFilter</link>.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="no-window">
-    <glossterm>no-window widget</glossterm>
-    <glossdef>
-      <para>
-	A widget that does not have a GdkWindow of its own on which to
-	draw its contents, but rather shares its <glossterm
-	linkend="parent">parent's</glossterm>.  Such a widget has the
-	<constant>GTK_NO_WINDOW</constant> <link
-	linkend="GtkWidgetFlags">flag</link> set, and can be tested
-	with the <link
-	linkend="gtk-widget-no-window:caps"><function>GTK_WIDGET_NO_WINDOW()</function></link>
-	macro.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="parent">
-    <glossterm>parent</glossterm>
-    <glossdef>
-      <para>
-	A <glossterm linkend="widget">widget's</glossterm> parent is
-	the <glossterm linkend="container">container</glossterm>
-	inside which it resides.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="realization">
-    <glossterm>realization</glossterm>
-    <glossdef>
-      <para>
-	This is the step in a <glossterm
-	linkend="widget">widget's</glossterm> life cycle where it
-	creates its own GdkWindow, or otherwise associates itself with
-	its <glossterm linkend="parent">parent's</glossterm>
-	GdkWindow.  If the widget has its own window, then it must
-	also attach a <glossterm linkend="style">style</glossterm> to
-	it.  A widget becomes unrealized by destroying its associated
-	GdkWindow.  When a widget is realized, it must turn on its
-	<constant>GTK_REALIZED</constant> <link
-	linkend="GtkWidgetFlags">flag</link>.
-      </para>
-
-      <para>
-	Widgets that don't own the GdkWindow on which they draw are
-	called <glossterm linkend="no-window">no-window
-	widgets</glossterm>.  This can be tested with the <link
-	linkend="gtk-widget-no-window:caps"><function>GTK_WIDGET_NO_WINDOW()</function></link>
-	macro.  Normally, these widgets draw on their parent's
-	GdkWindow.
-      </para>
-
-      <para>
-	Note that when a widget creates a window in its <link
-	linkend="gtkwidget-realize"><methodname>::realize()</methodname></link>
-	handler, it does not actually show the window.  That is, the
-	window's structure is just created in memory.  The widget
-	actually shows the window when it gets <glossterm
-	linkend="mapping">mapped</glossterm>.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="requisition">
-    <glossterm>requisition</glossterm>
-    <glossdef>
-      <para>
-	The size requisition of a <glossterm
-	linkend="widget">widget</glossterm> is the minimum amount of
-	space it requests from its <glossterm
-	linkend="parent">parent</glossterm>.  Once the parent computes
-	the widget's final size, it gives it its <glossterm
-	linkend="allocation">size allocation</glossterm>.
-      </para>
-      <glossseealso>
-	<glossterm linkend="allocation">allocation</glossterm>
-      </glossseealso>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="screen">
-    <glossterm>screen</glossterm>
-    <glossdef>
-      <para>
-	GDK inherited the concept of screen from the X window system, 
-        which considers a screen to be a rectangular area, on which 
-        applications may place their windows. Screens under X may have 
-        quite dissimilar <glossterm linkend="visual">visuals</glossterm>.
-        Each screen can stretch across multiple physical monitors.
-      </para>
-      <para>
-        In GDK, screens are represented by 
-        <link linkend="GdkScreen">GdkScreen</link> objects.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="style">
-    <glossterm>style</glossterm>
-    <glossdef>
-      <para>
-        A style encapsulates what GTK+ needs to know in order to draw
-        a widget. Styles can be modified with 
-        <link linkend="gtk-Resource-Files">resource files</link>.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="toplevel">
-    <glossterm>toplevel</glossterm>
-    <glossdef>
-      <para>
-	A <glossterm linkend="widget">widget</glossterm> that does not
-	require a <glossterm linkend="parent">parent</glossterm>
-	container.  The only toplevel widgets in GTK+ are <link
-	linkend="GtkWindow">GtkWindow</link> and widgets derived from it.
-      </para>
-      <glossseealso>
-	<glossterm linkend="container">container</glossterm>
-      </glossseealso>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="unmap">
-    <glossterm>unmap</glossterm>
-    <glosssee><glossterm linkend="mapping">mapping</glossterm></glosssee>
-  </glossentry>
-
-  <glossentry id="unrealize">
-    <glossterm>unrealize</glossterm>
-    <glosssee><glossterm linkend="realization">realization</glossterm></glosssee>
-  </glossentry>
-
-  <glossentry id="view-column">
-    <glossterm>view column</glossterm>
-    <glossdef>
-      <para>
-        A displayed column in a tree view, represented by a
-        <link linkend="GtkTreeViewColumn">GtkTreeViewColumn</link> object.
-      </para>
-      <glossseealso>
-	<glossterm linkend="model-column">model column</glossterm>
-      </glossseealso>
-    </glossdef>
-  </glossentry>
- 
-  <glossentry id="visual">
-    <glossterm>visual</glossterm>
-    <glossdef>
-      <para>
-        A visual describes how color information is stored in pixels.
-        A <glossterm linkend="screen">screen</glossterm> may support
-        multiple visuals. On modern hardware, the most common visuals
-        are truecolor visuals, which store a fixed number of bits 
-        (typically 8) for the red, green and blue components of a color.
-      </para>
-      <para>
-        On ancient hardware, one may still meet indexed visuals, which 
-        store color information as an index into a color map, or even
-        monochrome visuals. 
-      </para>
-    </glossdef>
-  </glossentry>
- 
-  <glossentry id="widget">
-    <glossterm>widget</glossterm>
-    <glossdef>
-      <para>
-	A control in a graphical user interface.  Widgets can draw
-	themselves and process events from the mouse and keyboard.
-	Widget types include buttons, menus, text entry lines, and
-	lists.  Widgets can be arranged into <glossterm
-	linkend="container">containers</glossterm>, and these take
-	care of assigning the <glossterm
-	linkend="geometry">geometry</glossterm> of the widgets:  every
-	widget thus has a parent except those widgets which are
-	<glossterm linkend="toplevel">toplevels</glossterm>.  The base
-	class for widgets is <link
-	linkend="GtkWidget">GtkWidget</link>.
-      </para>
-      <glossseealso>
-	<glossterm linkend="container">container</glossterm>
-      </glossseealso>
-    </glossdef>
-  </glossentry>
-</glossary>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "glossary")
-End:
-->
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY GtkAboutDialog SYSTEM "xml/gtkaboutdialog.xml">
 <!ENTITY GtkAccelLabel SYSTEM "xml/gtkaccellabel.xml">
 <!ENTITY GtkAction SYSTEM "xml/gtkaction.xml">
 <!ENTITY GtkActionGroup SYSTEM "xml/gtkactiongroup.xml">
@@ -35,7 +34,6 @@
 <!ENTITY GtkEventBox SYSTEM "xml/gtkeventbox.xml">
 <!ENTITY GtkExpander SYSTEM "xml/gtkexpander.xml">
 <!ENTITY GtkFileChooser SYSTEM "xml/gtkfilechooser.xml">
-<!ENTITY GtkFileChooserButton SYSTEM "xml/gtkfilechooserbutton.xml">
 <!ENTITY GtkFileChooserDialog SYSTEM "xml/gtkfilechooserdialog.xml">
 <!ENTITY GtkFileChooserWidget SYSTEM "xml/gtkfilechooserwidget.xml">
 <!ENTITY GtkFileFilter SYSTEM "xml/gtkfilefilter.xml">
@@ -54,7 +52,6 @@
 <!ENTITY GtkHScale SYSTEM "xml/gtkhscale.xml">
 <!ENTITY GtkHScrollbar SYSTEM "xml/gtkhscrollbar.xml">
 <!ENTITY GtkHSeparator SYSTEM "xml/gtkhseparator.xml">
-<!ENTITY GtkIconView SYSTEM "xml/gtkiconview.xml">
 <!ENTITY GtkImage SYSTEM "xml/gtkimage.xml">
 <!ENTITY GtkImageMenuItem SYSTEM "xml/gtkimagemenuitem.xml">
 <!ENTITY GtkIMContext SYSTEM "xml/gtkimcontext.xml">
@@ -72,7 +69,6 @@
 <!ENTITY GtkMenuBar SYSTEM "xml/gtkmenubar.xml">
 <!ENTITY GtkMenuItem SYSTEM "xml/gtkmenuitem.xml">
 <!ENTITY GtkMenuShell SYSTEM "xml/gtkmenushell.xml">
-<!ENTITY GtkMenuToolButton SYSTEM "xml/gtkmenutoolbutton.xml">
 <!ENTITY GtkMessageDialog SYSTEM "xml/gtkmessagedialog.xml">
 <!ENTITY GtkMisc SYSTEM "xml/gtkmisc.xml">
 <!ENTITY GtkNotebook SYSTEM "xml/gtknotebook.xml">
@@ -128,15 +124,12 @@
 <!ENTITY GtkTreeViewColumn SYSTEM "xml/gtktreeviewcolumn.xml">
 <!ENTITY GtkTreeView SYSTEM "xml/gtktreeview.xml">
 <!ENTITY GtkUIManager SYSTEM "xml/gtkuimanager.xml">
-<!ENTITY GtkCellEditable SYSTEM "xml/gtkcelleditable.xml">
 <!ENTITY GtkCellLayout SYSTEM "xml/gtkcelllayout.xml">
 <!ENTITY GtkCellRenderer SYSTEM "xml/gtkcellrenderer.xml">
-<!ENTITY GtkCellRendererCombo SYSTEM "xml/gtkcellrenderercombo.xml">
+<!ENTITY GtkCellEditable SYSTEM "xml/gtkcelleditable.xml">
 <!ENTITY GtkCellRendererPixbuf SYSTEM "xml/gtkcellrendererpixbuf.xml">
-<!ENTITY GtkCellRendererProgress SYSTEM "xml/gtkcellrendererprogress.xml">
 <!ENTITY GtkCellRendererText SYSTEM "xml/gtkcellrenderertext.xml">
 <!ENTITY GtkCellRendererToggle SYSTEM "xml/gtkcellrenderertoggle.xml">
-<!ENTITY GtkCellView SYSTEM "xml/gtkcellview.xml">
 <!ENTITY GtkListStore SYSTEM "xml/gtkliststore.xml">
 <!ENTITY GtkTreeDND SYSTEM "xml/gtktreednd.xml">
 <!ENTITY GtkVButtonBox SYSTEM "xml/gtkvbbox.xml">
@@ -172,7 +165,6 @@
 <!ENTITY gtk-Settings SYSTEM "xml/gtksettings.xml">

 <!ENTITY index-Object-Tree SYSTEM "xml/tree_index.sgml">
-<!ENTITY visual-index SYSTEM "visual_index.xml">

 <!ENTITY index-Objects-Grouped SYSTEM "objects_grouped.sgml">
 <!ENTITY gtk-TextWidget SYSTEM "text_widget.sgml">
@@ -191,13 +183,8 @@
 <!ENTITY gtk-migrating-GtkFileChooser SYSTEM "migrating-GtkFileChooser.sgml">
 <!ENTITY gtk-migrating-GtkAction SYSTEM "migrating-GtkAction.sgml">
 <!ENTITY gtk-migrating-GtkComboBox SYSTEM "migrating-GtkComboBox.sgml">
-<!ENTITY gtk-migrating-GtkIconView SYSTEM "migrating-GtkIconView.sgml">
-<!ENTITY gtk-migrating-GtkAboutDialog SYSTEM "migrating-GtkAboutDialog.sgml">
-<!ENTITY gtk-migrating-GtkColorButton SYSTEM "migrating-GtkColorButton.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-glossary SYSTEM "glossary.xml">
 ]>
 <book id="index">
  <bookinfo>
@@ -332,11 +319,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
    &index-Object-Tree;
    </chapter>

-    <chapter>
-      <title>Widget Gallery</title>
-    &visual-index;
-    </chapter>
-
    <chapter id="WindowWidgets">
      <title>Windows</title>
        &GtkDialog;
@@ -344,7 +326,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
        &GtkMessageDialog;
        &GtkWindow;
        &GtkWindowGroup;
-        &GtkAboutDialog;
    </chapter>

    <chapter id="DisplayWidgets">
@@ -386,24 +367,20 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
    </chapter>

    <chapter id="TreeWidgetObjects">
-      <title>Tree, List and Icon Grid Widgets</title>
+      <title>Tree and List Widget</title>
        &gtk-TreeWidget;
        &GtkTreeModel;
        &GtkTreeSelection;
        &GtkTreeViewColumn;
        &GtkTreeView;
        &GtkTreeDND;
-        &GtkCellView;
-        &GtkIconView;
 	&GtkTreeSortable;
        &GtkTreeModelSort;
        &GtkTreeModelFilter;
        &GtkCellLayout;
        &GtkCellRenderer;
        &GtkCellEditable;
-        &GtkCellRendererCombo;
        &GtkCellRendererPixbuf;
-        &GtkCellRendererProgress;
        &GtkCellRendererText;
        &GtkCellRendererToggle;
        &GtkListStore;
@@ -427,7 +404,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
        &GtkToolItem;
        &GtkSeparatorToolItem;
        &GtkToolButton;
-	&GtkMenuToolButton;
        &GtkToggleToolButton;
        &GtkRadioToolButton;
    </chapter>
@@ -448,7 +424,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
        &GtkColorSelectionDialog;
        &GtkFileSelection;
 	&GtkFileChooser;
-	&GtkFileChooserButton;
 	&GtkFileChooserDialog;
 	&GtkFileChooserWidget;
 	&GtkFileFilter;
@@ -565,9 +540,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
      <para>
 	This part describes what you need to change in programs use
 	older versions of GTK+ so that they can use the new features.
-        It also mentions how to convert applications using widgets
-        found in the libgnomeui library to use their counterparts
-        in GTK+.
      </para>
    </partintro>

@@ -577,37 +549,16 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
    &gtk-migrating-GtkFileChooser;
    &gtk-migrating-GtkAction;
    &gtk-migrating-GtkComboBox;
-    &gtk-migrating-GtkIconView;
-    &gtk-migrating-GtkAboutDialog;
-    &gtk-migrating-GtkColorButton;
  </part>

  <part>
    <title>GTK+ Tools</title>

     &gtk-query-immodules;
-     &gtk-update-icon-cache;
  </part>

-  &gtk-glossary;
-
-  <index>
-    <title>Index</title>
-  </index>
-  <index role="deprecated">
-    <title>Index of deprecated symbols</title>
-  </index>
-  <index role="2.2">
-    <title>Index of new symbols in 2.2</title>
-  </index>
-  <index role="2.4">
-    <title>Index of new symbols in 2.4</title>
-  </index>  
-  <index role="2.6">
-    <title>Index of new symbols in 2.6</title>
-  </index>  
-  <index role="2.8">
-    <title>Index of new symbols in 2.8</title>
-  </index>  
+  <index/>

 </book>
+
+
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -1,52 +1,6 @@

 <INCLUDE>gtk/gtk.h</INCLUDE>

-<SECTION>
-<FILE>gtkaboutdialog</FILE>
-<TITLE>GtkAboutDialog</TITLE>
-GtkAboutDialog
-gtk_about_dialog_new
-gtk_about_dialog_get_name
-gtk_about_dialog_set_name
-gtk_about_dialog_get_version
-gtk_about_dialog_set_version
-gtk_about_dialog_get_copyright
-gtk_about_dialog_set_copyright
-gtk_about_dialog_get_comments
-gtk_about_dialog_set_comments
-gtk_about_dialog_get_license
-gtk_about_dialog_set_license
-gtk_about_dialog_get_website
-gtk_about_dialog_set_website
-gtk_about_dialog_get_website_label
-gtk_about_dialog_set_website_label
-gtk_about_dialog_get_authors
-gtk_about_dialog_set_authors
-gtk_about_dialog_get_artists
-gtk_about_dialog_set_artists
-gtk_about_dialog_get_documenters
-gtk_about_dialog_set_documenters
-gtk_about_dialog_get_translator_credits
-gtk_about_dialog_set_translator_credits
-gtk_about_dialog_get_logo
-gtk_about_dialog_set_logo
-gtk_about_dialog_get_logo_icon_name
-gtk_about_dialog_set_logo_icon_name
-GtkAboutDialogActivateLinkFunc
-gtk_about_dialog_set_email_hook
-gtk_about_dialog_set_url_hook
-gtk_show_about_dialog
-<SUBSECTION Standard>
-GTK_ABOUT_DIALOG
-GTK_IS_ABOUT_DIALOG
-GTK_TYPE_ABOUT_DIALOG
-GTK_ABOUT_DIALOG_CLASS
-GTK_IS_ABOUT_DIALOG_CLASS
-GTK_ABOUT_DIALOG_GET_CLASS
-<SUBSECTION Private>
-gtk_about_dialog_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkaccelgroup</FILE>
 <TITLE>Keyboard Accelerators</TITLE>
@@ -72,7 +26,6 @@ GtkAccelKey
 gtk_accelerator_valid
 gtk_accelerator_parse
 gtk_accelerator_name
-gtk_accelerator_get_label
 gtk_accelerator_set_default_mod_mask
 gtk_accelerator_get_default_mod_mask

@@ -168,10 +121,8 @@ gtk_action_new
 gtk_action_get_name
 gtk_action_is_sensitive
 gtk_action_get_sensitive
-gtk_action_set_sensitive
 gtk_action_is_visible
 gtk_action_get_visible
-gtk_action_set_visible
 gtk_action_activate
 gtk_action_create_icon
 gtk_action_create_menu_item
@@ -183,7 +134,6 @@ gtk_action_connect_accelerator
 gtk_action_disconnect_accelerator
 gtk_action_block_activate_from
 gtk_action_unblock_activate_from
-gtk_action_get_accel_path
 gtk_action_set_accel_path
 gtk_action_set_accel_group
 <SUBSECTION Standard>
@@ -225,7 +175,6 @@ gtk_action_group_add_radio_actions
 gtk_action_group_add_radio_actions_full
 gtk_action_group_set_translate_func
 gtk_action_group_set_translation_domain
-gtk_action_group_translate_string
 <SUBSECTION Standard>
 GTK_TYPE_ACTION_GROUP
 GTK_ACTION_GROUP
@@ -722,11 +671,8 @@ gtk_combo_get_type
 GtkComboBox
 gtk_combo_box_new
 gtk_combo_box_new_with_model
-gtk_combo_box_get_wrap_width
 gtk_combo_box_set_wrap_width
-gtk_combo_box_get_row_span_column
 gtk_combo_box_set_row_span_column
-gtk_combo_box_get_column_span_column
 gtk_combo_box_set_column_span_column
 gtk_combo_box_get_active
 gtk_combo_box_set_active
@@ -739,16 +685,8 @@ gtk_combo_box_append_text
 gtk_combo_box_insert_text
 gtk_combo_box_prepend_text
 gtk_combo_box_remove_text
-gtk_combo_box_get_active_text
 gtk_combo_box_popup
 gtk_combo_box_popdown
-gtk_combo_box_get_popup_accessible
-gtk_combo_box_get_row_separator_func
-gtk_combo_box_set_row_separator_func
-gtk_combo_box_set_add_tearoffs
-gtk_combo_box_get_add_tearoffs
-gtk_combo_box_set_focus_on_click
-gtk_combo_box_get_focus_on_click
 <SUBSECTION Standard>
 GTK_TYPE_COMBO_BOX
 GTK_COMBO_BOX
@@ -971,11 +909,6 @@ gtk_dialog_get_has_separator
 gtk_dialog_set_default_response
 gtk_dialog_set_has_separator
 gtk_dialog_set_response_sensitive
-<SUBSECTION>
-gtk_alternative_dialog_button_order
-gtk_dialog_set_alternative_button_order
-gtk_dialog_set_alternative_button_order_from_array
-
 <SUBSECTION Standard>
 GTK_DIALOG
 GTK_IS_DIALOG
@@ -1077,8 +1010,6 @@ gtk_entry_set_alignment
 gtk_entry_get_alignment
 gtk_entry_get_layout
 gtk_entry_get_layout_offsets
-gtk_entry_layout_index_to_text_index
-gtk_entry_text_index_to_layout_index
 gtk_entry_get_max_length
 gtk_entry_get_visibility
 gtk_entry_set_completion
@@ -1107,16 +1038,10 @@ 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_insert_prefix
 gtk_entry_completion_insert_action_text
 gtk_entry_completion_insert_action_markup
 gtk_entry_completion_delete_action
 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_popup_completion
-gtk_entry_completion_get_popup_completion
 <SUBSECTION Standard>
 GTK_TYPE_ENTRY_COMPLETION
 GTK_ENTRY_COMPLETION
@@ -1193,8 +1118,6 @@ gtk_file_chooser_set_local_only
 gtk_file_chooser_get_local_only
 gtk_file_chooser_set_select_multiple
 gtk_file_chooser_get_select_multiple
-gtk_file_chooser_set_show_hidden
-gtk_file_chooser_get_show_hidden
 gtk_file_chooser_set_current_name
 gtk_file_chooser_get_filename
 gtk_file_chooser_set_filename
@@ -1239,6 +1162,7 @@ GTK_IS_FILE_CHOOSER
 GTK_TYPE_FILE_CHOOSER
 <SUBSECTION Private>
 gtk_file_chooser_get_type
+GtkFileChooserEmbed
 </SECTION>

 <SECTION>
@@ -1277,29 +1201,6 @@ gtk_file_chooser_widget_get_type
 GtkFileChooserWidgetPrivate
 </SECTION>

-<SECTION>
-<FILE>gtkfilechooserbutton</FILE>
-<TITLE>GtkFileChooserButton</TITLE>
-GtkFileChooserButton
-gtk_file_chooser_button_new
-gtk_file_chooser_button_new_with_backend
-gtk_file_chooser_button_new_with_dialog
-gtk_file_chooser_button_get_title
-gtk_file_chooser_button_set_title
-gtk_file_chooser_button_get_width_chars
-gtk_file_chooser_button_set_width_chars
-<SUBSECTION Standard>
-GTK_FILE_CHOOSER_BUTTON
-GTK_IS_FILE_CHOOSER_BUTTON
-GTK_TYPE_FILE_CHOOSER_BUTTON
-GTK_FILE_CHOOSER_BUTTON_CLASS
-GTK_IS_FILE_CHOOSER_BUTTON_CLASS
-GTK_FILE_CHOOSER_BUTTON_GET_CLASS
-<SUBSECTION Private>
-gtk_file_chooser_button_get_type
-GtkFileChooserButtonPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtkfilefilter</FILE>
 GtkFileFilter
@@ -1311,7 +1212,6 @@ gtk_file_filter_set_name
 gtk_file_filter_get_name
 gtk_file_filter_add_mime_type
 gtk_file_filter_add_pattern
-gtk_file_filter_add_pixbuf_formats
 gtk_file_filter_add_custom
 gtk_file_filter_get_needed
 gtk_file_filter_filter
@@ -1621,58 +1521,6 @@ GTK_HSEPARATOR_GET_CLASS
 gtk_hseparator_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkiconview</FILE>
-<TITLE>GtkIconView</TITLE>
-GtkIconView
-GtkIconViewPrivate
-GtkIconViewForeachFunc
-gtk_icon_view_new
-gtk_icon_view_new_with_model
-gtk_icon_view_set_model
-gtk_icon_view_get_model
-gtk_icon_view_set_text_column
-gtk_icon_view_get_text_column
-gtk_icon_view_set_markup_column
-gtk_icon_view_get_markup_column
-gtk_icon_view_set_pixbuf_column
-gtk_icon_view_get_pixbuf_column
-gtk_icon_view_get_path_at_pos
-gtk_icon_view_selected_foreach
-gtk_icon_view_set_selection_mode
-gtk_icon_view_get_selection_mode
-gtk_icon_view_set_orientation
-gtk_icon_view_get_orientation
-gtk_icon_view_set_columns
-gtk_icon_view_get_columns
-gtk_icon_view_set_item_width
-gtk_icon_view_get_item_width
-gtk_icon_view_set_spacing
-gtk_icon_view_get_spacing
-gtk_icon_view_set_row_spacing
-gtk_icon_view_get_row_spacing
-gtk_icon_view_set_column_spacing
-gtk_icon_view_get_column_spacing
-gtk_icon_view_set_margin
-gtk_icon_view_get_margin
-gtk_icon_view_select_path
-gtk_icon_view_unselect_path
-gtk_icon_view_path_is_selected
-gtk_icon_view_get_selected_items
-gtk_icon_view_select_all
-gtk_icon_view_unselect_all
-gtk_icon_view_item_activated
-<SUBSECTION Standard>
-GTK_ICON_VIEW_CLASS
-GTK_IS_ICON_VIEW
-GTK_IS_ICON_VIEW_CLASS
-GTK_ICON_VIEW_GET_CLASS
-GTK_TYPE_ICON_VIEW
-GTK_ICON_VIEW
-<SUBSECTION Private>
-gtk_icon_view_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkimage</FILE>
 <TITLE>GtkImage</TITLE>
@@ -1684,7 +1532,6 @@ gtk_image_get_pixbuf
 gtk_image_get_pixmap
 gtk_image_get_stock
 gtk_image_get_animation
-gtk_image_get_icon_name
 gtk_image_get_storage_type
 gtk_image_new_from_file
 gtk_image_new_from_icon_set
@@ -1693,7 +1540,6 @@ gtk_image_new_from_pixbuf
 gtk_image_new_from_pixmap
 gtk_image_new_from_stock
 gtk_image_new_from_animation
-gtk_image_new_from_icon_name
 gtk_image_set_from_file
 gtk_image_set_from_icon_set
 gtk_image_set_from_image
@@ -1701,12 +1547,9 @@ gtk_image_set_from_pixbuf
 gtk_image_set_from_pixmap
 gtk_image_set_from_stock
 gtk_image_set_from_animation
-gtk_image_set_from_icon_name
 gtk_image_new
 gtk_image_set
 gtk_image_get
-gtk_image_set_pixel_size
-gtk_image_get_pixel_size
 <SUBSECTION Standard>
 GTK_IMAGE
 GTK_IS_IMAGE
@@ -1722,7 +1565,6 @@ GtkImagePixbufData
 GtkImagePixmapData
 GtkImageStockData
 GtkImageAnimationData
-GtkImageIconNameData
 </SECTION>

 <SECTION>
@@ -1918,9 +1760,6 @@ gtk_label_set_markup
 gtk_label_set_markup_with_mnemonic
 gtk_label_set_pattern
 gtk_label_set_justify
-gtk_label_set_ellipsize
-gtk_label_set_width_chars
-gtk_label_set_max_width_chars
 gtk_label_get
 gtk_label_parse_uline
 gtk_label_set_line_wrap
@@ -1936,9 +1775,6 @@ gtk_label_set_selectable
 gtk_label_set_text_with_mnemonic
 gtk_label_get_attributes
 gtk_label_get_justify
-gtk_label_get_ellipsize
-gtk_label_get_width_chars
-gtk_label_get_max_width_chars
 gtk_label_get_label
 gtk_label_get_layout
 gtk_label_get_line_wrap
@@ -1946,13 +1782,9 @@ gtk_label_get_mnemonic_widget
 gtk_label_get_selection_bounds
 gtk_label_get_use_markup
 gtk_label_get_use_underline
-gtk_label_get_single_line_mode
-gtk_label_get_angle
 gtk_label_set_label
 gtk_label_set_use_markup
 gtk_label_set_use_underline
-gtk_label_set_single_line_mode
-gtk_label_set_angle
 <SUBSECTION Standard>
 GTK_LABEL
 GTK_IS_LABEL
@@ -2077,7 +1909,6 @@ gtk_menu_set_tearoff_state
 gtk_menu_attach_to_widget
 gtk_menu_detach
 gtk_menu_get_attach_widget
-gtk_menu_get_for_attach_widget
 GtkMenuPositionFunc
 GtkMenuDetachFunc
 gtk_menu_set_monitor
@@ -2210,8 +2041,6 @@ GtkButtonsType
 gtk_message_dialog_new
 gtk_message_dialog_new_with_markup
 gtk_message_dialog_set_markup
-gtk_message_dialog_format_secondary_text
-gtk_message_dialog_format_secondary_markup
 <SUBSECTION Standard>
 GTK_MESSAGE_DIALOG
 GTK_IS_MESSAGE_DIALOG
@@ -2507,13 +2336,11 @@ gtk_progress_bar_set_text
 gtk_progress_bar_set_fraction
 gtk_progress_bar_set_pulse_step
 gtk_progress_bar_set_orientation
-gtk_progress_bar_set_ellipsize
 GtkProgressBarOrientation
 gtk_progress_bar_get_text
 gtk_progress_bar_get_fraction
 gtk_progress_bar_get_pulse_step
 gtk_progress_bar_get_orientation
-gtk_progress_bar_get_ellipsize
 gtk_progress_bar_new_with_adjustment
 gtk_progress_bar_set_bar_style
 GtkProgressBarStyle
@@ -2986,7 +2813,6 @@ gtk_text_buffer_insert_with_tags
 gtk_text_buffer_insert_with_tags_by_name
 gtk_text_buffer_delete
 gtk_text_buffer_delete_interactive
-gtk_text_buffer_backspace
 gtk_text_buffer_set_text
 gtk_text_buffer_get_text
 gtk_text_buffer_get_slice
@@ -3230,7 +3056,6 @@ gtk_text_view_get_iter_location
 gtk_text_view_get_line_at_y
 gtk_text_view_get_line_yrange
 gtk_text_view_get_iter_at_location
-gtk_text_view_get_iter_at_position
 gtk_text_view_buffer_to_window_coords
 gtk_text_view_window_to_buffer_coords
 gtk_text_view_get_window
@@ -3453,7 +3278,6 @@ gtk_tool_item_get_relief_style
 gtk_tool_item_retrieve_proxy_menu_item
 gtk_tool_item_get_proxy_menu_item
 gtk_tool_item_set_proxy_menu_item
-gtk_tool_item_rebuild_menu

 <SUBSECTION Standard>
 GTK_TYPE_TOOL_ITEM
@@ -3519,30 +3343,6 @@ gtk_tool_button_get_type
 GtkToolButtonPrivate
 </SECTION>

-<SECTION>
-<FILE>gtkmenutoolbutton</FILE>
-<TITLE>GtkMenuToolButton</TITLE>
-GtkMenuToolButton
-gtk_menu_tool_button_new
-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
-
-<SUBSECTION Standard>
-GtkMenuToolButtonClass
-GTK_TYPE_MENU_TOOL_BUTTON
-GTK_MENU_TOOL_BUTTON
-GTK_MENU_TOOL_BUTTON_CLASS
-GTK_IS_MENU_TOOL_BUTTON
-GTK_IS_MENU_TOOL_BUTTON_CLASS
-GTK_MENU_TOOL_BUTTON_GET_CLASS
-
-<SUBSECTION Private>
-gtk_menu_tool_button_get_type
-GtkMenuToolButtonPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtkradiotoolbutton</FILE>
 <TITLE>GtkRadioToolButton</TITLE>
@@ -4064,17 +3864,8 @@ gtk_tree_view_get_search_column
 gtk_tree_view_set_search_column
 gtk_tree_view_get_search_equal_func
 gtk_tree_view_set_search_equal_func
-gtk_tree_view_get_fixed_height_mode
-gtk_tree_view_set_fixed_height_mode
-gtk_tree_view_get_hover_selection
-gtk_tree_view_set_hover_selection
-gtk_tree_view_get_hover_expand
-gtk_tree_view_set_hover_expand
 GtkTreeDestroyCountFunc
 gtk_tree_view_set_destroy_count_func
-GtkTreeViewRowSeparatorFunc
-gtk_tree_view_get_row_separator_func
-gtk_tree_view_set_row_separator_func
 <SUBSECTION Standard>
 GtkTreeSelectionClass
 GTK_TREE_VIEW
@@ -4087,35 +3878,6 @@ GTK_TREE_VIEW_GET_CLASS
 gtk_tree_view_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkcellview</FILE>
-<TITLE>GtkCellView</TITLE>
-GtkCellView
-gtk_cell_view_new
-gtk_cell_view_new_with_text
-gtk_cell_view_new_with_markup
-gtk_cell_view_new_with_pixbuf
-gtk_cell_view_set_value
-gtk_cell_view_set_values
-gtk_cell_view_set_model
-gtk_cell_view_set_displayed_row
-gtk_cell_view_get_displayed_row
-gtk_cell_view_get_size_of_row
-gtk_cell_view_set_background_color
-gtk_cell_view_get_cell_renderers
-<SUBSECTION Standard>
-GtkCellViewClass
-GTK_TYPE_CELL_VIEW
-GTK_CELL_VIEW
-GTK_CELL_VIEW_CLASS
-GTK_IS_CELL_VIEW
-GTK_IS_CELL_VIEW_CLASS
-GTK_CELL_VIEW_GET_CLASS
-<SUBSECTION Private>
-GtkCellViewPrivate
-gtk_cell_view_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkcelllayout</FILE>
 <TITLE>GtkCellLayout</TITLE>
@@ -4150,7 +3912,6 @@ gtk_cell_renderer_render
 gtk_cell_renderer_activate
 gtk_cell_renderer_start_editing
 gtk_cell_renderer_editing_canceled
-gtk_cell_renderer_stop_editing
 gtk_cell_renderer_get_fixed_size
 gtk_cell_renderer_set_fixed_size

@@ -4183,22 +3944,6 @@ GTK_CELL_EDITABLE_GET_IFACE
 gtk_cell_editable_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkcellrenderercombo</FILE>
-<TITLE>GtkCellRendererCombo</TITLE>
-GtkCellRendererCombo
-gtk_cell_renderer_combo_new
-<SUBSECTION Standard>
-GTK_TYPE_CELL_RENDERER_COMBO
-GTK_CELL_RENDERER_COMBO
-GTK_CELL_RENDERER_COMBO_CLASS
-GTK_IS_CELL_RENDERER_COMBO
-GTK_IS_CELL_RENDERER_COMBO_CLASS
-GTK_CELL_RENDERER_COMBO_GET_CLASS
-<SUBSECTION Private>
-gtk_cell_renderer_combo_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkcellrendererpixbuf</FILE>
 <TITLE>GtkCellRendererPixbuf</TITLE>
@@ -4252,23 +3997,6 @@ GTK_CELL_RENDERER_TOGGLE_GET_CLASS
 gtk_cell_renderer_toggle_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkcellrendererprogress</FILE>
-<TITLE>GtkCellRendererProgress</TITLE>
-GtkCellRendererProgress
-gtk_cell_renderer_progress_new
-<SUBSECTION Standard>
-GTK_CELL_RENDERER_PROGRESS
-GTK_IS_CELL_RENDERER_PROGRESS
-GTK_TYPE_CELL_RENDERER_PROGRESS
-GTK_CELL_RENDERER_PROGRESS_CLASS
-GTK_IS_CELL_RENDERER_PROGRESS_CLASS
-GTK_CELL_RENDERER_PROGRESS_GET_CLASS
-<SUBSECTION Private>
-gtk_cell_renderer_progress_get_type
-GtkCellRendererProgressPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtkliststore</FILE>
 <TITLE>GtkListStore</TITLE>
@@ -4283,8 +4011,6 @@ gtk_list_store_remove
 gtk_list_store_insert
 gtk_list_store_insert_before
 gtk_list_store_insert_after
-gtk_list_store_insert_with_values
-gtk_list_store_insert_with_valuesv
 gtk_list_store_prepend
 gtk_list_store_append
 gtk_list_store_clear
@@ -4693,7 +4419,6 @@ gtk_window_set_type_hint
 gtk_window_set_skip_taskbar_hint
 gtk_window_set_skip_pager_hint
 gtk_window_set_accept_focus
-gtk_window_set_focus_on_map
 gtk_window_get_decorated
 gtk_window_get_default_icon_list
 gtk_window_get_default_size
@@ -4702,7 +4427,6 @@ gtk_window_get_frame_dimensions
 gtk_window_get_has_frame
 gtk_window_get_icon
 gtk_window_get_icon_list
-gtk_window_get_icon_name
 gtk_window_get_mnemonic_modifier
 gtk_window_get_modal
 gtk_window_get_position
@@ -4714,7 +4438,6 @@ gtk_window_get_type_hint
 gtk_window_get_skip_taskbar_hint
 gtk_window_get_skip_pager_hint
 gtk_window_get_accept_focus
-gtk_window_get_focus_on_map
 gtk_window_move
 gtk_window_parse_geometry
 gtk_window_reshow_with_initial_size
@@ -4722,11 +4445,9 @@ gtk_window_resize
 gtk_window_set_default_icon_list
 gtk_window_set_default_icon
 gtk_window_set_default_icon_from_file
-gtk_window_set_default_icon_name
 gtk_window_set_icon
 gtk_window_set_icon_list
 gtk_window_set_icon_from_file
-gtk_window_set_icon_name
 gtk_window_set_auto_startup_notification
 <SUBSECTION Standard>
 GTK_WINDOW
@@ -4775,11 +4496,8 @@ gtk_window_group_get_type
 gtk_set_locale
 gtk_disable_setlocale
 gtk_get_default_language
-gtk_parse_args
 gtk_init
 gtk_init_check
-gtk_init_with_args
-gtk_get_option_group
 gtk_exit
 gtk_events_pending
 gtk_main
@@ -5035,9 +4753,6 @@ gtk_target_list_ref
 gtk_target_list_unref
 gtk_target_list_add
 gtk_target_list_add_table
-gtk_target_list_add_text_targets
-gtk_target_list_add_image_targets
-gtk_target_list_add_uri_targets
 gtk_target_list_remove
 gtk_target_list_find
 gtk_selection_owner_set
@@ -5049,12 +4764,7 @@ gtk_selection_convert
 gtk_selection_data_set
 gtk_selection_data_set_text
 gtk_selection_data_get_text
-gtk_selection_data_set_pixbuf
-gtk_selection_data_get_pixbuf
-gtk_selection_data_set_uris
-gtk_selection_data_get_uris
 gtk_selection_data_get_targets
-gtk_selection_data_targets_include_image
 gtk_selection_data_targets_include_text
 gtk_selection_remove_all
 gtk_selection_clear
@@ -5084,20 +4794,13 @@ gtk_clipboard_set_with_owner
 gtk_clipboard_get_owner
 gtk_clipboard_clear
 gtk_clipboard_set_text
-gtk_clipboard_set_image
 gtk_clipboard_request_contents
 gtk_clipboard_request_text
-gtk_clipboard_request_image
 gtk_clipboard_request_targets
 gtk_clipboard_wait_for_contents
 gtk_clipboard_wait_for_text
-gtk_clipboard_wait_for_image
 gtk_clipboard_wait_is_text_available
-gtk_clipboard_wait_is_image_available
 gtk_clipboard_wait_for_targets
-gtk_clipboard_wait_is_target_available
-gtk_clipboard_set_can_store
-gtk_clipboard_store
 <SUBSECTION Standard>
 GTK_CLIPBOARD
 GTK_TYPE_CLIPBOARD
@@ -5118,9 +4821,6 @@ gtk_drag_dest_unset
 gtk_drag_dest_find_target
 gtk_drag_dest_get_target_list
 gtk_drag_dest_set_target_list
-gtk_drag_dest_add_text_targets
-gtk_drag_dest_add_image_targets
-gtk_drag_dest_add_uri_targets
 gtk_drag_finish
 gtk_drag_get_data
 gtk_drag_get_source_widget
@@ -5142,9 +4842,6 @@ gtk_drag_source_set_icon_stock
 gtk_drag_source_unset
 gtk_drag_source_set_target_list
 gtk_drag_source_get_target_list
-gtk_drag_source_add_text_targets
-gtk_drag_source_add_image_targets
-gtk_drag_source_add_uri_targets
 </SECTION>


@@ -5363,9 +5060,7 @@ gtk_stock_item_copy
 gtk_stock_item_free
 gtk_stock_list_ids
 gtk_stock_lookup
-gtk_stock_set_translate_func
 <SUBSECTION Stock IDs>
-GTK_STOCK_ABOUT
 GTK_STOCK_ADD
 GTK_STOCK_APPLY
 GTK_STOCK_BOLD
@@ -5375,7 +5070,6 @@ GTK_STOCK_CLEAR
 GTK_STOCK_CLOSE
 GTK_STOCK_COLOR_PICKER
 GTK_STOCK_CONVERT
-GTK_STOCK_CONNECT
 GTK_STOCK_COPY
 GTK_STOCK_CUT
 GTK_STOCK_DELETE
@@ -5384,13 +5078,9 @@ GTK_STOCK_DIALOG_ERROR
 GTK_STOCK_DIALOG_INFO
 GTK_STOCK_DIALOG_QUESTION
 GTK_STOCK_DIALOG_WARNING
-GTK_STOCK_DIRECTORY
-GTK_STOCK_DISCONNECT
 GTK_STOCK_DND
 GTK_STOCK_DND_MULTIPLE
-GTK_STOCK_EDIT
 GTK_STOCK_EXECUTE
-GTK_STOCK_FILE
 GTK_STOCK_FIND
 GTK_STOCK_FIND_AND_REPLACE
 GTK_STOCK_FLOPPY
@@ -5413,14 +5103,6 @@ GTK_STOCK_JUSTIFY_CENTER
 GTK_STOCK_JUSTIFY_FILL
 GTK_STOCK_JUSTIFY_LEFT
 GTK_STOCK_JUSTIFY_RIGHT
-GTK_STOCK_MEDIA_FORWARD
-GTK_STOCK_MEDIA_NEXT
-GTK_STOCK_MEDIA_PAUSE
-GTK_STOCK_MEDIA_PLAY
-GTK_STOCK_MEDIA_PREVIOUS
-GTK_STOCK_MEDIA_RECORD
-GTK_STOCK_MEDIA_REWIND
-GTK_STOCK_MEDIA_STOP
 GTK_STOCK_MISSING_IMAGE
 GTK_STOCK_NETWORK
 GTK_STOCK_NEW
@@ -5478,7 +5160,6 @@ gtk_icon_theme_has_icon
 gtk_icon_theme_lookup_icon
 gtk_icon_theme_load_icon
 gtk_icon_theme_list_icons
-gtk_icon_theme_get_icon_sizes
 gtk_icon_theme_get_example_icon_name
 gtk_icon_theme_rescan_if_needed
 gtk_icon_theme_add_builtin_icon
@@ -5571,3 +5252,4 @@ gtk_icon_factory_get_type
 gtk_icon_set_get_type
 gtk_icon_source_get_type
 </SECTION>
+
--- a/docs/reference/gtk/gtk-update-icon-cache.1
+++ b/docs/reference/gtk/gtk-update-icon-cache.1
@@ -1,56 +0,0 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "GTK-UPDATE-ICON-CA" 1 "" "" ""
-.SH NAME
-gtk-update-icon-cache \- Icon theme caching utility
-.SH "SYNOPSIS"
-.ad l
-.hy 0
-.HP 22
-\fBgtk\-update\-icon\-cache\fR [\-\-force] [\-\-quiet] {iconpath}
-.ad
-.hy
-
-.SH "DESCRIPTION"
-
-.PP
- \fBgtk\-update\-icon\-cache\fR creates mmap()able cache files for icon themes\&.
-
-.PP
-If expects to be given the path to a icon theme directory, e\&.g\&. \fI/usr/share/icons/hicolor\fR, and writes a \fIicon\-theme\&.cache\fR containing cached information about the icons in the directory tree below the given directory\&.
-
-.PP
-GTK+ can use the cache files created by \fBgtk\-update\-icon\-cache\fR to avoid a lot of system call and disk seek overhead when the application starts\&. Since the format of the cache files allows them to be mmap()ed shared between multiple applications, the overall memory consumption is reduced as well\&.
-
-.SH "OPTIONS"
-
-.TP
-\-\-force, \-f
-Overwrite an existing cache file even if it appears to be uptodate\&.
-
-.TP
-\-\-quiet, \-q
-Turn off verbose output\&.
-
-.SH "BUGS"
-
-.PP
-None known yet\&.
-
--- a/docs/reference/gtk/gtk-update-icon-cache.xml
+++ b/docs/reference/gtk/gtk-update-icon-cache.xml
@@ -1,66 +0,0 @@
-<refentry id="gtk-update-icon-cache">
-
-<refmeta>
-<refentrytitle>gtk-update-icon-cache</refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>gtk-update-icon-cache</refname>
-<refpurpose>Icon theme caching utility</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk-update-icon-cache</command>
-<arg choice="opt">--force</arg>
-<arg choice="opt">--quiet</arg>
-<arg choice="req">iconpath</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gtk-update-icon-cache</command> creates mmap()able cache files for
-icon themes. 
-</para>
-<para>
-If expects to be given the path to a icon theme directory, e.g. 
-<filename>/usr/share/icons/hicolor</filename>, and writes a 
-<filename>icon-theme.cache</filename> containing cached information
-about the icons in the directory tree below the given directory.
-</para>
-<para>
-GTK+ can use the cache files created by <command>gtk-update-icon-cache</command>
-to avoid a lot of system call and disk seek overhead when the application starts.
-Since the format of the cache files allows them to be mmap()ed shared between
-multiple applications, the overall memory consumption is reduced as well.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-<variablelist>
-  <varlistentry>
-    <term>--force</term>
-    <term>-f</term>
-    <listitem><para>Overwrite an existing cache file even if it appears to be uptodate.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>--quiet</term>
-    <term>-q</term>
-    <listitem><para>Turn off verbose output. 
-    </para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1><title>Bugs</title>
-<para>
-None known yet.
-</para>
-</refsect1>
-
-</refentry>
-
-
--- a/docs/reference/gtk/gtk.types
+++ b/docs/reference/gtk/gtk.types
@@ -1,9 +1,8 @@
 #include <gtk/gtk.h>

-gtk_about_dialog_get_type
 gtk_accel_group_get_type
-gtk_accel_label_get_type
 gtk_accel_map_get_type
+gtk_accel_label_get_type
 gtk_accessible_get_type
 gtk_action_get_type
 gtk_action_group_get_type
@@ -16,37 +15,31 @@ gtk_box_get_type
 gtk_button_box_get_type
 gtk_button_get_type
 gtk_calendar_get_type
-gtk_cell_editable_get_type
 gtk_cell_layout_get_type
-gtk_cell_renderer_combo_get_type
 gtk_cell_renderer_get_type
 gtk_cell_renderer_pixbuf_get_type
-gtk_cell_renderer_progress_get_type
 gtk_cell_renderer_text_get_type
 gtk_cell_renderer_toggle_get_type
-gtk_cell_view_get_type
 gtk_check_button_get_type
 gtk_check_menu_item_get_type
 gtk_clist_get_type
 gtk_color_button_get_type
 gtk_color_selection_dialog_get_type
 gtk_color_selection_get_type
-gtk_combo_box_entry_get_type
 gtk_combo_box_get_type
+gtk_combo_box_entry_get_type
 gtk_combo_get_type
 gtk_container_get_type
 gtk_ctree_get_type
 gtk_curve_get_type
 gtk_dialog_get_type
 gtk_drawing_area_get_type
-gtk_editable_get_type
 gtk_entry_completion_get_type
 gtk_entry_get_type
 gtk_event_box_get_type
 gtk_expander_get_type
-gtk_file_chooser_button_get_type
-gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type
+gtk_file_chooser_dialog_get_type
 gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
 gtk_file_selection_get_type
@@ -66,12 +59,11 @@ gtk_hscrollbar_get_type
 gtk_hseparator_get_type
 gtk_icon_factory_get_type
 gtk_icon_theme_get_type
-gtk_icon_view_get_type
-gtk_image_get_type
-gtk_image_menu_item_get_type
 gtk_im_context_get_type
 gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
+gtk_image_get_type
+gtk_image_menu_item_get_type
 gtk_input_dialog_get_type
 gtk_invisible_get_type
 gtk_item_factory_get_type
@@ -85,7 +77,6 @@ gtk_menu_bar_get_type
 gtk_menu_get_type
 gtk_menu_item_get_type
 gtk_menu_shell_get_type
-gtk_menu_tool_button_get_type
 gtk_message_dialog_get_type
 gtk_misc_get_type
 gtk_notebook_get_type
@@ -122,7 +113,6 @@ gtk_tearoff_menu_item_get_type
 gtk_text_buffer_get_type
 gtk_text_child_anchor_get_type
 gtk_text_get_type
-gtk_text_iter_get_type
 gtk_text_mark_get_type
 gtk_text_tag_get_type
 gtk_text_tag_table_get_type
@@ -132,18 +122,14 @@ gtk_toggle_action_get_type
 gtk_toggle_button_get_type
 gtk_toggle_tool_button_get_type
 gtk_toolbar_get_type
+gtk_tooltips_get_type
 gtk_tool_button_get_type
 gtk_tool_item_get_type
-gtk_tooltips_get_type
-gtk_tree_drag_dest_get_type
-gtk_tree_drag_source_get_type
 gtk_tree_get_type
 gtk_tree_item_get_type
 gtk_tree_model_filter_get_type
-gtk_tree_model_get_type
 gtk_tree_model_sort_get_type
 gtk_tree_selection_get_type
-gtk_tree_sortable_get_type
 gtk_tree_store_get_type
 gtk_tree_view_column_get_type
 gtk_tree_view_get_type
@@ -159,3 +145,9 @@ gtk_vseparator_get_type
 gtk_widget_get_type
 gtk_window_get_type
 gtk_window_group_get_type
+gtk_editable_get_type
+gtk_cell_editable_get_type
+gtk_tree_model_get_type
+gtk_tree_sortable_get_type
+gtk_tree_drag_source_get_type
+gtk_tree_drag_dest_get_type
--- a/docs/reference/gtk/images/README
+++ b/docs/reference/gtk/images/README
@@ -1,6 +0,0 @@
-This directory contains a collection of images of various widgets.  They
-are created via the shooter command in gtk+/docs/tools/, and are
-updated semi-regularly.  The images are used in both the headers of
-individual widgets as well as the visual index of widgets.
-
-
--- a/docs/reference/gtk/images/accel-label.png
+++ b/docs/reference/gtk/images/accel-label.png
--- a/docs/reference/gtk/images/button.png
+++ b/docs/reference/gtk/images/button.png
--- a/docs/reference/gtk/images/check-button.png
+++ b/docs/reference/gtk/images/check-button.png
--- a/docs/reference/gtk/images/color-button.png
+++ b/docs/reference/gtk/images/color-button.png
--- a/docs/reference/gtk/images/colorsel.png
+++ b/docs/reference/gtk/images/colorsel.png
--- a/docs/reference/gtk/images/combo-box-entry.png
+++ b/docs/reference/gtk/images/combo-box-entry.png
--- a/docs/reference/gtk/images/combo-box.png
+++ b/docs/reference/gtk/images/combo-box.png
--- a/docs/reference/gtk/images/entry.png
+++ b/docs/reference/gtk/images/entry.png
--- a/docs/reference/gtk/images/file-button.png
+++ b/docs/reference/gtk/images/file-button.png
--- a/docs/reference/gtk/images/filechooser.png
+++ b/docs/reference/gtk/images/filechooser.png
--- a/Show More
+++ b/Show More