remove the caching code, (gtk_file_info_get_icon_name): new function,

2006-04-30 Kristian Rietveld <kris@imendio.com> * gtk/gtkfilesystem.[ch] (gtk_file_info_render_icon): remove the caching code, (gtk_file_info_get_icon_name): new function, (gtk_file_system_volume_get_icon_name): new function, (gtk_file_system_volume_render_icon): refactor to use get_icon_name() and render the icon on the fly. * gtk/gtkfilesystemunix.c (gtk_file_system_unix_volume_render_icon), (gtk_file_system_unix_volume_get_icon_name): reflect updates in file system interface, (get_fallback_icon): remove, along with icon caching code. * gtk/gtk.symbols: updated.
don't leak the handle, (got_root_folder_cb), (get_children_get_folder_cb):
2006-04-30 19:38:11 +00:00 · 2006-04-30 15:29:10 +00:00 · 2006-04-30 13:49:20 +00:00 · 2006-04-23 18:00:44 +00:00 · 2006-04-23 15:24:12 +00:00 · 2006-04-23 14:39:11 +00:00
899 changed files with 184318 additions and 589958 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -19,17 +19,14 @@ stamp-h.in
 gtk+.spec
 gtk+-2.0.pc
 gtk+-2.0-uninstalled.pc
-gtk+-unix-print-2.0.pc
 gtk+-linux-fb-2.0.pc
 gtk+-nanox-2.0.pc
 gtk+-x11-2.0.pc
-gtk+-quartz-2.0.pc
 gdk-2.0.pc
 gdk-2.0-uninstalled.pc
 gdk-linux-fb-2.0.pc
 gdk-nanox-2.0.pc
 gdk-x11-2.0.pc
-gdk-quartz-2.0.pc
 gdk-pixbuf-2.0.pc
 gdk-pixbuf-2.0-uninstalled.pc
 gtk-zip.sh
--- a/20
+++ b/20
@@ -1,12 +1,12 @@
-Please do not mail any of the authors listed here 
-asking questions about this version of GTK+. 
-
 Original Authors
 ----------------
 Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>

+Please do not mail the original authors asking questions about this 
+version of GTK+.
+
 The GTK+ Team (in alphabetical order)
 -------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
@@ -32,7 +32,7 @@ There are many others who have contributed patches; we thank them,
 GTK+ is much better because of them.


-Over time, GTK+ has incorporated some pieces of software which 
+Over time, TK+ has incorporated some pieces of software which 
 started as independent projects. We list the original authors here:


@@ -51,15 +51,3 @@ IME input method
 ----------------
 Takuro Ashie
 Kazuki IWAMOTO
-
-
-Mac OS X backend
----------------
-Anders Carlsson
-
-
-DirectFB backend
----------------
-Denis Oliver Kropp
-Sven Neumann
-Mike Emmel
--- a/7104
+++ b/7104
--- a/ChangeLog.gtk-async-file-chooser
+++ b/ChangeLog.gtk-async-file-chooser
@@ -1,514 +0,0 @@
-2006-04-30  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.[ch] (gtk_file_info_render_icon): remove the
-	caching code,
-	(gtk_file_info_get_icon_name): new function,
-	(gtk_file_system_volume_get_icon_name): new function,
-	(gtk_file_system_volume_render_icon): refactor to use
-	get_icon_name() and render the icon on the fly.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_volume_render_icon),
-	(gtk_file_system_unix_volume_get_icon_name): reflect updates in
-	file system interface,
-	(get_fallback_icon): remove, along with icon caching code.
-
-	* gtk/gtk.symbols: updated.
-
-2006-04-30  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemmodel.c (got_root_folder_cb), (ref_path_cb),
-	(get_children_get_folder_cb): don't leak the handle,
-	(got_root_folder_cb), (get_children_get_folder_cb): emit
-	row-inserted for the newly added nodes.
-
-2006-04-30  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (file_list_drag_data_select_uris),
-	(file_list_drag_data_received_get_info_cb),
-	(file_list_drag_data_received_cb): refactor code for selecting
-	multiple uris into file_list_drag_data_select_uris().
-
-2006-04-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (dnd_select_folder_get_info_cb): don't
-	leak handle,
-	(change_icon_theme_get_info_cb), (set_info_get_info_cb),
-	(model_add_special_get_info_cb), (update_label_get_info_cb): ditto.
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons_get_info_cb):
-	don't leak the handle,
-	(get_file_info_finished), (edited_idle_create_folder_cb),
-	(file_list_drag_data_received_get_info_cb),
-	(show_and_select_paths_get_folder_cb),
-	(update_current_folder_get_info_cb), (add_shortcut_get_info_cb),
-	(confirmation_confirm_get_info_cb), (action_create_folder_cb),
-	(save_entry_get_info_cb), (shortcuts_activate_volume_mount_cb),
-	(shortcuts_activate_get_info_cb), (update_from_entry_get_info_cb):
-	ditto.
-
-	* gtk/gtkfilechooserentry.c (load_directory_get_folder_callback):
-	don't leak the handle.
-
-	* gtk/gtkpathbar.c (set_button_image_get_info_cb),
-	(gtk_path_bar_get_info_callback): don't leak the handle.
-
-2006-04-23  Kristian Rietveld  <kris@imendio.com>
-
-	Review.
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons_get_info_cb):
-	don't forget to unref data->impl at the end.
-
-2006-04-23  Kristian Rietveld  <kris@imendio.com>
-
-	Review, continued.
-
-	* gtk/gtkfilechooserdialog.c (response_cb): set response_requested
-	to FALSE after stopping emission of the response signal.
-
-2006-03-16  Kristian Rietveld  <kris@imendio.com>
-
-	More review work.
-
-	* gtk/gtkfilechooserprivate.h: remove idle_finished_loading_source
-	from GtkFileSystemModel.
-
-	* gtk/gtkfilesystemmodel.c (gtk_file_system_model_finalize): remove
-	idle_finished_loading_source,
-	(idle_finished_loading_cb), (queue_finished_loading): removed,
-	(got_root_folder_cb): save a list walk, immediately emit
-	finished-loading and don't queue it, since we are already in an
-	idle here, always list_children() so the children the folder already
-	has are returned, 
-	(_gtk_file_system_model_new): handle the case where NULL is
-	returned by _get_folder(),
-	(_gtk_file_system_model_path_do): remove comment, and append the
-	new handle to the list, don't try to remove,
-	(get_children_get_folder_cb): save a list walk, remove the dummy
-	child if the _get_folder() call fails or is cancelled.
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	More suggestions from Federico.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_create_folder):
-	remove check for filename_is_root(), since we never hit that code
-	and else mkdir will fail anyway,
-	(gtk_file_system_unix_create_folder): fixup parent folder refresh
-	code.
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c (read_hidden_file), (fill_in_hidden),
-	(get_is_hidden_for_file): factor out g_file_get_contents() code
-	in read_hidden_file().  (Federico Mena Quintero).
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	Icon name code suggestions by Federico Mena Quintero.
-
-	* gtk/gtkfilesystemunix.c: add GTK_FILE_INFO_ICON to
-	STAT_NEEDED_MASK,
-	(get_fallback_icon_name), (get_fallback_icon),
-	(get_icon_name_for_directory), (get_special_icon_name): get rid
-	of strdups,
-	(get_icon_type_from_path): add a statbuf argument and use the
-	statbuf when folder_unix is NULL,
-	(create_file_info): adapt to work with above changes.
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_info): path
-	is NULL is an error here (gtk_file_system_get_info() already guards
-	path = NULL),
-	(gtk_file_system_unix_get_info): move basename creation to just
-	before create_file_info().  (Federico Mena Quintero).
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c (struct _GtkFileFolderUnix): add
-	load_folder_id field,
-	(load_folder): add thread enter/leave construct, set load_folder_id
-	to zero since we have the idle removed when we return,
-	(gtk_file_system_unix_get_folder): initialize load_folder_id to 0
-	and store the source id of the load_folder idle,
-	(gtk_file_folder_unix_finalize): remove the load_folder idle
-	if necessary.  (Federico Mena Quintero).
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder): return
-	NULL if there is no current folder path.
-
-	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_map): we
-	reload the current folder if there is one, else we continue the
-	still pending load.
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	Couple of fixes from Markku Vire.
-
-	* gtk/gtkfilesystem.c (gtk_file_info_copy): also strdup icon_name
-	and display_key.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_create_folder):
-	initialize error to NULL,
-	(gtk_file_folder_unix_list_children): return an empty list for now if
-	we couldn't read the directory.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb),
-	(gtk_file_chooser_default_update_current_folder): set and unset
-	busy cursor while checking whether the given path is a folder.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.h: change the GtkFileInfo argument of the
-	GetInfoCallback to be const.
-
-	* gtk/gtkfilechooserbutton.c, gtk/gtkfilechooserdefault.c,
-	gtk/gtkpathbar.c: changes functions to reflect the above change.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c, gtk/gtkfilechooserprivate.h: keep track
-	of handles, cancel all pending operations on dispose.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserprivate.h (struct _GtkFileSystemModel): add
-	pending_handles field,
-	(struct _FileModelNode): add load_pending flag.
-
-	* gtk/gtkfilesystemmodel.c (gtk_file_system_model_dispose): introduce, 
-	cancel all pending operations here,
-	(got_root_folder_cb), (_gtk_file_system_model_new), (ref_path_cb),
-	(_gtk_file_system_model_path_do): keep track of all pending
-	operations, handle cancelled operations.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_finalize),
-	(gtk_file_chooser_button_destroy): move all handle cancellations
-	and object unrefs to destroy.
-
-	* gtk/gtkpathbar.c (gtk_path_bar_finalize), (gtk_path_bar_dispose):
-	likewise.
-
-	* gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_class_init): 
-	add dispose,
-	(gtk_file_chooser_entry_dispose): cancel handles and unrefs
-	objects here instead of finalize.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.c (get_cached_icon): check if "name" is an
-	absolute path, if so load the icon from that file.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): fix
-	the build.
-
-2005-12-21  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): remove
-	the FIXME since it doesn't make sense, when we return a cached
-	folder we won't emit finished-loading either,
-	(gtk_file_system_unix_create_folder): remove unused variable,
-	(gtk_file_folder_unix_list_children): remove unused code,
-	(get_is_hidden_for_file): new function,
-	(create_file_info): also handle getting is_hidden when called
-	without a folder unix (from _system_get_info() for example).
-
-2005-12-20  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (check_is_folder): fully removed!
-	woo!,
-	(check_save_entry): add is_folder argument,
-	(gtk_file_chooser_default_get_paths): update check_save_entry() call,
-	(get_display_name_for_folder): removed,
-	(confirmation_confirm_get_info_cb): new function which will
-	handle the confirmation dialog now we have all information for it,
-	(should_respond_after_confirm_overwrite): replace the call to
-	get_display_name_for_folder() with an asynchronous solution,
-	(action_create_folder_cb): request dialog response on successfull
-	folder creation,
-	(gtk_file_chooser_default_should_respond): update call to
-	check_save_entry(); replace the check is folder call for "path"
-	by just using the is_folder return value from check_save_entry();
-	replaced the check is folder call for "parent_path" with an
-	asynchronous setup, remainder of that work is now done in
-	save_entry_get_info_cb(),
-	(save_entry_get_info_cb): new function.
-
-	* gtk/gtkfilechoosermebed.[ch]: add response-requested signal.
-
-	* gtk/gtkfilechooserdialog.c, gtk/gtkfilechooserprivate.h: handle
-	response_requested signal.
-
-	* gtk/gtkfilechooserentry.[ch]
-	(_gtk_file_chooser_entry_get_is_folder): new function.
-
-2005-12-20  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (ref_path_cb): when called with
-	!folder, check if node is the node we are looking for (can be
-	triggered when we call ref_path_cb ourselves after a find_child_node),
-	(_gtk_file_system_model_path_do): introduce parent_node field;
-	after finding a child node in a loaded parent node, don't forget
-	to call ref_path_cb,
-	(get_children_get_folder_cb): don't forget to set data->node->folder
-	to the newly acquired folder.
-
-2005-12-20  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (show_and_select_paths_get_folder_cb):
-	handle case where the folder we get already finished loading.
-
-	* gtk/gtkfilesystemmodel.c (ref_path_cb),
-	(_gtk_file_system_model_path_do): make this work.
-
-2005-12-19  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_update_count): modify
-	in such a way that it can also negatively update the count on
-	failures,
-	(get_file_info_finished): handle failures, update save folder
-	combo box on success,
-	(shortcuts_insert_path): change the boolean return value into a
-	void one, also refilter the model and update the save folder combo
-	box for the non-asynchronous case,
-	(shortcuts_append_home), (shortcuts_append_desktop),
-	(shortcuts_add_volumes), (shortcuts_add_current_folder),
-	(add_shortcuts_get_info_cb): adapt to shortcuts_insert_path() updates.
-
-2005-12-19  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkpathbar.[ch]: add handle fields to ButtonData and
-	GtkPathBar; do correct handle bookkeeping.
-
-	* gtk/gtkfilesystemunix.c (load_folder),
-	(gtk_file_system_unix_get_folder),
-	(gtk_file_folder_unix_is_finished_loading): add is_finished_loading
-	field to GtkFileFolderUnix, which is set to true once we are
-	really finished with loading (previous assumption that we are
-	always finshed loading is not true anymore).
-
-	* gtk/gtkfilesystemmodel.c (got_root_folder_cb): if the folder is
-	finished loading, list the children and update the root level.
-
-	* gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):
-	handle cancellation.
-
-2005-12-16  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c: always call the callback, even when
-	cancelled; ref handles passed to the callback queue functions;
-	don't set cancelled to TRUE in _cancel_operation(), since operations
-	in this backend are always completed,
-	(get_special_icon_name): don't strdup the value of
-	get_icon_name_for_directory() again.
-
-	* gtk/gtkfilechooserbutton.c: adapt to new cancellation policy;
-	reference all objects which are passed as callback arguments; in the
-	callback check if the handles match.
-
-	* gtk/gtkfilechooserentry.c: likewise.
-
-	* gtk/gtkfilechooserdefault.c: likewise.  Also changed the shortcut
-	loading code to be more like the code in GtkFileChooserButton, where
-	we store all handles in the model and have model_row_free_data
-	cancel any pending operations,
-	(shortcuts_model_create): copy the error.
-
-	* gtk/gtkfilechooserprivate.h (struct _GtkFileChooserDefault): remove
-	loading_volumes and loading_bookmarks fields.
-
-	* gtk/gtkfilesystem.c (gtk_file_info_free): free icon_name here...
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (edited_idle_create_folder_cb): fix
-	thinko.
-
-	* gtk/gtkfilesystemunix.c (dispatch_create_folder_callback),
-	(queue_create_folder_callback): need to copy/free the path,
-	(gtk_file_system_unix_create_folder): put the "reget folder" hack
-	back in, though it's working different now.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_finalize),
-	(dnd_select_folder_get_info_cb), (gtk_file_chooser_drag_data_received),
-	(change_icon_theme_get_info_cb), (change_icon_theme),
-	(model_add_special_get_info_cb), (model_add_special),
-	(update_label_get_info_cb), (update_label_and_image): cancel existing
-	operations, if any; added apprioriate fields to
-	GtkFileChooserButtonPrivate.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_finalize): if
-	there's a folder loading, cancel the operation,
-	(load_directory_get_folder_callback): set the loading folder handle
-	to NULL,
-	(load_directory_callback): cancel any currently loading folders
-	before starting a new get folder operation.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): don't overwrite
-	data if it's already set (for example by the "is volume" case).
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (set_info_get_info_cb),
-	(set_info_for_path_at_iter): store a row reference in the temporary
-	data structure and not an iter,
-	(model_add_special), (model_update_current_folder),
-	(gtk_file_chooser_button_add_shorcut_folder): remove unused pixbuf
-	variable.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (get_file_info_finished),
-	(shortcuts_insert_path): replace gtk_file_system_render_icon() call
-	with gtk_file_system_get_file_info(),
-	(gtk_file_chooser_default_add_shortcut_folder),
-	(gtk_file_chooser_default_remove_shortcut_folder): handle shortcuts
-	which are still loading.
-
-	* gtk/gtkfilechooserprivate.h: add shortcuts_loading field to
-	struct _GtkFileChooserDefault.
-
-	* gtk/gtkfilechooserbutton.c (set_info_get_info_cb),
-	(set_info_for_path_at_iter), (model_free_row_data): keep handle
-	and path together; now supports adding/removing shortcuts
-	which are still loading.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.c: make the cancelled field an GObject property.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.h: make the GError argument in the callbacks
-	const.
-
-	* gtk/gtkfilechooserbutton.c: update callbacks,
-	* gtk/gtkfilechooserentry.c: likewise,
-	* gtk/gtkfilechooserdefault.c: likewise,
-	* gtk/gtkfilesystemmodel.c: likewise,
-	* gtk/gtkpathbar.c: likewise.
-
-	* gtk/gtkfilechooserdefault.c (edited_idle_create_folder_cb): copy
-	the error which will be passed to error_creating_folder_dialog(),
-	(action_create_folder_cb): likewise,
-	(file_list_drag_data_received_get_info_cb): add forgotten GError
-	declaration.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkpathbar.c (get_button_image), (set_button_image),
-	(set_button_image_get_info_cb),
-	(gtk_path_bar_update_button_appearance): update to new icon
-	rendering call.
-
-2005-12-09  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (file_list_drag_data_received),
-	(gtk_file_chooser_default_add_shortcut_folder),
-	(shortcuts_activate_get_info_cb): replace synchronous check_is_folder
-	calls with an async gtk_file_system_get_info() solution.
-
-2005-12-09  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.c (icon_cache_element_free), (icon_theme_changed),
-	(get_cached_icon), (gtk_file_info_render_icon): implement pixbuf
-	caching as found in the file system backends.
-
-2005-12-09  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtk.symbols: updated.
-
-	* gtk/gtkfilesystem.[ch] (struct GtkFileInfo): added icon_name field,
-	(enum GtkFileInfoType): added GTK_FILE_INFO_ICON,
-	(gtk_file_info_set_icon_name): new function,
-	(gtk_file_info_render_icon): new function,
-	(gtk_file_system_render_icon): removed.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_render_icon): removed,
-	(create_file_info): fill icon_name field if required,
-	(get_*_icon): modified to suit create_file_info() better.
-
-	* gtk/gtkfilechooserbutton.c: modified to use
-	gtk_file_info_render_icon() instead of gtk_file_system_render_icon().
-
-	* gtk/gtkfilechooserdefault.c: likewise.
-
-2005-12-06  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (get_file_info_finished),
-	(update_current_folder_get_info_cb): fix mem leaks.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_info): ditto.
-
-	* gtk/gtkpathbar.c (gtk_path_bar_set_path_finish): ditto.
-
-2005-12-06  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (dnd_select_folder_get_info_cb),
-	(gtk_file_chooser_button_drag_data_received): make asynchronous,
-	(update_label_and_image): remove unused variable.
-
-	* gtk/gtkfilechooserdefault.c
-	(gtk_file_chooser_default_update_current_folder): split in two
-	functions, so we can have the is_folder check back.
-	* gtk/gtkfilechooserprivate.h: add update_current_folder_handle
-	field.
-
-2005-12-06  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (show_and_select_paths): fixed a typo.
-
-2005-12-05  Federico Mena Quintero  <federico@ximian.com>
-
-	(merge from HEAD)
-
-	* gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &
-	modifiers", not "event->state && modifiers".  Patch by Sadrul
-	Habib Chowdhury <imadil@gmail.com>.  Fixes bug #323073.
-
-2005-12-06  Kristian Rietveld  <kris@imendio.com>
-
-	Beginnings of an asynchronous file chooser.
-
-	* gtk/gtkfilechooserbutton.c: display name and the is folder property
-	are now asynchronously set using set_info_for_at_path_iter(), the
-	is folder property is now also stored in the tree model.
-
-	* gtk/gtkfilechooserdefault.c: lots of changes to the shortcuts
-	model code to make it operate asynchronously, check_is_folder() has
-	been "disabled" for now, all other synchronous calls were
-	replaced with asychronous ones.
-
-	* gtk/gtkfilechooserentry.c: update call to 
-	gtk_file_system_get_folder().
-
-	* gtk/gtkfilechooserprivate.h: added two fields.
-
-	* gtk/gtkfilesystem.[ch]: for about 85% changed to the changes
-	outlined in the proposal discussed on gtk-devel-list.
-
-	* gtk/gtkfilesystemmodel.[ch]: updated all asynchronous calls,
-	_gtk_file_system_model_path_do() basically had to be rewritten
-	(and I still need to finish that).
-
-	* gtk/gtkfilesystemunix.c: changed to be compatible with the new
-	GtkFileSystem interface.
-
-	* gtk/gtkpathbar.c (button_clicked_cb): block/unblock the
-	button_clicked_cb callback around the call to
-	gtk_toggle_button_set_active(), avoids button_clicked_cb getting
-	called twice.
-	(_gtk_path_bar_set_path): refactored to be asynchronous.
--- a/ChangeLog.gtk-printing
+++ b/ChangeLog.gtk-printing
@@ -1,500 +0,0 @@
-2006-04-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* docs/tools/widgets.c (get_all_widgets): Add print dialog
-	and page setup dialog.
-
-2006-04-11  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkpapersize.c (gtk_paper_size_get_display_name):
-	Call gettext on the standard paper names. 
-
-2006-04-11  Alexander Larsson  <alexl@redhat.com>
-
-	* gdk/gdk.symbols:
-	* gdk/win32/gdkevents-win32.c:
-	* gdk/win32/gdkwin32.h:
-	Add gdk_win32_set_modal_dialog_libgtk_only that we
-	need for handling the mainloop in the print dialogs.
-
-	* gtk/gtkprintoperation-win32.c:
-	Pump the gtk+ mainloop when needed in the print dialogs.
-	This means gtk+ windows will redraw while the print dialogs
-	are up.
-
-2006-04-10  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintoperation-win32.c: 
-	Better size handling.
-	Save win32-specific settings in additions to the generic ones
-	if the generic one is lossy.
-
-2006-04-10  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintoperation-win32.c:
-	Finish implementing run_page_setup_dialog.
-
-	* gtk/gtkpagesetup.h:
-	* gtk/gtkpapersize.h:
-	* gtk/gtkprint-win32.h:
-	* gtk/gtkprintcontext.h:
-	* gtk/gtkprinter-private.h:
-	* gtk/gtkprintoperation-private.h:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintoperation.h:
-	* gtk/gtkprintsettings.h:
-	s/EGG/GTK/
-
-2006-04-09  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk+-unix-print-2.0.pc.in: Fix a typo  (#337698)
-
-2006-04-07  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/paper_names_offsets.c: 
-	* gtk/gen-paper-names.c: Correct the suffix/duplicate optimizations.
-
-2006-04-07  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintoperation-win32.c:
-	Initial work on gtk_print_run_page_setup_dialog.
-	Not reading margins yet.
-
-2006-04-07  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/Makefile.am:
-	Link to winspool
-	
-	* gtk/gtk.symbols:
-	* gtk/gtkprintoperation-private.h:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintoperation.[ch]: 
-	Add gtk_print_operation_get_status_string() and status
-	string to _gtk_print_operation_set_status.
-	Rename GTK_PRINT_STATUS_PROCESSING to GTK_PRINT_STATUS_PRINTING.
-	
-	* gtk/gtkprintoperation-win32.c:
-	Poll for status updates
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	Rename GTK_PRINT_STATUS_PROCESSING to GTK_PRINT_STATUS_PRINTING.
-	
-	* tests/print-editor.c:
-	Show print status string
-
-2006-04-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/paper_names_offsets.c: 
-	* gtk/gtkpapersize.c: Save 4K of .data by converting
-	the array of paper names to offsets. 
-
-	* gtk/gen-paper-names.c: Utility used to create
-	paper_names_offsets.c from paper_names.c.
-
-	* gtk/Makefile.am: Necessary glue.
-
-2006-04-06  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintoperation-win32.c: 
-	Use glib base64 code.
-	Set up manual_* vars fully.
-
-2006-04-06  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/Makefile.am:
-	Add -lcomdlg32 on win32
-	
-	* gtk/gtkprint-win32.h:
-	Move WINVER define to .c files
-	
-	* gtk/gtk.symbols:
-	* gtk/gtkprintoperation-win32.c:
-	Add empty gtk_print_run_page_setup win implementation
-	Move WINVER define to this file
-	
-	* modules/Makefile.am:
-	Only build print backends on unix
-
-2006-04-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkprintunixdialog.c:
-	* gtk/gtkprintoperation-unix.c: Use GTK_RESPONSE_CANCEL/OK
-	instead of GTK_RESPONSE_REJECT/ACCEPT, to make Esc close
-	the dialog, and to not use values which are documented
-	as reserved for apps.
-
-2006-04-05  Alexander Larsson  <alexl@redhat.com>
-
-	* modules/printbackends/lpr/gtkprintbackendlpr.c:
-	Don't hardcode lpr command, expose full commandline.
-
-2006-04-05  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	* gtk/gtkprintunixdialog.c:
-	Don't check for printer changes after dialog is dead.
-	
-	* gtk/gtkprintbackend.c: (gtk_print_backend_load_modules):
-	Strip whitespace from backend strings
-	
-	* gtk/gtkprintbackend.h:
-	Add private printer functions
-	
-	* gtk/gtkprinter-private.h:
-	Move GtkPrinterPrivate into gtkprinter.c
-	
-	* gtk/gtkprinter.[ch]:
-	Move GtkPrinterPrivate into gtkprinter.c
-	Add new construct properties.
-	Add setter functions.
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	* modules/printbackends/cups/gtkprintercups.[ch]:
-	Update to new APIs.
-	
-	* modules/printbackends/lpr/Makefile.am:
-	* modules/printbackends/lpr/gtkprintbackendlpr.c:
-	* modules/printbackends/lpr/gtkprinterlpr.[ch]
-	Update to new APIs.
-	Remove GtkPrinterLPR.
-	Read/Save command line option in settings
-	
-	* modules/printbackends/pdf/Makefile.am:
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	* modules/printbackends/pdf/gtkprinterpdf.[ch]:
-	Update to new APIs.
-	Remove GtkPrinterPDF.
-
-2006-04-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkprintoperation.h: Add missing standard
-	GObject macros.  (#337277, Yevgen Muntyan)
-
-2006-04-04  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprinteroption.[ch]:
-	Add gtk_printer_option_has_choice.
-	
-	* gtk/gtkprintunixdialog.c:
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	Add support for "print at time".
-
-2006-04-04  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpapersize.c:
-	Handle ppd names with ".Transverse" suffix
-	Don't force width < height
-	
-	* gtk/gtkprinteroption.c:
-	Make sure that value is never NULL.
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	Add some HP whitelist names
-	Remove spew from ignored options.
-
-2006-04-03  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	Fix warnings
-	
-	* gtk/gtkprinter-private.h:
-	* gtk/gtkprinter.[ch]:
-	Add gtk_printer_is_default.
-	
-	* gtk/gtkprintunixdialog.c:
-	Use gtk_printer_is_default.
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	Get default printer info
-	
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	Fix warning.
-
-2006-04-03  Alexander Larsson  <alexl@redhat.com>
-
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	* modules/printbackends/pdf/gtkprinterpdf.[ch]:
-	Correctly read/write/use the output filename setting.
-
-2006-04-03  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	Disable margin from printers if there are no printers.
-	
-	* gtk/gtkpapersize.c:
-	Fix build.
-
-2006-04-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk.symbols: protect unix-only symbols by 
-	G_OS_UNIX (#336819, Yevgen Muntyan)
-
-	* gtk/gtkpapersize.c: Win32 fixes.  (#336806, Yevgen Muntyan)
-
-2006-03-30  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtk.symbols:
-	Update
-	
-	* gtk/gtkprintbackend.[ch]:
-	Add dnotify to gtk_print_backend_print_stream
-	
-	* gtk/gtkprinter-private.h:
-	Declare gtk_print_job_set_status
-	
-	* gtk/gtkprinter.[ch]:
-	Remove gtk_printer_prepare_job.
-	
-	* gtk/gtkprintjob.[ch]:
-	Now you create print job directly with gtk_print_job_new() and
-	they'll be prepared automatically.
-	Add status_changed signal and get_status.
-	Add gtk_print_job_set_source_file to allow sending a file.
-	
-	* gtk/gtkprintoperation-private.h:
-	Add destroy notify for platform_data.
-	Declare _gtk_print_operation_set_status.
-	
-	* gtk/gtkprintoperation-unix.c:
-	Hook up status change handling.
-	Use the new way to get a print job.
-
-	* gtk/gtkprintoperation.[ch]:
-	Add status_changed signal and get_status/is_finished.
-
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	* modules/printbackends/lpr/gtkprintbackendlpr.c:
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	Update to use new APIs and set status on the job.
-	Cups polls for the status.
-	
-	* tests/print-editor.c:
-	Track the print operations in the status bar.
-
-2006-03-30  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/Makefile.am:
-	* gtk/gtkprintbackend.c:
-	Default to "pdf,cups" if we found cups, and
-	"pdf,lpr" otherwise.
-
-2006-03-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* modules/printbackends/Makefile.am: 
-	* configure.in: Don't build the cups backend 
-	if cups is not there.
-
-2006-03-29  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtk.symbols:
-	gtk_printer_prep_job -> gtk_printer_prepare_job
-	gtk_print_job_prep -> gtk_print_job_prepare
-	
-	* gtk/gtkprintbackend.h:
-	* gtk/gtkprinter-private.h:
-	* gtk/gtkprinter.[ch]:
-	Add print_job argument to printer_prepare_for_print
-	gtk_printer_prep_job -> gtk_printer_prepare_job
-	
-	* gtk/gtkprintjob.[ch]:
-	Add manual rendering settings to GtkPrintJob.
-	gtk_print_job_prep -> gtk_print_job_prepare
-	
-	* gtk/gtkprintoperation-private.h:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintoperation.c:
-	Get more manual_* settings working.
-	Run mainloop after each printed page.
-
-	* gtk/gtkprintunixdialog.c:
-	Save page ranges.
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	* modules/printbackends/lpr/gtkprintbackendlpr.c:
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	Now put the manual_* settings inside the PrintJob in
-	prepare_for_print.
-
-2006-03-29  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintunixdialog.c:
-	Make sure we remember the format-for printer.
-	Also, use it as the default if set.
-
-2006-03-28  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintunixdialog.c:
-	Remove unnecessary padding under list.
-	
-2006-03-28  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	* gtk/gtkprintunixdialog.c:
-	More HIGy layout.
-
-2006-03-28  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	HIG conformance of spacing and titles.
-	
-	* gtk/gtkprintunixdialog.c:
-	Use standard constructor form print button too.
-
-2006-03-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* modules/printbackends/*/Makefile.am: Fix 
-	a problem with builddir != srcdir builds.
-	(#335915, Yevgen Muntyan)
-
-2006-03-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkprintbackend.c: Simply the syntax
-	of the setting to "cups,pdf", and get rid
-	of the GScanner used to parse it.
-
-2006-03-27  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintunixdialog.c:
-	Reorder print list so status is at the end.
-	Ellipsize the status column.
-
-2006-03-27  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	Handle removed printers and status-changed.
-	Handle NULL printer location.
-
-2006-03-27  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/Makefile.am:
-	* gtk/stock-icons/24/gtk-orientation-landscape.png:
-	* gtk/stock-icons/24/gtk-orientation-portrait.png:
-	* gtk/stock-icons/24/gtk-orientation-reverse-landscape.png:
-	* gtk/gtkiconfactory.c: (get_default_icons):
-	* gtk/gtkstock.h:
-	Add orientation stock icons.
-	
-	* gtk/gtkpagesetupunixdialog.c:
-	Use the orientation icons.
-
-2006-03-27  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	* gtk/gtkprintjob.c:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintunixdialog.c:
-	s/impl/dialog/
-	Don't prefix static functions with _
-
-2006-03-26  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkprintunixdialog.c: Don't use _(""). (#335898,
-	Christian Persch)
-
-	* modules/printbackends/*: Don't use G_DEFINE_TYPE
-	in modules.
-
-	* gtk/gtkprintbackend.c: Remove an unused static function.
-
-2006-03-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk.symbols: Add printing symbols
-
-	* gtk/gtkpapersize.[hc]: 
-	* gtk/gtkpage*.[hc]: 
-	* gtk/gtkprint*.[hc]: Add aliasing, #include cleanups.
-
-	* gtk/gtkprintcontext.h:
-	* gtk/gtkprintoperation.h:
-	* gtk/gtkprintsettings.h: Make get_type function const.
-
-	* modules/printbackends/pdf/gtkprintbackendpdf.c: Remove
-	C99ism.
-
-	* modules/printbackends/cups/gtkcupsutils.c: Use unsigned
-	integers for bitfields.
-
-2006-03-24  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtknotebook.c: Fix docs
-
-	* gtk/Makefile.am (EXTRA_DIST): Add the stock icons here.
-
-	* gdk/directfb/Makefile.am (EXTRA_DIST): Remove ChangeLog,
-	to make make dist happier.
-
-2006-03-24  Alexander Larsson  <alexl@redhat.com>
-
-	* configure.in:
-	* gtk/gtkprintbackend.c:
-	* modules/printbackends/Makefile.am:
-	* modules/printbackends/cups/Makefile.am:
-	* modules/printbackends/lpr/Makefile.am:
-	* modules/printbackends/lpr/gtkprintbackendlpr.[ch]:
-	* modules/printbackends/lpr/gtkprinterlpr.[ch]:
-	* modules/printbackends/pdf/Makefile.am:
-	* modules/printbackends/pdf/gtkprintbackendpdf.[ch]:
-	* modules/printbackends/pdf/gtkprinterpdf.[ch]:
-	Import pdf and lpr backend
-
-2006-03-24  Alexander Larsson  <alexl@redhat.com>
-
-        Import print-operation into gtk+
-	
-	* .cvsignore:
-	* Makefile.am:
-	* gtk+-unix-print-2.0.pc.in:
-	Add gtk+-unix-print-2.0.pc
-	
-	* configure.in:
-	Look for cups
-	Look for various _NL_* extensions
-	Output new makefiles and .pc.in
-	
-	* gtk/Makefile.am:
-	Add new files
-	
-	* gtk/gtk.h:
-	Include gtkprintoperation.h
-	
-	* gtk/gtkenums.h:
-	Add printing enums
-	
-	* gtk/gtkmarshalers.list:
-	Add required new marshallers
-	
-	* gtk/gtkpagesetup.[ch]:
-	* gtk/gtkpagesetupunixdialog.[ch]:
-	* gtk/gtkpagesetupunixdialog.h:
-	* gtk/gtkpapersize.[ch]:
-	* gtk/gtkprint-win32.[ch]:
-	* gtk/gtkprintbackend.[ch]:
-	* gtk/gtkprintcontext.[ch]:
-	* gtk/gtkprinter-private.h:
-	* gtk/gtkprinter.[ch]:
-	* gtk/gtkprinteroption.[ch]:
-	* gtk/gtkprinteroptionset.[ch]:
-	* gtk/gtkprinteroptionwidget.[ch]:
-	* gtk/gtkprintjob.[ch]:
-	* gtk/gtkprintoperation-private.h:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintoperation-win32.c:
-	* gtk/gtkprintoperation.[ch]:
-	* gtk/gtkprintsettings.[ch]:
-	* gtk/gtkprintunixdialog.[ch]:
-	* gtk/paper_names.c:
-	Generic printing support
-	
-	* modules/Makefile.am:
-	* modules/printbackends/Makefile.am:
-	* modules/printbackends/cups/Makefile.am:
-	* modules/printbackends/cups/gtkcupsutils.[ch]:
-	* modules/printbackends/cups/gtkprintbackendcups.[ch]:
-	* modules/printbackends/cups/gtkprintercups.[ch]:
-	Cups backend
-	
-	* tests/.cvsignore:
-	* tests/Makefile.am:
-	* tests/print-editor.c:
-	Add printing test app
-
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
--- a/14
+++ b/14
@@ -3,9 +3,9 @@ Prerequisites

 GTK+ requires the following packages:

- - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ 2.10.2 requires at least GLib 2.12, 
-   Pango 1.13, ATK 1.9 and cairo 1.2.
+ - The GLib, Pango, and Atk libraries, available at the same location as GTK+
+   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
+   Pango-1.2 is recommended.)

 - The TIFF, PNG, and JPEG image loading libraries. You most
   likely have these installed on your system already. If not
@@ -18,12 +18,12 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================

-  % gzip -cd gtk+-2.10.2.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.10.2			   # change to the toplevel directory
+  % gzip -cd gtk+-2.8.2.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.8.2			   # change to the toplevel directory
  % ./configure				   # run the `configure' script
-  % make				   # build GTK+
+  % make				   # build GTK
  [ Become root if necessary ]
-  % make install			   # install GTK+
+  % make install			   # install GTK

 The Details
 ===========
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -3,9 +3,9 @@ Prerequisites

 GTK+ requires the following packages:

- - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.12, 
-   Pango 1.13, ATK 1.9 and cairo 1.2.
+ - The GLib, Pango, and Atk libraries, available at the same location as GTK+
+   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
+   Pango-1.2 is recommended.)

 - The TIFF, PNG, and JPEG image loading libraries. You most
   likely have these installed on your system already. If not
@@ -21,9 +21,9 @@ Simple install procedure
  % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
  % cd gtk+-@GTK_VERSION@			   # change to the toplevel directory
  % ./configure				   # run the `configure' script
-  % make				   # build GTK+
+  % make				   # build GTK
  [ Become root if necessary ]
-  % make install			   # install GTK+
+  % make install			   # install GTK

 The Details
 ===========
--- a/7
+++ b/7
@@ -1,7 +0,0 @@
-Email: mclasen@redhat.com
-Email: timj@gtk.org
-
-Note that a lot of people are contributing to GTK+, and some parts of it 
-are technically maintained by other people. The people listed above are
-meant as contacts for administrative questions such as cvs accounts. Other
-questions are best directed to the mailing list gtk-devel-list@gnome.org.
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,9 +16,6 @@ EXTRA_DIST =			\
 	ChangeLog.pre-2-2	\
 	ChangeLog.pre-2-4	\
 	ChangeLog.pre-2-6	\
-	ChangeLog.pre-2-8	\
-	ChangeLog.gtk-async-file-chooser	\
-	ChangeLog.gtk-printing	\
 	README.cvs-commits	\
 	README.win32		\
 	config.h.win32		\
@@ -134,10 +131,9 @@ gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
 	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc

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

 DISTCLEANFILES =				\
-	gtk+-unix-print-2.0.pc			\
 	gtk+-$(GDKTARGET)-2.0.pc		\
 	gdk-$(GDKTARGET)-2.0.pc			\
 	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
@@ -191,4 +187,5 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`

-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--- a/605
+++ b/605
@@ -1,608 +1,3 @@
-Overview of Changes from GTK+ 2.10.1 to 2.10.2
-==============================================
-
-* Many fixes and improvements for the OS X backends
-
-* Revert to using gtk modules with global binding,
-  since the local binding that was introduced in 
-  2.10 breaks the accessibility support of current 
-  OpenOffice.org releases.
-
-* GtkRecenManager 
- - Poll for changes to the XBEL file
- - Fix initial bad placement of recent files menu
- - Show nonexisting resources by default, and do 
-   not mark them as insensitive
- - Allow adding a filter to GtkRecentChooserMenu
-
-* GtkFileChooser
- - Improve the fallbacks for icons
- - Make  / and ~ activate the location entry again
-
-* Bugs fixed:
- 348828	Segmentation Fault in gtk_combo_box_menu_setup 
-        when removing combobox child
- 349552	problem with parsing (enum) style properties
- 351581	API Documentation issues with 2.15 release
- 348652	reorder() from ComboBoxEntry produces Gtk+ assert 
-        error
- 349128	Fix docs about GtkTreeModel::row-deleted
- 350605	Crash caused by the recent menu
- 348096	GtkStyle leaks GtkRcContext
- 348145	Background images not working with Quartz backend
- 329752	Problem with has_selection notification when 
-        deleting the selection
- 347856	gtk_recent_chooser_add_filter not implemented 
-        for GtkRecentChooserMenu
- 348245	Disabling pdf printing doesn't hide option
- 348278	textview doesn't update on hinting setting change
- 348289	Filechooser is blocked by higher priority idle
- 348478	entry completions needs to reset the IM context 
-        before emitting action-activate signal
- 348538	Remove old email addreses from the tutorial
- 348626	drag-to-child should not work
- 348634	IconView does not update background
- 348706	don't allow dnd onto arrows
- 348740	configure script does not honour PKG_CONFIG variable
- 348787	Segfault in gtk_font_button_update_font_info()
- 348824	test attached calendar-sane-timer patch in head
- 348971	gtk_status_icon_get_geometry returns bogus data
- 349382	valgrind uninitialized memory warnings setting 
-        partly uninitialized X properties
- 349570	notebook arrow PRELIGHT drawing doesn't work
- 349834	Memleak from gtk_tree_view_set_enable_tree_lines
- 349858	Leak of ShmPixmapInfo from get_shm_pixmap_for_image
- 349859	gtk_paint_tab doesn't work when widget is now 
-        option menu
- 349997	Indirect leak from XkbGetMap
- 350039	GtkFileChooserEntry leaks sources
- 350050	GdkGC leak from GtkRuler
- 350139	Should use evince preview mode
- 350258	Memory leak in gtk_entry_drag_data_received()
- 350329	The CUPS printer backend in GTK+-2.10.1 fails 
-        with CUPS 1.1.
- 350517	reset_style_idle() interferes with application 
-        idles
- 350860	Balloon messages sent to tray do not have the 
-        correct window in XEvent
- 350938	TreeViewColumn rendering off when "spacing" 
-        property set
- 351112	gtk_notebook_set_current_page fails when the 
-        notebook has not yet been shown
- 351519	Directfb backend fails to build
- 165714	GtkEntryCompletion doesn't complete on paste
- 168737	Different button sizes in About dialogs
- 345666	The icons of file, directory and device at 
-        GtkFileChooser
- 349429	spin button does not use correct value for 
-        inner_border
- 349501	fix in the documentation of function 
-        gtk_list_store_insert_with_values()
- 350072	stdout output from colorselection
- 351759	Wrong range value in documentation of 
-        gtk_color_selection_set_current_alpha
- 349277	Wrong message for problems with serializing 
-        texts
- 346800	Rework sort/filter models to use indices to 
-        parents instead of pointers
- 349120	Small error in doc
- 350911 gdk_pixbuf_new_from_file_at_scale() should 
-        skip when there's enough image data 
- 348728	GtkTable Row and Column Spacing
- 351241	swapped argument description
- 350023	"Running GTK+ Applications" chapter does not 
-        document new GTK_DEBUG possibilities
- 351812 file print backend filename encoding issue
-
-* New and updated translations (bg,bn_IN,de,dz,el,es,
-  et,eu,fi,gu,hu,ko,ku,ja,lt,mk,ml,nb,ne,nl,or,pl,po,
-  sv,th,tr,tt,uk,zh_HK,zh_TW)
-
-
-Overview of Changes from GTK+ 2.10.0 to 2.10.1
-==============================================
-
-* Drop Pango requirement 1.12.0
-
-* Many fixes and improvements for the OS X 
-  and directfb backends
-
-* The printing framework now supports a subset
-  of the Cups 1.2 custom PPD option spec
-
-* Bug fixes:
- 348134 box gaps on left and right can be drawn wrong
- 348014	crash on Epiphany Web Browser
- 348063	_gtk_icon_cache_get_icon crashes when no 
-        cache available
- 348096	GtkStyle leaks GtkRcContext
- 157439	The "adding to panel" is buggy when switching 
-        to an rtl environment
- 346751	symbolic colors can't be use in properties
- 347976	Context menus appear in strange locations
- 348001	xid / fid X11 font id's are used intermixed
- 348049	Tabs "magically" re-order
- 348094	Adjustment leak from gtkiconview
- 348115 improve notebook visuals when dragging
- 348120	gtkentrycompletion leaks action_view
- 348227	gtkimcontextsimple doesn't terminate a string 
-        with null
- 348424	mem leak in GtkPrintSettings
- 348089	Missing chaining up in gtk_recent_chooser_menu_finalize
- 348090	Reference leak in gtk_text_layout_set_contexts
- 348095	gtk_menu_stop_scrolling does work even if we 
-        were not scrolling...
- 142582	Add animation xsetting
- 346427	xbm loader returns false, fails to set error
- 346733	GList of visuals is always empty and causes 
-        crashes in gdk_rgb_choose_visual()
- 347048	crash on using GtkAssistant
- 164884	GtkTreeView row drag is sometimes started 
-        spuriously
- 302127	GtkTreeView gets angry when items deleted 
-        from a test_expand_row handler
- 346092 gtk_tooltip_set_delay documentation wrong
- 346428	Be robust against broken loaders failing to 
-        set error on failure
- 346467	gtkwindow state assignments bug
- 346598	modeline takes too much memory
- 346603	Context menus only work once
- 346639	treeview memleak
- 346668	symbolic colors are broken when specifying 
-        engine
- 346713 quartz backend is missing functions that 
-        pygtk needs
- 346721	XBM reading in quartz backend is broken
- 346836	Tabs jump around when opening menus
- 347018 missing GDK_QUARTZ_ALLOC/RELEASE_POOL calls
- 347277	gtk_drag_get_ipc_widget() and window groups
- 347315	SYNC extension check failing
- 347902	GtkRange doesn't reliably update stepper 
-        sensitivity
- 335012 gtkcellrenderertext - gtkeditable: bad 
-        interaction when ypad is set to hi value
- 337910	gdk_pango_layout_get_clip_region is inefficient
- 346605	Modifier-key events are not sent
- 346970	gtkfilechooserbutton leaks an empty list
- 347032	documentation of gtk_print_context_get_height() 
-        has typo
- 347037	GObject info missing for GtkRecentManager and 
-        GtkRecentChooser* in gtk-doc API reference
- 347041 documentation of gtk_paper_size_is_equal() 
-        has a typo
- 347043	Reference leaks in GtkFileChooserButton
- 347066	gimp 2.3.9/2.2.12 GTK+ assertion fails on 
-        open file dialog
- 347211 documentation of gtk_print_job_send() has a 
-        typo
- 347710	new GtkCellRendererSpin misses a lot of API 
-        documentation
- 347711	slight glitches in GtkAssistant API documentation
- 347065	Fix in-line doc typos
- 311399	relative to the window string can be better 
-
-* Updated translations (bg,bn_IN,cs,de,dz,es,et,
-  eu,fi,fr,gu,he,ko,or,th)
-
-Overview of Changes from GTK+ 2.9.4 to 2.10.0
-=============================================
-
-* Printing:
-  - A PREVIEW capability has been added to allow hiding the
-    preview button
-
-* Bug fixes:
- 321393	Incorrect size request after changing the font
- 327164	(GtkRBNode *)node becomes NULL inside GtkTreeView
- 344074	Feature request: get printer list, and get default print
- 344876	refcount leak when using ComboBox.set_cell_data_func
- 345644	gtk+-2.9.4 requires CUPS-1.2.x
- 345663	gtkaction(group)?.c: using functions without prototype declaration
- 346079	gtk receives all sorts of events from the X server
- 343841	Misguided iter assertion in gtk_list_store_insert_with_values()
- 346113 unix print dialogue always has preview button
- 346237 Possible leak in gtkprintunixdialog.c
- 346027 cancelling printer enumeration
- 346312 gtk 2.9.4 tarball lacks the files gtkwin32embedwidget.h 
-        and gtkprint-win32.h
- 346341 Memory leak in gtk_tree_model_sort_finalize: User data not freed
-
-* Updated translations (cs,cy,dz,es,gu,hi,ko,mk,nb,nl,ru,th,ur)
-
-Overview of Changes from GTK+ 2.9.3 to 2.9.4
-============================================
-
-* GtkPrintOperation:
- - UI improvements in the print dialog
- - Make printing work without a display connection
- - Replace "Print to PDF" by "Print to file" that
-   can generate PDF or PostScript
- - Add a function to the low-level API to 
-   enumerate all printers
-
-* GtkNotebook tab DND has been improved
-
-* GtkProgressbar supports text in activity mode 
-
-* GtkLabel allows to set the wrap mode
-
-* GtkStatusIcon supports transparency
-
-* Bugs fixed:
- 344850 Dragging a GtkTreeViewColumn segfaults when 
-        using certain GtkTreeViewColumnDropFunc
- 342458 Stock menu items without icons are broken in 
-        recent GTK+ releases.
- 335873 notebook DND + popup windows
- 337882 gtk_progress_bar_set_text() does nothing in 
-        activity mode
- 339456 unix print dialogue help button bug
- 339702 Make sure printing works without a display
- 341571 tabs too easily reordered
- 344074 New Feature: get printer list, and get default print
- 344743 gtk_targets_include_text() should initialize atoms
- 344838 Allow func to be NULL in 
-        gtk_tree_view_set_search_position_func
- 344891 GtkPrintOperationPreview signal defs correction
- 345008 Need updated cairo req
- 345093 print preview temp file issues
- 345107 Memory leak in gtk_entry_completion_finalize: 
-        User data not freed
- 345194 gdk_window_set_functions() docs need to be updated
- 345456 grid-lines property is wrongly registered and 
-        get/set.
- 314278 strings in gtk-update-icon-cache are not marked 
-        for translation
- 344707 size group with widgets in hidden container
- 344897 Entry completion model NULL handling should be 
-        documented
- 345038 gtk_print_job_set_status' status
- 345106 dialog button box spacings
- 345176 GtkIconView doc about drag and drop
- 345275 doc imporovements for gtk_window_move
- 345320 Two very similiar strings should be made equal
- 345321 Add meaning of "shortcut" as translator comment
- 320034 transparency gtkstatusicon
- 339592 Add print-to-postscript
- 344867 custom paper file could use keyfile
-
-* Updated translations (cs,de,es,fr,gl,gu,hi,ko,ta,th)
-
-Overview of Changes from GTK+ 2.9.2 to 2.9.3
-============================================  
-
-* GtkPrintOperation: 
- - Introduce an allow-async property 
- - Introduce a GtkPrintOperationAction enumeration
- - Rename pdf_target to export_filename
- - Allow to hide "Print to PDF" in the low-level API
-
-* GtkNotebook:
- - Add a destroy notify to 
-   gtk_notebook_set_window_creation_hook.
-
-* GtkTreeView:
- - Support grid lines
-
-* GtkRange:
- - Add a number of new stle properties which allow more
-   fexible stepper theming
-
-* Bugs fixed:
- 153212 Have the Paste kbd shortcut jump to the location in 
-        the buffer
- 337491 _gdk_win32_drawable_release_dc: DeleteDC() called on 
-        a GetDC() handle
- 339739 gtk/gtkprintoperation-win32.c: 3 compile error
- 342339 GtkRange::stepper-spacing style property not 
-        implemented correctly
- 343945 Buttons of a GtkAssistant are not accessible
- 344148 Wrong reqs for ATK
- 344209 gtk_notebook_set_window_creation_hook() has no destroy 
-        func.
- 344232 GtkEntry's "Delete" context menu item is sensitive on a 
-        non-editable GtkEntry
- 344244 Window resizing not working when keeping the aspect 
-        fixed
- 344288 gtk_print_operation_preview_is_selected must return 
-        a value
- 344386 gdk-2.0-uninstalled.pc.in and gdkconfig.h
- 344496 CRLF converting via Clipboard
- 344504 GtkPrintCapabilities not in gtktypebuiltins.h
- 344505 Wrong signal registration for create_custom_widget
- 344512 cvs build issue
- 344513 pdf print module's print_stream not calling destroy 
-        notify
- 344518 NULL unref in page setup dialogue
- 344543 gtk_progress_bar_pulse calls gtk_progress_bar_paint 
-        directly
- 344560 gtk_print_settings_[sg]et_scale shouldn't be in percent
- 344607 memory leaks in gtkrecentchooserdefault.c and 
-        gtkrecentchoosermenu.c
- 344624 Memory leak in gtk_tree_model_filter_finalize: User 
-        data not freed
- 337603 Possible off-by-one in 
-        gdk_pango_layout_line_get_clip_region
- 344239 Wrong filename for gtk-find stock item.
- 344528 comma at end of GtkPrintOperationAction enum causes 
-        mozilla compilation error
- 344290 horizontal-padding not take into account when placing 
-        submenus
- 344558 document print dialogue response codes
- 339592 Add print-to-postscript
- 342249 Allow to draw upper and lower sides of GtkRange's 
-        trough differently
- 344530 gtk_recent_chooser_widget_new_for_manager and 
-        gtk_recent_chooser_menu_new_for_manager should 
-        allow NULL manager arg
-
-* Updated translations (es,fi,gu,ko,th,wa)
-
-
-Overview of Changes from GTK+ 2.9.1 to 2.9.2
-============================================
-
-* GtkPrintOperation
- - Support asynchronous pagination with the ::paginate signal
- - Add gtk_print_operation_cancel
- - Support application-specific widgets
- - Allow disabling features based on application capabilities
- - Optionally show progress
- - Change some function names in GtkPrintContext to be longer 
-   and better
- - Support preview, the default implementation spawns evince,
-   but the api allows for an internal preview implementation
-
-* GtkCellView
- - Add a model property
-
-* GtkStatusIcon
- - Allow to obtain screen geometry 
-
-* GtkTreeView
- - Many bug fixes, in particular for RTL handling
- - Separate sensitive and selectable properties of rows
- - Optionally allow rubberband selection
-
-* GtkButton
- - Add image-spacing style property
- - Add image-position property 
-
-* GtkToolButton
- - Add icon-spacing style property
-
-* Make GTK+ work as an untrused X client
-
-* Bugs fixed:
- 343838 gtkprintoperationpreview.h guards
- 305530 Crashes while creating source code w/GtkFontSelection
- 341327 Memory corruption inside glib
- 341734 cursor blocked to dnd mode after using shift and 
-        dnd on a GtkCalendar
- 343453 G_DEFINE_TYPE messes up internal typenames of 
-        GdkWindow and GdkPixmap
- 136571 Problems running as untrusted client
- 168105 the right edge tab does not appear when switching tab
- 172535 Add support for UI builders in gtk+
- 302556 GtkTreeView widget signals are badly documented
- 324480 Selecting first item with keyboard is difficult
- 340428 small cleanup
- 340444 don't run the custom page size dialogue
- 340839 Critical warnings in GtkTreeModelFilter
- 341898 gtk_tree_view_insert_column_with_attributes doesn't 
-        work with fixed_height_mode
- 342003 DnD: Conditional jump or move depends on uninitialised value
- 342072 Wrong drop location in GtkEntry
- 342096 GtkImage animation CRITICALS on switching themes
- 342513 widget class style property with type module
- 342529 gdk should set resolution on PangoCairoFontmap, 
-        not PangoCairoContext
- 342535 Add documentation for new GtkWidget style properties 
-        (including Since tags)
- 342543 can't compile gtk+ on opensolaris using sun cc
- 342569 Typo in decl of gdk_color_parse
- 342752 Need a way to specify custom tab label for custom page 
-        in Print dialog
- 342754 print-editor: font button dialog doesn't get focus if 
-        main window has a window group
- 342781 GtkPrintUnixDialog: Collate should be insensitive unless 
-        Copies is > 1
- 342783 GtkPrintUnixDialog: Range textinput area should be 
-        insensitive unless range radiobutton is selected
- 342894 Use after free inside gtk_text_view_set_buffer
- 342930 GtkButton should offer a way to position the image 
-        relative to the text
- 343088 Some typos in the PO file
- 343425 "grab-notify"-signal is not correctly propagated for 
-        internal children
- 343438 gtk_color_button_set_color() doesn't emit "color-set" 
-        signal
- 343475 page setup unix dialog confusion
- 343625 allow to get only some info from gtk_status_icon_get_geometry
- 343677 GtkWindow chains key-release to key-press
- 320431 Text too close when using East/West in a GtkToolButton
- 321523 GtkTreeView's test_expand_row signal emitting impractical 
-        on row expand all
- 342007 Warning in gtk_paned_compute_position
- 343233 gdk_rectangle_intersect doc
- 333284 expander animation not working in RTL mode
- 343444 change color of gtk-demo source-buffer comment color 
-        from red to DodgerBlue
- 343630 Small inconsistence in migration documentation
-  80127 Rubberbanding for GtkTreeView
- 341450 status icon + libnotify
- 341679 Allow absolute filenames in the options entries
-
-* Updated translations (bg,cy,de,el,es,et,eu,gl,gu,it,ja,
-                        nb,nl,pt_BR,th,vi)
-
-
-Overview of Changes from GTK+ 2.9.0 to 2.9.1
-============================================
-
-* GtkPrintOperation
- - Many user interface improvements in the unix dialogs
- - gtk-demo has a printing demo
- - Don't unload print backends for now, since that has
-   deadlock issues
- - Asynchronous page rendering is done in an idle
-
-* GtkImage has an image property 
-
-* GtkTextBuffer has a cursor-position property
-
-* Arrow sizes in scrolled menus and notebooks are themable
-
-* GDK keysyms have be synched with Xorg 7.1
-
-* Bugs fixed:
- 340676 print backend type modules not correctly reregistering 
-        their types
- 340870 gdk_window_get_toplevels docstring error
- 323956 Unwanted accelerate key in the action-based toolbar
- 340527 Tooltips not shown for toolbar buttons created with 
-        uimanager/actions
- 340516 status icon property getter assertions
- 341091 a couple of spelling errors in gtk+
- 335707 notebook DND with event boxes in tab labels
- 337306 Add a GtkMessageDialog::image property
- 139628 GtkLayout In GtkScrolledWindow does not receive the 
-        scroll_event
- 334412 Add cursor-position property for getting notified 
-        about cursor movement
- 341217 langinfo.h #include'd unconditionally stops build
- 333632 use GtkMenu::scroll-arrow-height instead of 
-        MENU_SCROLL_ARROW_HEIGHT
- 325282 Add GtkNotebook::tab-overlap style property
- 341247 possible crash with tab_label = NULL
- 321896 Synch gdkkeysyms.h/gtkimcontextsimple.c with X.org 6.9/7.0
- 341416 Save FileChooserDialog doesn't response
- 336774 gtk_recent_manager_add_full
- 340401 critical warnings when using window groups
- 341661 misplaced g_assert in gtk_text_view_allocate_children
- 341692 Semicolons after G_DEFINE_TYPE
- 341665 several misplaced g_assert
- 341578 reverse page order issues
- 341332 Unset background in more places
- 341896 gtktreeview has RTL problems with toggle buttons if using 
-        gtktreestore as a model
- 341028 crash in new async code
- 341035 file chooser crash
- 340722 GtkToolbar::max-child-expand style property
- 339589 Tooltips on orientation icons in page setup dialog
- 340951 faq: How do I internationalize a GTK+ program? doesn't 
-        mention glib-I18N
- 341855 Little typo in the Tree and List Widget Overview
- 153212 Have the Paste kbd shortcut jump to the location 
-        in the buffer
- 335729 Invisible rows and 
-        gtk_tree_model_filter_convert_child_*_to_*
- 106406 GtkTreeView Grid Lines?
- 339592 Add print-to-postscript
-
-* Updated translations (de,es,gl,gu,nl)
-
-
-Overview of Changes from GTK+ 2.8.x to 2.9.0
-============================================
-
-* GtkStatusIcon, a cross-platform "tray icon" API
-
-* GtkAssistant, a widget for creating multi-step wizards
-
-* GtkLinkButton, a widget that displays a clickable hyperlink
-
-* GtkRecentChooser, widgets to display and select recently used files
-
-* GtkPrintOperation, cross-platform printing support
-
-* A framework for rich text copy and paste and DND
-
-* GtkCellRendererAccel, a cell renderer for key combinations
-
-* GtkCellRendererSpin, a cell renderer which edits numeric values 
-  using a spin button
-
-* GtkAction works with named icons in addition to stock icons
-
-* GtkNotebook supports DND, allowing to reorder tabs, move tabs
-  between notebooks and drop tabs on the desktop to open a new window
-
-* GtkTreeView:
-  - Enhanced customizability (e.g. grouping) with the
-    show-expanders and level-indentation properties
-  - Allow to embed the search popup
-  - Better search popup positioning
-
-* GtkFileChooser:
-  - Communication with backends is now asynchronous to avoid
-    blocking on filesystem operations. Due to the required interface
-    changes, the GTK+ ABI version has been bumped to 2.10.0. Third-party
-    filesystem backends have to be ported to the new interface, other
-    modules, such as theme engines, input method modules or pixbuf loaders 
-    have to be rebuilt so that they are installed in the right place
-    for GTK+ to find them.
-  - The location entry (popped up by C-L) has been integrated in the
-    main dialog.
-    
-* Reworked hex Unicode input now requires Ctrl-Shift-U
-
-* Animations can now be globally controlled by settings
-
-* The gtk-touchscreen-mode setting controls a number of changes
-  that make GTK+ work better on touchscreens
-
-* Password entries can optionally show the last entered character
-  for a short while, controlled by the password-hint-timeout setting
-
-* GTK+ can now consult an additional fallback icon theme before
-  falling back to hicolor
-
-* Improved themability:
-  - GTK+ supports symbolic colors, which can be set system-wide
-    using a setting, and can be modified and used in rc files
-    and theme engines
-  - GTK+ sets window type hints on override-redirect windows to 
-    help compositing managers apply proper bling
-  - Paths in rc files can now refer to all subclasses of a class 
-  - GtkRange steppers will appear insensitive when the slider
-    is at the end; applications which need to handle this case
-    (e.g. to extend the range) can opt out of this.
-  - GtkRange::activate-slider style property allows themes
-    to draw sliders differently while they are being dragged
-  - GtkNotebook::tab-overlap and GtkNotebook::curvature style
-    properties allow more flexible notebook theming
-  - The spacing of buttons around children can be themed with
-    the GtkButton::inner-border style property. Apps can override
-    this per-widget using the corresponding inner-border property 
-  - GtkMenu has aquired a horizontal-padding style property 
-  - There are style properties for the color of hyperlinks,
-    GtkWidget::link-color and GtkWidget::visited-link-color
-  - GtkTreeview row hinting now takes the selection into account
-  - Scrolling menus can be forced to always display both arrows,
-    using the GtkMenu::double-arrows style property
-  - Separators can be themed using the wide-separators, separator-width
-    and separator-height style properties
-  - GtkTreeView allows more flexible theming with the row-ending-details
-    property
-  - The pixbuf theme engines supports customized drawing of expanders
-    and resize grips
-
-* GDK changes:  
-  - OS X backend
-  - DirectFB backend 
-  - Closing displays works
-  - gdk_screen_is_composited to check for running compositing manager
-  - Support for Super, Hyper and Meta modifiers
-
-* gdk-pixbuf changes: 
-  - Supports saving tiff 
-  - Supports loading 16-bit pnm
-  - Doesn't load entire gif animation to get first frame
-
-* Bug fixes
-  - Too many to list them here
-
 Overview of Changes from GTK+ 2.8.1 to GTK+ 2.8.2
 =================================================
 * Fix a crash with custom icon themes, which affected
--- a/106
+++ b/106
@@ -1,7 +1,7 @@
 General Information
 ===================

-This is GTK+ version 2.10.2. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.8.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.
@@ -20,111 +20,13 @@ The official web site is:
 Information about mailing lists can be found at
  http://www.gtk.org/mailinglists.html

-
 Installation
 ============

 See the file 'INSTALL'

-
-Release notes for 2.10
-======================
-
-* The hexadecimal Unicode input feature has been reworked. It no longer
-  blocks the use of the sixteen Ctrl-Shift-<hex digit> key sequences. Now
-  it only uses Ctrl-Shift-u.
-
-* A memory leak in GtkStyle handling has been fixed. This may expose bugs
-  in third-party widgets which forget to call gtk_style_attach() in their
-  realize functions.
-
-* Range widgets like GtkScrollbar now render their arrows insensitive
-  when the slider is at the end. Applications which react to arrow
-  clicks even if the slider is at the end may want to use the new
-  gtk_range_set_[upper/lower]_stepper_sensitivity() functions to
-  prevent the arrows from being rendered insensitive.
-
-* GtkObject now uses the "floating reference" support in GObject. 
-  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
-  of the GTK_FLOATING flag will no longer detect the floating 
-  reference. Details about floating references can be found in the docs:
-  http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#floating-ref
-
-* Accelerators like (_F) are now stripped from labels when they are 
-  displayed in toolbars. If this is not wanted, the feature can be 
-  suppressed by inserting a Unicode control character, e.g ZWNJ.
-
-* The pixbuf theme engine can now customize expanders (in GtkTreeView
-  and GtkExpander) and resize grips, using the new EXPANDER and
-  RESIZE_GRIP function values.
-
-* Dialogs created by gtk_about_dialog_new() no longer hide automatically
-  when the user clicks close. It is the applications responsibility to
-  hide or destroy the dialog.
-
-* Several new signals have been added to GtkNotebook. Care has been taken
-  to choose signal names which do not collide with signals added by well-known
-  derived classes. The names which can no longer be used for signals in 
-  objects derived from GtkNotebook are page-reordered, page-removed and
-  page-added.
-
-* Due to the interface changes in the file chooser backend interface, 
-  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
-  backends have to be ported to the new interface, other modules, such as 
-  theme engines, input method modules or pixbuf loaders have to be rebuilt 
-  so that they are installed in the right place for GTK+ to find them.
-
-
-Release notes for 2.8
-=====================
-
-* GTK+ 2.8 and Pango 1.10 require the cairo library.
-
-* The default theme has been renamed to "Raleigh". Existing configurations
-  specifying the "Default" theme name should still work.
-
-* The GtkTreeView::enable-search property has been changed to control
-  only typeahead search, not the C-f keybinding to start an interactive
-  search. To turn off interactive searching completely, you have to
-  set GtkTreeView::search-column to -1.
-
-* The restriction on using the same cell renderer in multiple columns
-  of a GtkTreeView is now more strictly enforced.
-
-* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
-  the first day of the week. Thus, it is possible to select the first day
-  of the week independently from the language, by setting LC_TIME.
-
-* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
-  in the icon caches, which will make the icon cache files larger than
-  the one produced by GTK+ 2.6. This change will reduce the memory
-  overhead of icon themes at runtime, since all GTK+ applications can
-  share the image data in memory.
-
-* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
-  grab is broken. On X11, this can happen if the same application grabs
-  again, or if the window used for the grab becomes unviewable. It happens
-  more often on Win32. Applications which use grabs should pay attention
-  to these events and do the necessary cleanups when the grab is lost.
-* The GIOChannel code for sockets on win32 has been rewritten.
-  Applications who make non-trivial use of GIOChannels on win32 should
-  be watched for possible problems.
-
-* GLib 2.8 uses atomic operations to implement reference counting, thus
-  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
-  can be used without locking in multithreaded applications. Note that
-  other modifications, like concurrent setting of properties still require
-  locking.
-
-* g_convert() and related character set conversion functions have been
-  fixed to emit pending shift states and to not cache iconv descriptors
-  across multiple calls, since that is problematic for some encodings.
-  Note that these functions are not suitable for streaming conversions;
-  use g_iconv() to do streaming conversion.
-
-
-Release notes for 2.6
-=====================
+Release notes
+=============

 * GTK+ 2.6 supports clipboard persistency. To make use of this feature,
  a clipboard manager following the specification at
@@ -206,7 +108,6 @@ Release notes for 2.6
  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
 ==================

@@ -240,7 +141,6 @@ In the bug report please include:
  it will be more useful if the stacktrace is produced running the test
  program with the --sync command line option.

-
 Patches
 =======

--- a/README.in
+++ b/README.in
@@ -20,13 +20,11 @@ The official web site is:
 Information about mailing lists can be found at
  http://www.gtk.org/mailinglists.html

-
 Installation
 ============

 See the file 'INSTALL'

-
 Release notes for 2.10
 ======================

@@ -47,84 +45,10 @@ Release notes for 2.10
 * GtkObject now uses the "floating reference" support in GObject. 
  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
  of the GTK_FLOATING flag will no longer detect the floating 
-  reference. Details about floating references can be found in the docs:
-  http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#floating-ref
-
-* Accelerators like (_F) are now stripped from labels when they are 
-  displayed in toolbars. If this is not wanted, the feature can be 
-  suppressed by inserting a Unicode control character, e.g ZWNJ.
-
-* The pixbuf theme engine can now customize expanders (in GtkTreeView
-  and GtkExpander) and resize grips, using the new EXPANDER and
-  RESIZE_GRIP function values.
-
-* Dialogs created by gtk_about_dialog_new() no longer hide automatically
-  when the user clicks close. It is the applications responsibility to
-  hide or destroy the dialog.
-
-* Several new signals have been added to GtkNotebook. Care has been taken
-  to choose signal names which do not collide with signals added by well-known
-  derived classes. The names which can no longer be used for signals in 
-  objects derived from GtkNotebook are page-reordered, page-removed and
-  page-added.
-
-* Due to the interface changes in the file chooser backend interface, 
-  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
-  backends have to be ported to the new interface, other modules, such as 
-  theme engines, input method modules or pixbuf loaders have to be rebuilt 
-  so that they are installed in the right place for GTK+ to find them.
-
-
-Release notes for 2.8
-=====================
-
-* GTK+ 2.8 and Pango 1.10 require the cairo library.
-
-* The default theme has been renamed to "Raleigh". Existing configurations
-  specifying the "Default" theme name should still work.
-
-* The GtkTreeView::enable-search property has been changed to control
-  only typeahead search, not the C-f keybinding to start an interactive
-  search. To turn off interactive searching completely, you have to
-  set GtkTreeView::search-column to -1.
-
-* The restriction on using the same cell renderer in multiple columns
-  of a GtkTreeView is now more strictly enforced.
-
-* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
-  the first day of the week. Thus, it is possible to select the first day
-  of the week independently from the language, by setting LC_TIME.
-
-* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
-  in the icon caches, which will make the icon cache files larger than
-  the one produced by GTK+ 2.6. This change will reduce the memory
-  overhead of icon themes at runtime, since all GTK+ applications can
-  share the image data in memory.
-
-* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
-  grab is broken. On X11, this can happen if the same application grabs
-  again, or if the window used for the grab becomes unviewable. It happens
-  more often on Win32. Applications which use grabs should pay attention
-  to these events and do the necessary cleanups when the grab is lost.
-* The GIOChannel code for sockets on win32 has been rewritten.
-  Applications who make non-trivial use of GIOChannels on win32 should
-  be watched for possible problems.
-
-* GLib 2.8 uses atomic operations to implement reference counting, thus
-  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
-  can be used without locking in multithreaded applications. Note that
-  other modifications, like concurrent setting of properties still require
-  locking.
-
-* g_convert() and related character set conversion functions have been
-  fixed to emit pending shift states and to not cache iconv descriptors
-  across multiple calls, since that is problematic for some encodings.
-  Note that these functions are not suitable for streaming conversions;
-  use g_iconv() to do streaming conversion.
-
-
-Release notes for 2.6
-=====================
+  reference.
+ 
+Release notes
+=============

 * GTK+ 2.6 supports clipboard persistency. To make use of this feature,
  a clipboard manager following the specification at
@@ -206,7 +130,6 @@ Release notes for 2.6
  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
 ==================

@@ -240,7 +163,6 @@ In the bug report please include:
  it will be more useful if the stacktrace is produced running the test
  program with the --sync command line option.

-
 Patches
 =======

--- a/acconfig.h
+++ b/acconfig.h
@@ -68,8 +68,6 @@

 #undef GETTEXT_PACKAGE

-#undef HAVE_CUPS_API_1_2
-
 /* #undef PACKAGE */
 /* #undef VERSION */

--- a/autogen.sh
+++ b/autogen.sh
@@ -93,11 +93,6 @@ fi

 rm -rf autom4te.cache

-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
-
 $ACLOCAL $ACLOCAL_FLAGS || exit $?

 libtoolize --force || exit $?
--- a/configure.in
+++ b/configure.in
@@ -11,11 +11,11 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [10])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_minor_version], [9])
+m4_define([gtk_micro_version], [0])
 m4_define([gtk_version],
          [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [3])
+m4_define([gtk_interface_age], [0])
 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
@@ -28,13 +28,13 @@ m4_define([gtk_api_version], [2.0])
 # for GTK+.
 #
 #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-m4_define([gtk_binary_version], [2.10.0])
+m4_define([gtk_binary_version], [2.4.0])

 # required versions of other packages
-m4_define([glib_required_version], [2.12.0])
-m4_define([pango_required_version], [1.12.0])
-m4_define([atk_required_version], [1.9.0])
-m4_define([cairo_required_version], [1.2.0])
+m4_define([glib_required_version], [2.9.1])
+m4_define([pango_required_version], [1.9.0])
+m4_define([atk_required_version], [1.0.1])
+m4_define([cairo_required_version], [0.9.2])


 AC_INIT([gtk+], [gtk_version],
@@ -224,13 +224,13 @@ else
  gdktarget=x11
 fi

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

 AC_SUBST(gdktarget)
 case $gdktarget in
-  x11|linux-fb|win32|quartz|directfb) ;;
-  *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb, quartz, directfb or win32.]);;
+  x11|linux-fb|win32|quartz) ;;
+  *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb, quartz or win32.]);;
 esac

 gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
@@ -416,42 +416,6 @@ if test "$gtk_ok" = "yes"; then
 	    [Define if _NL_TIME_FIRST_WEEKDAY is available])
 fi

-# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
-AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
-AC_TRY_LINK([#include <langinfo.h>], [
-char c;
-c = *((unsigned char *)  nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));
-], gtk_ok=yes, gtk_ok=no)
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1],
-	    [Define if _NL_MEASUREMENT_MEASUREMENT is available])
-fi
-
-# _NL_PAPER_HEIGHT is an enum and not a define
-AC_MSG_CHECKING([for _NL_PAPER_HEIGHT])
-AC_TRY_LINK([#include <langinfo.h>], [
-char c;
-c = *((unsigned char *)  nl_langinfo(_NL_PAPER_HEIGHT));
-], gtk_ok=yes, gtk_ok=no)
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE([HAVE__NL_PAPER_HEIGHT], [1],
-	    [Define if _NL_PAPER_HEIGHT is available])
-fi
-
-# _NL_PAPER_WIDTH is an enum and not a define
-AC_MSG_CHECKING([for _NL_PAPER_WIDTH])
-AC_TRY_LINK([#include <langinfo.h>], [
-char c;
-c = *((unsigned char *)  nl_langinfo(_NL_PAPER_WIDTH));
-], gtk_ok=yes, gtk_ok=no)
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1],
-	    [Define if _NL_PAPER_WIDTH 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>], [
@@ -469,7 +433,7 @@ fi
 # sure that both po/ and po-properties/ have .po files that correspond
 # to your language.  If you only add one to po/, the build will break
 # in po-properties/.
-ALL_LINGUAS="af am ar az az_IR be bg bn bn_IN br bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu hy ia id is it ja ka ko ku li lt lv mi mk ml mn mr ms nb ne nl nn nso or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sr@ije sv ta te th tk tr tt uk ur uz uz@Latn vi wa xh yi zh_CN zh_HK zh_TW"
+ALL_LINGUAS="af am 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 hy ia id is it ja ko ku 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 te th tk tr tt uk uz uz@Latn vi wa xh yi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
 AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
@@ -551,14 +515,6 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
  gobject gmodule-no-export gthread)

-# See if it's safe to turn G_DISABLE_DEPRECATED on.
-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"`
-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo glib_required_version | sed "s/\.@<:@^.@:>@*\$//"`
-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
-  CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
-fi
-
-
 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 dnl
@@ -1089,11 +1045,11 @@ if test "x$gdktarget" = "xx11"; then
  #
  # Check for basic X packages; we use pkg-config if available
  #
-  if $PKG_CONFIG --exists x11 xext xrender; then
+  if $PKG_CONFIG --exists x11 xext; then
    have_base_x_pc=true
-    X_PACKAGES="$X_PACKAGES x11 xext xrender"
-    x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
-    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
+    X_PACKAGES="$X_PACKAGES x11 xext"
+    x_libs="`pkg-config --libs x11 xext`"
+    X_CFLAGS="`pkg-config --cflags x11 xext`"
    
    # Strip out any .la files that pkg-config might give us (this happens
    # with -uninstalled.pc files)
@@ -1115,11 +1071,11 @@ if test "x$gdktarget" = "xx11"; then
    fi
    
    x_cflags="$X_CFLAGS"
-    x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
+    x_libs_for_checks="$X_LIBS -lXext -lX11 $X_EXTRA_LIBS"

    GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags"
    GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
-    GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS"
+    GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS"
  fi

  # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
@@ -1138,8 +1094,6 @@ if test "x$gdktarget" = "xx11"; then
                AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
  AC_CHECK_FUNC(XextFindDisplay, :,
                AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
-  AC_CHECK_FUNC(XRenderQueryExtension, :,
-                AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))

  # Check for xReply

@@ -1192,16 +1146,12 @@ if test "x$gdktarget" = "xx11"; then
      AC_DEFINE(HAVE_SHAPE_EXT))

  # X SYNC check
-  gtk_save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $x_cflags"
  
  AC_CHECK_FUNC(XSyncQueryExtension,
      [AC_CHECK_HEADER(X11/extensions/sync.h,
 	  AC_DEFINE(HAVE_XSYNC, 1, Have the SYNC extension library),
 	  :, [#include <X11/Xlib.h>])])

-  CFLAGS="$gtk_save_CFLAGS"
-
  # Xshm checks

  if test "x$enable_shm" = "xyes"; then
@@ -1279,7 +1229,7 @@ if test "x$gdktarget" = "xx11"; then
 	      AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
 	          [AC_CHECK_HEADER(X11/extensions/Xinerama.h, 
 	              [GTK_ADD_LIB(x_extra_libs,Xinerama)
-		      have_xfree_xinerama=true], :,
+		      have_xfree_xinerama=true], :
                      [#include <X11/Xlib.h>])])
          fi

@@ -1409,27 +1359,6 @@ else
  AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
 fi

-if test "x$gdktarget" = "xdirectfb"; then
-  DIRECTFB_REQUIRED_VERSION=0.9.24
-  AC_MSG_CHECKING(for DirectFB)
-
-  if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then
-      AC_MSG_RESULT(found)
-      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS"
-      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS"
-  else
-      AC_MSG_ERROR([
-*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest
-*** version of DirectFB is always available from http://www.directfb.org/.
-  ])
-  fi
-
-  AM_CONDITIONAL(USE_DIRECTFB, true)
-else
-  AM_CONDITIONAL(USE_DIRECTFB, false)
-fi
-
-
 # Check for Pango flags

 if test "x$gdktarget" = "xwin32"; then
@@ -1539,47 +1468,6 @@ AC_SUBST(GTK_DEP_CFLAGS)
 AC_SUBST(GTK_DEBUG_FLAGS)
 AC_SUBST(GTK_XIM_FLAGS)

-################################################################
-# Printing system checks
-################################################################
-
-AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
-if test "x$CUPS_CONFIG" != "xno"; then
-  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-  CUPS_LIBS=`cups-config --libs`
-
-  CUPS_API_VERSION=`cups-config --api-version`
-  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
-  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
-
-  if test $CUPS_API_MAJOR -gt 1 -o \
-          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
-    AC_DEFINE(HAVE_CUPS_API_1_2)
-  fi
-
-  AC_SUBST(CUPS_API_MAJOR)
-  AC_SUBST(CUPS_API_MINOR)
-  AC_SUBST(CUPS_CFLAGS)
-  AC_SUBST(CUPS_LIBS)
-fi
-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-
-gtk_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
-			  
-AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
-*** Can't find cairo-pdf.h. You must build Cairo with the pdf
-*** backend enabled.]))
-
-if test "$os_win32" != "yes"; then
-  AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
-*** Can't find cairo-ps.h. You must build Cairo with the 
-*** postscript backend enabled.]))
-fi   
-
-CPPFLAGS="$gtk_save_cppflags"
-     
-			  	
 ################################################################
 # Strip -export-dynamic from the link lines of various libraries
 ################################################################
@@ -1691,9 +1579,6 @@ elif test "x$gdktarget" = "xlinux-fb" ; then
 elif test "x$gdktarget" = "xquartz" ; then
  gdk_windowing='
 #define GDK_WINDOWING_QUARTZ'
-elif test "x$gdktarget" = "xdirectfb" ; then
-  gdk_windowing='
-#define GDK_WINDOWING_DIRECTFB'
 fi

 if test x$gdk_wchar_h = xyes; then
@@ -1719,7 +1604,6 @@ Makefile
 gdk-pixbuf-2.0.pc
 gdk-2.0.pc
 gtk+-2.0.pc
-gtk+-unix-print-2.0.pc
 gdk-pixbuf-2.0-uninstalled.pc
 gdk-2.0-uninstalled.pc
 gtk+-2.0-uninstalled.pc
@@ -1752,7 +1636,6 @@ gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/linux-fb/Makefile
 gdk/quartz/Makefile
-gdk/directfb/Makefile
 gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
@@ -1766,10 +1649,6 @@ modules/engines/pixbuf/Makefile
 modules/engines/ms-windows/Makefile
 modules/engines/ms-windows/Theme/Makefile
 modules/engines/ms-windows/Theme/gtk-2.0/Makefile
-modules/printbackends/Makefile
-modules/printbackends/cups/Makefile
-modules/printbackends/lpr/Makefile
-modules/printbackends/file/Makefile
 perf/Makefile
 contrib/Makefile
 contrib/gdk-pixbuf-xlib/Makefile
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,35 +1,3 @@
-2006-08-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.10.2 ===
-
-2006-07-23  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.10.1 ===
-
-2006-07-02  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.10.0 ===
-
-2006-06-21  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.9.4 ===
-
-2006-06-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.3 ===
-
-2006-06-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.2 ===
-
-2006-05-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.1 ====
-
-2006-05-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.0 ===
-
 2005-11-17  Matthias Clasen  <mclasen@redhat.com>

 	* gdk-pixbuf-xlib-drawable.c: 
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -1,19 +1,15 @@
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la

 INCLUDES = \
 	-I$(top_srcdir) -I$(top_builddir) 	\
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_srcdir)/contrib 		\
+	-DG_DISABLE_DEPRECATED			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)

 libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
 	-export-dynamic						\
-	$(no_undefined)						\
 	-version-info $(LT_VERSION_INFO)

 libgdk_pixbuf_xlib_2_0_la_LIBADD = \
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = gtk-demo
 INCLUDES = 						\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gdk				\
+	-DG_DISABLE_DEPRECATED	 			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED			\
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -6,7 +6,6 @@ democodedir=$(datadir)/gtk-2.0/demo
 ## demo app, which means alphabetized by demo title, not filename
 demos =						\
 	appwindow.c				\
-	assistant.c				\
 	button_box.c				\
 	changedisplay.c				\
 	clipboard.c				\
@@ -26,7 +25,6 @@ demos =						\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
-	printing.c				\
 	rotated_text.c				\
 	sizegroup.c				\
 	stock_browser.c				\
@@ -38,6 +36,7 @@ INCLUDES = \
 	-DDEMOCODEDIR="\"$(democodedir)\""		\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gdk				\
+	-DG_DISABLE_DEPRECATED	 			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED 			\
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -1,165 +0,0 @@
-/* Assistant
- *
- * Demonstrates a sample multistep assistant. Assistants are used to divide
- * an operation into several simpler sequential steps, and to guide the user
- * through these steps.
- */
-
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-static GtkWidget *assistant = NULL;
-
-static void
-on_assistant_apply (GtkWidget *widget, gpointer data)
-{
-  /* Apply here changes, this is a fictional
-     example, so we just do nothing here */
-}
-
-static void
-on_assistant_close_cancel (GtkWidget *widget, gpointer data)
-{
-  GtkWidget **assistant = (GtkWidget **) data;
-
-  gtk_widget_destroy (*assistant);
-  *assistant = NULL;
-}
-
-static void
-on_assistant_prepare (GtkWidget *widget, GtkWidget *page, gpointer data)
-{
-  gint current_page, n_pages;
-  gchar *title;
-
-  current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (widget));
-  n_pages = gtk_assistant_get_n_pages (GTK_ASSISTANT (widget));
-
-  title = g_strdup_printf ("Sample assistant (%d of %d)", current_page + 1, n_pages);
-  gtk_window_set_title (GTK_WINDOW (widget), title);
-  g_free (title);
-}
-
-static void
-on_entry_changed (GtkWidget *widget, gpointer data)
-{
-  GtkAssistant *assistant = GTK_ASSISTANT (data);
-  GtkWidget *current_page;
-  gint page_number;
-  const gchar *text;
-
-  page_number = gtk_assistant_get_current_page (assistant);
-  current_page = gtk_assistant_get_nth_page (assistant, page_number);
-  text = gtk_entry_get_text (GTK_ENTRY (widget));
-
-  if (text && *text)
-    gtk_assistant_set_page_complete (assistant, current_page, TRUE);
-  else
-    gtk_assistant_set_page_complete (assistant, current_page, FALSE);
-}
-
-static void
-create_page1 (GtkWidget *assistant)
-{
-  GtkWidget *box, *label, *entry;
-  GdkPixbuf *pixbuf;
-
-  box = gtk_hbox_new (FALSE, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (box), 12);
-
-  label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
-
-  entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
-  g_signal_connect (G_OBJECT (entry), "changed",
-		    G_CALLBACK (on_entry_changed), assistant);
-
-  gtk_widget_show_all (box);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);
-
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-static void
-create_page2 (GtkWidget *assistant)
-{
-  GtkWidget *box, *checkbutton;
-  GdkPixbuf *pixbuf;
-
-  box = gtk_vbox_new (12, FALSE);
-  gtk_container_set_border_width (GTK_CONTAINER (box), 12);
-
-  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
-						 "even if you do not check this");
-  gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE, 0);
-
-  gtk_widget_show_all (box);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");
-
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-static void
-create_page3 (GtkWidget *assistant)
-{
-  GtkWidget *label;
-  GdkPixbuf *pixbuf;
-
-  label = gtk_label_new ("This is a confirmation page, press 'Apply' to apply changes");
-
-  gtk_widget_show (label);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), label);
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_CONFIRM);
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation");
-
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-GtkWidget*
-do_assistant (GtkWidget *do_widget)
-{
-  if (!assistant)
-    {
-      assistant = gtk_assistant_new ();
-
-	 gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
-
-      gtk_window_set_screen (GTK_WINDOW (assistant),
-			     gtk_widget_get_screen (do_widget));
-
-      create_page1 (assistant);
-      create_page2 (assistant);
-      create_page3 (assistant);
-
-      g_signal_connect (G_OBJECT (assistant), "cancel",
-			G_CALLBACK (on_assistant_close_cancel), &assistant);
-      g_signal_connect (G_OBJECT (assistant), "close",
-			G_CALLBACK (on_assistant_close_cancel), &assistant);
-      g_signal_connect (G_OBJECT (assistant), "apply",
-			G_CALLBACK (on_assistant_apply), NULL);
-      g_signal_connect (G_OBJECT (assistant), "prepare",
-			G_CALLBACK (on_assistant_prepare), NULL);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (assistant))
-    gtk_widget_show (assistant);
-  else
-    {
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
-    }
-
-  return assistant;
-}
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -15,9 +15,7 @@ static GtkWidget *frame;
 /* Expose callback for the drawing area
 */
 static gboolean
-expose_event_callback (GtkWidget      *widget, 
-                       GdkEventExpose *event, 
-                       gpointer        data)
+expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
  if (widget->window)
    {
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -121,10 +121,7 @@ create_numbers_model (void)
  /* add numbers */
  for (i = 0; i < N_NUMBERS; i++)
    {
-      char str[2];
-
-      str[0] = '0' + i;
-      str[1] = '\0';
+      char str[2] = { '0' + i, '\0' };

      gtk_list_store_append (model, &iter);

--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -64,8 +64,6 @@ set_cell_color (GtkCellLayout   *cell_layout,
      (color.green >> 8) << 16 |
      (color.blue  >> 8) << 8;

-  g_free (text);
-
  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 24, 24);
  gdk_pixbuf_fill (pixbuf, pixel);

--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -19,7 +19,7 @@ enum {
  TITLE_COLUMN,
  FILENAME_COLUMN,
  FUNC_COLUMN,
-  STYLE_COLUMN,
+  ITALIC_COLUMN,
  NUM_COLUMNS
 };

@@ -94,15 +94,15 @@ window_closed_cb (GtkWidget *window, gpointer data)
 {
  CallbackData *cbdata = data;
  GtkTreeIter iter;
-  PangoStyle style;
+  gboolean italic;

  gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
  gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
-		      STYLE_COLUMN, &style,
+		      ITALIC_COLUMN, &italic,
 		      -1);
-  if (style == PANGO_STYLE_ITALIC)
+  if (italic)
    gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
-			STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			ITALIC_COLUMN, !italic,
 			-1);

  gtk_tree_path_free (cbdata->path);
@@ -586,7 +586,7 @@ row_activated_cb (GtkTreeView       *tree_view,
 		  GtkTreeViewColumn *column)
 {
  GtkTreeIter iter;
-  PangoStyle style;
+  gboolean italic;
  GDoDemoFunc func;
  GtkWidget *window;
  GtkTreeModel *model;
@@ -597,14 +597,14 @@ row_activated_cb (GtkTreeView       *tree_view,
  gtk_tree_model_get (GTK_TREE_MODEL (model),
 		      &iter,
 		      FUNC_COLUMN, &func,
-		      STYLE_COLUMN, &style,
+		      ITALIC_COLUMN, &italic,
 		      -1);

  if (func)
    {
      gtk_tree_store_set (GTK_TREE_STORE (model),
 			  &iter,
-			  STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
+			  ITALIC_COLUMN, !italic,
 			  -1);
      window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
      
@@ -700,7 +700,7 @@ create_tree (void)

  Demo *d = testgtk_demos;

-  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
+  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
  tree_view = gtk_tree_view_new ();
  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
@@ -723,7 +723,7 @@ create_tree (void)
 			  TITLE_COLUMN, d->title,
 			  FILENAME_COLUMN, d->filename,
 			  FUNC_COLUMN, d->func,
-			  STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			  ITALIC_COLUMN, FALSE,
 			  -1);

      d++;
@@ -742,7 +742,7 @@ create_tree (void)
 			      TITLE_COLUMN, children->title,
 			      FILENAME_COLUMN, children->filename,
 			      FUNC_COLUMN, children->func,
-			      STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			      ITALIC_COLUMN, FALSE,
 			      -1);
 	  
 	  children++;
@@ -751,10 +751,14 @@ create_tree (void)

  cell = gtk_cell_renderer_text_new ();

+  g_object_set (cell,
+                "style", PANGO_STYLE_ITALIC,
+                NULL);
+  
  column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)",
 						     cell,
 						     "text", TITLE_COLUMN,
-						     "style", STYLE_COLUMN,
+						     "style_set", ITALIC_COLUMN,
 						     NULL);
  
  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
@@ -890,7 +894,7 @@ main (int argc, char **argv)
                                    NULL);

  tag = gtk_text_buffer_create_tag (source_buffer, "comment",
-				    "foreground", "DodgerBlue",
+				    "foreground", "red",
                                    NULL);
  tag = gtk_text_buffer_create_tag (source_buffer, "type",
 				    "foreground", "ForestGreen",
--- a/demos/gtk-demo/printing.c
+++ b/demos/gtk-demo/printing.c
@@ -1,182 +0,0 @@
-/* Printing
- *
- * GtkPrintOperation offers a simple API to support printing
- * in a cross-platform way.
- *
- */
-
-#include <math.h>
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-/* In points */
-#define HEADER_HEIGHT (10*72/25.4)
-#define HEADER_GAP (3*72/25.4)
-
-typedef struct 
-{
-  gchar *filename;
-  gdouble font_size;
-
-  gint lines_per_page;  
-  gchar **lines;
-  gint num_lines;
-  gint num_pages;
-} PrintData;
-
-static void
-begin_print (GtkPrintOperation *operation, 
-	     GtkPrintContext   *context,
-	     gpointer           user_data)
-{
-  PrintData *data = (PrintData *)user_data;
-  char *contents;
-  int i;
-  double height;
-
-  height = gtk_print_context_get_height (context) - HEADER_HEIGHT - HEADER_GAP;
-  
-  data->lines_per_page = floor (height / data->font_size);
-  
-  g_file_get_contents (data->filename, &contents, NULL, NULL);
-
-  data->lines = g_strsplit (contents, "\n", 0);
-  g_free (contents);
-
-  i = 0;
-  while (data->lines[i] != NULL)
-    i++;
-  
-  data->num_lines = i;
-  data->num_pages = (data->num_lines - 1) / data->lines_per_page + 1;
-  gtk_print_operation_set_n_pages (operation, data->num_pages);
-}
-
-static void
-draw_page (GtkPrintOperation *operation,
-	   GtkPrintContext   *context,
-	   gint               page_nr,
-	   gpointer           user_data)
-{
-  PrintData *data = (PrintData *)user_data;
-  cairo_t *cr;
-  PangoLayout *layout;
-  gdouble width, text_height;
-  gint line, i, layout_height;
-  PangoFontDescription *desc;
-  gchar *page_str;
-
-  cr = gtk_print_context_get_cairo_context (context);
-  width = gtk_print_context_get_width (context);
-
-  cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT);
-  
-  cairo_set_source_rgb (cr, 0.8, 0.8, 0.8);
-  cairo_fill_preserve (cr);
-  
-  cairo_set_source_rgb (cr, 0, 0, 0);
-  cairo_set_line_width (cr, 1);
-  cairo_stroke (cr);
-
-  layout = gtk_print_context_create_pango_layout (context);
-
-  desc = pango_font_description_from_string ("sans 14");
-  pango_layout_set_font_description (layout, desc);
-  pango_font_description_free (desc);
-
-  pango_layout_set_text (layout, data->filename, -1);
-  pango_layout_set_width (layout, width);
-  pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
-			      
-  pango_layout_get_size (layout, NULL, &layout_height);
-  text_height = (gdouble)layout_height / PANGO_SCALE;
-
-  cairo_move_to (cr, width / 2,  (HEADER_HEIGHT - text_height) / 2);
-  pango_cairo_show_layout (cr, layout);
-
-  page_str = g_strdup_printf ("%d/%d", page_nr + 1, data->num_pages);
-  pango_layout_set_text (layout, page_str, -1);
-  g_free (page_str);
-  pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
-			      
-  cairo_move_to (cr, width - 2, (HEADER_HEIGHT - text_height) / 2);
-  pango_cairo_show_layout (cr, layout);
-  
-  g_object_unref (layout);
-  
-  layout = gtk_print_context_create_pango_layout (context);
-  
-  desc = pango_font_description_from_string ("mono");
-  pango_font_description_set_size (desc, data->font_size * PANGO_SCALE);
-  pango_layout_set_font_description (layout, desc);
-  pango_font_description_free (desc);
-  
-  cairo_move_to (cr, 0, HEADER_HEIGHT + HEADER_GAP);
-  line = page_nr * data->lines_per_page;
-  for (i = 0; i < data->lines_per_page && line < data->num_lines; i++) 
-    {
-      pango_layout_set_text (layout, data->lines[line], -1);
-      pango_cairo_show_layout (cr, layout);
-      cairo_rel_move_to (cr, 0, data->font_size);
-      line++;
-    }
-
-  g_object_unref (layout);
-}
-
-static void
-end_print (GtkPrintOperation *operation, 
-	   GtkPrintContext   *context,
-	   gpointer           user_data)
-{
-  PrintData *data = (PrintData *)user_data;
-
-  g_free (data->filename);
-  g_strfreev (data->lines);
-  g_free (data);
-}
-
-
-GtkWidget *
-do_printing (GtkWidget *do_widget)
-{
-  GtkPrintOperation *operation;
-  PrintData *data;
-  GError *error = NULL;
-
-  operation = gtk_print_operation_new ();
-  data = g_new0 (PrintData, 1);
-  data->filename = demo_find_file ("printing.c", NULL);
-  data->font_size = 12.0;
-
-  g_signal_connect (G_OBJECT (operation), "begin-print", 
-		    G_CALLBACK (begin_print), data);
-  g_signal_connect (G_OBJECT (operation), "draw-page", 
-		    G_CALLBACK (draw_page), data);
-  g_signal_connect (G_OBJECT (operation), "end-print", 
-		    G_CALLBACK (end_print), data);
-
-  gtk_print_operation_run (operation, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (do_widget), &error);
-
-  g_object_unref (operation);
-
-  if (error)
-    {
-      GtkWidget *dialog;
-      
-      dialog = gtk_message_dialog_new (GTK_WINDOW (do_widget),
-				       GTK_DIALOG_DESTROY_WITH_PARENT,
-				       GTK_MESSAGE_ERROR,
-				       GTK_BUTTONS_CLOSE,
-				       "%s", error->message);
-      g_error_free (error);
-      
-      g_signal_connect (dialog, "response",
-			G_CALLBACK (gtk_widget_destroy), NULL);
-      
-      gtk_widget_show (dialog);      
-    }
-  
-
-  return NULL;
-}
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,484 +1,3 @@
-2006-08-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.10.2 ===
-
-2006-08-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtktable.sgml: Fix docs for gtk_table_set_row/col_spacing.
-	(#348728)
-
-	* gtk/running.sgml: Document new GTK_DEBUG values.  (#350023,
-	Mart Raudsepp)
-
-2006-08-14  Emmanuele Bassi  <ebassi@gnome.org>
-
-	* gtk/tmpl/gtkrecentchoosermenu.sgml: Add a warning about
-	the semantics of gtk_recent_chooser_add_filter() and of
-	gtk_recent_chooser_remove_filter() when applied to a
-	GtkRecentChooserMenu.
-
-2006-08-14  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkruler.sgml: Fix a swapped argument 
-	description.  (#351241, <20>tienne Bersac)
-
-2006-08-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkcelllayout.sgml: Add an explanation
-	of attributes.  (#349367, Don Anderson)
-
-	* gtk/tmpl/gtkrecentmanager.sgml: Fix a typo.  (#349120, Vincent Untz) 
-
-2006-07-23  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.10.1 ===
-
-2006-07-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk.types: Add  gtk_cell_renderer_spin_get_type  (#347710,
-	Guillaume Cottenceau)
-
-2006-07-10  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk.types: Add missing types  (#347037, Josh Green)
-
-2006-07-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtktooltips.sgml: Fix a FIXME (#346092,
-	Claudio Saavedra, Priit Laes)
-
-2006-07-02  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.10.0 ===
-
-2006-06-30 Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkprintsettings.sgml: Document print-to-file specific
-	settings.  (#346241, Carolyn MacLeod)
-
-2006-06-28  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkprintjob.sgml: Document GtkPrintJobCompleteFunc
-
-	* gtk/tmpl/gtkrange.sgml: Document GtkSensitivityType
-
-	* gtk/gtk-sections.txt: Remove gtk_print_operation_set_show_dialog
-
-	* gtk/tmpl/gtkcontainer.sgml: Updates.
-
-	* gtk/tmpl/gtkenums.sgml: Document GTK_ARROW_NONE.
-	* gtk/tmpl/gtkarrow.sgml: Cleanups
-	* gtk/gtk-sections.txt: Add some private things
-
-2006-06-21  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.9.4 ===
-
-2006-06-21  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Some additions
-
-	* gtk/tmpl/gtkprintunixdialog.sgml: Document some of the
-	print capabilities
-
-	* gtk/question_index.sgml: Add some questions.
-
-2006-06-20  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Remove unused print-to-file setting
-
-2006-06-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkprinter.sgml: Document GtkPrinterFunc
-
-	* gtk/gtk-sections.txt: Add gtk_enumerate_printers
-
-2006-06-19  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtk-sections.txt:
-	Add gtk_label_set_line_wrap_mode and gtk_label_get_line_wrap_mode
-
-2006-06-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.3 ===
-
-2006-06-11  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkprintunixdialog.sgml: Document resonses used
-	by GtkPrintUnixDialog.  (#344558, Christian Persch)
-
-2006-06-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkprintoperation.sgml: Updates
-
-	* gtk/gtk-sections.txt: Replace pdf_target by export_filename
-
-	* gtk/tmpl/gtkprintoperation.sgml: Remove GTK_PRINT_OPERATION_RESULT_PREVIEW.
-
-	* gtk/tmpl/gtkstock.sgml: Correct a filename (#344239,
-	John Darrington)
-
-2006-06-07  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkprintoperation.sgml:
-	* gtk/gtk-sections.txt: Additions
-
-2006-06-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.2 ===
-
-2006-06-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/migrating-checklist.sgml: Fix a small
-	inconsistency.  (#343630, Claudio Saavedra)
-
-2006-05-31  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkstock.sgml: Updates
-
-	* gtk/gtk-sections.txt: Updates
-
-	* gtk/Makefile.am (IGNORE_HFILES): Add some private
-	headers
-
-	* gtk/tmpl/gtkcellrendererspin.sgml: Fix a typo
-
-	* gtk/gtk-sections.txt: Update 
-
-2006-05-30  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add image-position api
-
-2006-05-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Updates
-
-2006-05-23  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Additions
-
-2006-05-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Additions
-
-2006-05-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkenums.sgml: Updates
-
-2006-05-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.1 ====
-
-2006-05-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkstock.sgml: 
-	* gtk/Makefile.am: Add fourth stock orientation. 
-
-2006-05-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tree_widget.sgml: Fix up example rendering. (#341855, Guillaume
-	Desmottes)
-
-2006-05-11  Emmanuele Bassi  <ebassi@cvs.gnome.org>
-
-	* gtk/tmpl/gtkrecentmanager.sgml: Update the error enum and the
-	gtk_recent_manager_add and gtk_recent_manager_add_full parameters.
-
-	* gtk/migrating-GtkRecentChooser.sgml: Mention
-	gtk_recent_manager_get_default() and update the code examples.
-
-2006-05-09  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_message_dialog_set_image.
-
-2006-05-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/question_index.sgml (reference): Update the internationalization
-	answer.  (#340951, Kristof Versant)
-
-2006-05-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.0 ===
-
-2006-04-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_status_icon_position_menu
-
-2006-04-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdk-sections.txt: Add gdk_screen_is_composited
-
-2006-04-24  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/Makefile.am: fix a typo.
-
-	* gtk/tmpl/gtkentry.sgml: Remove a duplicate entry.
-
-	* gtk/gtk-sections.txt: Fix a typo.
-
-	* gdk-pixbuf/gdk-pixbuf.sgml: No new symbols in 2.10.
-
-	* gdk/Makefile.am (IGNORE_HFILES): Add  directfb
-
-	* gtk/tmpl/gtkpapersize.sgml: Additions.
-
-	* gtk/gtk-sections.txt: Add new api.
-
-	* gtk/Makefile.am (HTML_IMAGES): Add new stock icons.
-
-	* gtk/tmpl/gtkstock.sgml: Document new stock icons
-
-	* gtk/gtk-docs.sgml: 
-	* gtk/gtk-sections.txt: Add a rich text section
-
-	* gtk/Makefile.am (IGNORE_HFILES): Add some more private headers.
-
-	* gtk/tmpl/gtkpreview.sgml: 
-	* gtk/tmpl/gtkrecentmanager.sgml: 
-	* gtk/tmpl/gtkprintoperation.sgml: 
-	* gtk/tmpl/gtkrecentchooser.sgml: 
-	* gtk/tmpl/gtkicontheme.sgml: Additions
-
-	* gtk/gtk-sections.txt: Remove GtkRecentChooserDefault
-
-2006-04-22  Emmanuele Bassi  <ebassi@cvs.gnome.org>
-
-	* gtk/tmpl/gtkrecentchoosermenu.sgml:
-	* gtk/tmpl/gtkrecentchooserwidget.sgml: Fix unclosed para tags.
-
-2006-04-21  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/Makefile.am:
-	* gtk/gtk-docs.sgml:
-	* gtk/gtk-sections.txt:
-	* gtk/gtk.types:
-	* gtk/images/pagesetupdialog.png:
-	* gtk/images/printdialog.png:
-	* gtk/tmpl/gtkpagesetup.sgml:
-	* gtk/tmpl/gtkpagesetupunixdialog.sgml:
-	* gtk/tmpl/gtkpapersize.sgml:
-	* gtk/tmpl/gtkprintcontext.sgml:
-	* gtk/tmpl/gtkprinter.sgml:
-	* gtk/tmpl/gtkprintjob.sgml:
-	* gtk/tmpl/gtkprintoperation.sgml:
-	* gtk/tmpl/gtkprintsettings.sgml:
-	* gtk/tmpl/gtkprintunixdialog.sgml:
-	* gtk/visual_index.xml:
-	Add docs for the printing support
-
-2006-04-17  Emmanuele Bassi  <ebassi@cvs.gnome.org>
-
-	* gtk/tmp/gtkicontheme.sgml: Fix the code of the look up example.
-
-2006-04-17  Emmanuele Bassi  <ebassi@cvs.gnome.org>
-
-	* gtk/tmpl/gtkrecent*.sgml: Add long descriptions.
-
-2006-04-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkrecent*.sgml: Add short descriptions
-
-	* gtk/migrating-GtkRecentChooser.sgml: Cosmetic fixes to 
-	examples.
-
-2006-04-04  Tor Lillqvist  <tml@novell.com>
-
-	* gdk/tmpl/threads.sgml: Mention that the Win32 backend should not
-	be used from multiple threads.
-
-2006-03-31  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Updates
-
-	* gtk/Makefile.am (IGNORE_HFILES): Updates
-
-	* gtk/images/recentchooserdialog.png: Shrink it.
-
-2006-03-30  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdk-sections.txt: Additions
-
-	* gtk/Makefile.am (HTML_IMAGES): add
-	recentchooserdialog.png
-	
-	* gtk/visual_index.xml: add GtkRecentChooserDialog
-	* gtk/images/recentchooserdialog.png: New image
-	* gtk/images/filechooser.png: Updated
-	
-2006-03-23  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkrc.sgml: Document <classname> in paths.
-
-2006-03-22  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Additions.
-
-	* gtk/tmpl/gtkcellrendererspin.sgml: 
-	* gtk/tmpl/gtkcellrendererprogress.sgml: 
-	* gtk/tmpl/gtkcellrenderercombo.sgml: 
-	* gtk/tmpl/gtkcellrendereraccel.sgml: Updates.
-
-	* gtk/gtk-sections.txt: Additions
-
-2006-03-20  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Updates
-
-2006-03-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/osx.sgml: 
-	* gtk/directfb.sgml: Add skeleton sections for new ports.
-	
-	* gtk/gtk-docs.sgml:
-	* gtk/Makefile.am: Integrate them.
-
-2006-03-10  Michael Natterer  <mitch@imendio.com>
-
-	* gtk/gtk-sections.txt: add gtk_entry_get,set_inner_border()
-
-2006-03-08  Michael Natterer  <mitch@imendio.com>
-
-	* gdk/gdk-sections.txt: added gdk_screen_get_active_window()
-	and gdk_screen_get_window_stack()
-
-2006-02-27  Federico Mena Quintero  <federico@novell.com>
-
-	* gtk/tmpl/gtkfontsel.sgml: Don't put the docs for
-	gtk_font_selection_{set,get}_font_name() here; put them in the code
-	instead.
-	Don't recommend the deprecated gtk_font_selection_get_font() as
-	the way to get the font back.
-
-	* gtk/tmpl/gtkfontseldlg.sgml: Don't put the docs for
-	gtk_font_selection_dialog_get_font_name() here; put them in the
-	code instead.
-	Don't recommend the deprecated
-	gtk_font_selection_dialog_get_font() as the way to get the font
-	back.
-
-2006-02-23  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt:
-	* gtk/tmpl/gtknotebook.sgml: Additions
-
-2006-02-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Additions.
-
-	* gdk/gdk-sections.txt: Additions.
-
-2006-02-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkrc.sgml: Updates
-
-2006-02-10  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkliststore.sgml: Add a section about
-	atomicity of insertions. (#329831, Milosz Derezynski)
-
-2006-02-03  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkmenushell.sgml: 
-	* gtk/tmpl/gtkmenu.sgml: Add deprecation notes.
-
-2006-01-31  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add new functions
-
-2006-01-30  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/visual_index.xml: Add GtkLinkButton
-
-	* gtk/images/link-button.png: New image.
-
-	* gtk/Makefile.am: Add new files.
-
-2006-01-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/visual_index.xml: Add GtkAssistant
-
-	* gtk/images/assistant.png: New image.
-
-	* gtk/tmpl/gtkassistant.sgml: More docs, by Carlos Garnacho.
-
-	* gtk/Makefile.am: Add new files.
-
-2006-01-28  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_link_button_set_uri_hook
-
-	* gtk/gtk-docs.sgml: 
-	* gtk/migrating-GtkAssistant.sgml: Add a migration guide
-	GnomeDruid --> GtkAssistant.  (Carlos Garnacho)
-
-2006-01-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gtk/tmpl/gtkfilechooser.sgml: Mention that ~ is also a default
-	key binding.
-
-2006-01-23  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: 
-	* gtk/gtk-docs.sgml: 
-	* gtk/gtk.types: Add GtkLinkButton docs
-
-2006-01-18  Matthias Clasen  <mclasen@redhat.com>
-	
-	* gtk/gtk-sections.txt:
-	* gtk/gtk-docs.sgml:
-	* gtk/gtk.types: Add GtkAssistant docs
-
-2006-01-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_radio_action_set_current_value
-
-2006-01-14  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/Makefile.am (HTML_IMAGES): 
-	* gtk/tmpl/gtkstock.sgml: Add rtl variants of indent
-	and unindent icons.
-
-2006-01-09  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_widget_get_action,
-	gtk_window_get_group
-
-2005-12-30  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdk-sections.txt: Add gdk_cairo_set_source_pixmap
-
-2005-12-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkmain.sgml: Add deprecation note to
-	gtk_exit()  (#325199, <20>var Arnfj<66>r<EFBFBD> Bjarmason)
-
-2005-12-20  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkcombo.sgml: Small additions
-
-2005-12-19  Matthias Clasen  <mclasen@redhat.com>
-	
-	* gdk-pixbuf/tmpl/module_interface.sgml: 
-	* gdk-pixbuf/gdk-pixbuf-sections.txt: 
-	* gdk-pixbuf/tmpl/animation.sgml: Small additions/fixes.
-
-	* gdk/tmpl/input.sgml: 
-	* gdk/tmpl/rgb.sgml: 
-	* gdk/tmpl/x_interaction.sgml: 
-	* gdk/tmpl/windows.sgml: Small additions/fixes
-
-	* gdk/Makefile.am (IGNORE_HFILES): Add quartz
-
-	* gdk/gdk-sections.txt: Add gdk_window_get_type_hint
-
-	* gtk/gtk-sections.txt: Add GtkStatusIcon so it gets
-	an object hierarchy.
-
-	* gtk/tmpl/gtkbutton.sgml: Remove inlined documentation
-
-	* gtk/tmpl/gtkstatusicon.sgml: Explicitly document GtkStatusIcon
-	as a non-widget.  (#324181, Maciej Katafiasz)
-
 2005-11-28  Matthias Clasen  <mclasen@redhat.com>
 	
 	* gtk/tmpl/gtkobject.sgml: Update docs on floating references
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
@@ -146,6 +146,7 @@ GDK_PIXBUF_SIMPLE_ANIM_CLASS
 GDK_IS_PIXBUF_SIMPLE_ANIM_CLASS
 GDK_TYPE_PIXBUF_SIMPLE_ANIM
 GDK_PIXBUF_SIMPLE_ANIM
+GdkPixbufSimpleAnimClass

 <SUBSECTION Private>
 gdk_pixbuf_non_anim_new
@@ -155,7 +156,6 @@ gdk_pixbuf_animation_iter_get_type

 gdk_pixbuf_simple_anim_get_type
 gdk_pixbuf_simple_anim_iter_get_type
-GdkPixbufSimpleAnimClass
 </SECTION>

 <SECTION>
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
@@ -148,6 +148,9 @@
  <index role="2.8">
    <title>Index of new symbols in 2.8</title>
  </index>  
+  <index role="2.10">
+    <title>Index of new symbols in 2.10</title>
+  </index>  

  &Porting-From-Imlib;

--- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
@@ -25,14 +25,13 @@ Animated images.

 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
 <para>
-And opaque struct representing an animation.
+
 </para>


 <!-- ##### STRUCT GdkPixbufAnimationIter ##### -->
 <para>
-And opaque struct representing an iterator which points to a
-certain position in an animation.
+
 </para>


@@ -148,7 +147,7 @@ certain position in an animation.

 <!-- ##### STRUCT GdkPixbufSimpleAnim ##### -->
 <para>
-An
+
 </para>


--- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
@@ -95,6 +95,9 @@ Creating a pixbuf from image data that is already in memory.
@copy_pixels: 
@error: 
@Returns: 
+<!-- # Unused Parameters # -->
+@inline_pixbuf: 
+@length: 


 <!-- ##### FUNCTION gdk_pixbuf_new_subpixbuf ##### -->
--- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
@@ -66,6 +66,8 @@ End:
@preserve_aspect_ratio: 
@error: 
@Returns: 
+<!-- # Unused Parameters # -->
+@keep_aspect_ratio: 


 <!-- ##### FUNCTION gdk_pixbuf_get_file_info ##### -->
--- a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
@@ -354,7 +354,7 @@ Modules supporting animations must derive a type from
 virtual functions.
 </para>

-@parent_class: the parent class
+@parent_class: 
@is_static_image: returns whether the given animation is just a static image.
@get_static_image: returns a static image representing the given animation.
@get_size: fills @width and @height with the frame size of the animation.
@@ -367,7 +367,7 @@ Modules supporting animations must derive a type from
 virtual functions.
 </para>

-@parent_class: the parent class
+@parent_class: 
@get_delay_time: returns the time in milliseconds that the current frame 
  should be shown.
@get_pixbuf: returns the current frame.
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -32,9 +32,7 @@ IGNORE_HFILES=			\
 	linux-fb 		\
 	nanox 			\
 	win32 			\
-	directfb		\
-	x11			\
-	quartz
+	x11

 # Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=			\
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -152,8 +152,6 @@ gdk_display_supports_selection_notification
 gdk_display_request_selection_notification
 gdk_display_supports_clipboard_persistence
 gdk_display_store_clipboard
-gdk_display_supports_shapes
-gdk_display_supports_input_shapes
 <SUBSECTION Standard>
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
@@ -201,7 +199,6 @@ gdk_screen_get_rgb_colormap
 gdk_screen_get_rgb_visual
 gdk_screen_get_rgba_colormap
 gdk_screen_get_rgba_visual
-gdk_screen_is_composited
 gdk_screen_get_root_window
 gdk_screen_get_display
 gdk_screen_get_number
@@ -222,8 +219,6 @@ gdk_screen_get_font_options
 gdk_screen_set_font_options
 gdk_screen_get_resolution
 gdk_screen_set_resolution
-gdk_screen_get_active_window
-gdk_screen_get_window_stack
 <SUBSECTION Spawning>
 gdk_spawn_on_screen
 gdk_spawn_on_screen_with_pipes
@@ -699,10 +694,6 @@ gdk_window_shape_combine_mask
 gdk_window_shape_combine_region
 gdk_window_set_child_shapes
 gdk_window_merge_child_shapes
-gdk_window_input_shape_combine_mask
-gdk_window_input_shape_combine_region
-gdk_window_set_child_input_shapes
-gdk_window_merge_child_input_shapes
 gdk_window_set_static_gravities
 gdk_window_set_hints
 gdk_window_set_title
@@ -717,7 +708,6 @@ gdk_window_set_geometry_hints
 gdk_window_set_icon_list
 gdk_window_set_modal_hint
 gdk_window_set_type_hint
-gdk_window_get_type_hint
 gdk_window_set_skip_taskbar_hint
 gdk_window_set_skip_pager_hint
 gdk_window_set_urgency_hint
@@ -885,7 +875,6 @@ GdkPangoRendererPrivate
 gdk_cairo_create
 gdk_cairo_set_source_color
 gdk_cairo_set_source_pixbuf
-gdk_cairo_set_source_pixmap
 gdk_cairo_rectangle
 gdk_cairo_region
 </SECTION>
@@ -1255,7 +1244,6 @@ gdkx_visual_get
 gdkx_colormap_get
 gdk_pixmap_foreign_new
 gdk_pixmap_foreign_new_for_display
-gdk_pixmap_foreign_new_for_screen
 gdk_window_foreign_new
 gdk_window_foreign_new_for_display
 gdk_xid_table_lookup
--- a/docs/reference/gdk/tmpl/cairo_interaction.sgml
+++ b/docs/reference/gdk/tmpl/cairo_interaction.sgml
@@ -56,17 +56,6 @@ Cairo paths and to use pixbufs as sources for drawing operations.
@pixbuf_y: 


-<!-- ##### FUNCTION gdk_cairo_set_source_pixmap ##### -->
-<para>
-
-</para>
-
-@cr: 
-@pixmap: 
-@pixmap_x: 
-@pixmap_y: 
-
-
 <!-- ##### FUNCTION gdk_cairo_rectangle ##### -->
 <para>

--- a/docs/reference/gdk/tmpl/events.sgml
+++ b/docs/reference/gdk/tmpl/events.sgml
@@ -295,6 +295,8 @@ gdk_event_handler_set().
@event: 
@winid: 
@Returns: 
+<!-- # Unused Parameters # -->
+@xid: 


 <!-- ##### FUNCTION gdk_event_send_client_message_for_display ##### -->
@@ -306,6 +308,8 @@ gdk_event_handler_set().
@event: 
@winid: 
@Returns: 
+<!-- # Unused Parameters # -->
+@xid: 


 <!-- ##### FUNCTION gdk_event_send_clientmessage_toall ##### -->
--- a/docs/reference/gdk/tmpl/gdkdisplay.sgml
+++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml
@@ -378,21 +378,3 @@ Applications should never have any reason to use this facility
@n_targets: 


-<!-- ##### FUNCTION gdk_display_supports_shapes ##### -->
-<para>
-
-</para>
-
-@display: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_display_supports_input_shapes ##### -->
-<para>
-
-</para>
-
-@display: 
-@Returns: 
-
-
--- a/docs/reference/gdk/tmpl/gdkscreen.sgml
+++ b/docs/reference/gdk/tmpl/gdkscreen.sgml
@@ -34,13 +34,6 @@ when GDK gets multihead support.

@Since: 2.2

-<!-- ##### SIGNAL GdkScreen::composited-changed ##### -->
-<para>
-
-</para>
-
-@gdkscreen: the object which received the signal.
-
 <!-- ##### SIGNAL GdkScreen::size-changed ##### -->
 <para>

@@ -138,15 +131,6 @@ when GDK gets multihead support.
@Returns: 


-<!-- ##### FUNCTION gdk_screen_is_composited ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_screen_get_root_window ##### -->
 <para>

@@ -254,6 +238,8 @@ when GDK gets multihead support.
@screen: 
@monitor_num: 
@dest: 
+<!-- # Unused Parameters # -->
+@Returns: 


 <!-- ##### FUNCTION gdk_screen_get_monitor_at_point ##### -->
@@ -275,6 +261,8 @@ when GDK gets multihead support.
@screen: 
@window: 
@Returns: 
+<!-- # Unused Parameters # -->
+@anid: 


 <!-- ##### FUNCTION gdk_screen_broadcast_client_message ##### -->
@@ -333,24 +321,6 @@ when GDK gets multihead support.
@dpi: 


-<!-- ##### FUNCTION gdk_screen_get_active_window ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_screen_get_window_stack ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_spawn_on_screen ##### -->
 <para>

--- a/docs/reference/gdk/tmpl/input.sgml
+++ b/docs/reference/gdk/tmpl/input.sgml
@@ -57,14 +57,35 @@ an input callback will be triggered. The three members
 of this enumeration correspond to the @readfds, 
@writefds, and @exceptfds arguments to the 
 <function>select</function> system call.
-</para>

-@GDK_INPUT_READ: the file descriptor has become available for reading.
+<informaltable pgwide="1" frame="none" role="enum">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
+<tbody>
+
+<row>
+<entry>GDK_INPUT_READ</entry>
+<entry>the file descriptor has become available for reading.
 (Or, as is standard in Unix, a socket or pipe was closed
 at the other end; this is the case if a subsequent read
-on the file descriptor returns a count of zero.)
-@GDK_INPUT_WRITE: the file descriptor has become available for writing.
-@GDK_INPUT_EXCEPTION: an exception was raised on the file descriptor.
+on the file descriptor returns a count of zero.)</entry>
+</row>
+
+<row>
+<entry>GDK_INPUT_WRITE</entry>
+<entry>the file descriptor has become available for writing.</entry>
+</row>
+
+<row>
+<entry>GDK_INPUT_EXCEPTION</entry>
+<entry>an exception was raised on the file descriptor.</entry>
+</row>
+
+</tbody></tgroup></informaltable>
+</para>
+
+@GDK_INPUT_READ: 
+@GDK_INPUT_WRITE: 
+@GDK_INPUT_EXCEPTION: 

 <!-- ##### USER_FUNCTION GdkInputFunction ##### -->
 <para>
--- a/docs/reference/gdk/tmpl/keys.sgml
+++ b/docs/reference/gdk/tmpl/keys.sgml
@@ -167,6 +167,8 @@ be mapped to a keyval.
@level: 
@consumed_modifiers: 
@Returns: 
+<!-- # Unused Parameters # -->
+@unused_modifiers: 


 <!-- ##### FUNCTION gdk_keymap_get_entries_for_keyval ##### -->
--- a/docs/reference/gdk/tmpl/regions.sgml
+++ b/docs/reference/gdk/tmpl/regions.sgml
@@ -56,48 +56,54 @@ Defines the position and size of a rectangle.

 <!-- ##### FUNCTION gdk_rectangle_intersect ##### -->
 <para>
-
+Calculates the intersection of two rectangles.
 </para>

-@src1: 
-@src2: 
-@dest: 
-@Returns: 
+@src1: a #GdkRectangle.
+@src2: a #GdkRectangle.
+@dest: the intersection of @src1 and @src2.
+@Returns: %TRUE if the rectangles intersect.


 <!-- ##### FUNCTION gdk_rectangle_union ##### -->
 <para>
-
+Calculates the union of two rectangles.
+The union of rectangles @src1 and @src2 is the smallest rectangle which
+includes both @src1 and @src2 within it.
 </para>

-@src1: 
-@src2: 
-@dest: 
+@src1: a #GdkRectangle.
+@src2: a #GdkRectangle.
+@dest: the union of @src1 and @src2.


 <!-- ##### STRUCT GdkRegion ##### -->
 <para>
 A GdkRegion represents a set of pixels on the screen.
+The only user-visible field of the structure is the user_data member, which
+can be used to attach arbitrary data to the #GdkRegion.
 </para>


 <!-- ##### FUNCTION gdk_region_new ##### -->
 <para>
-
+Creates a new empty #GdkRegion.
 </para>

-@Returns: 
+@Returns: a new empty #GdkRegion.


 <!-- ##### FUNCTION gdk_region_polygon ##### -->
 <para>
+Creates a new #GdkRegion using the polygon defined by a number of points.

 </para>

-@points: 
-@npoints: 
-@fill_rule: 
-@Returns: 
+@points: an array of #GdkPoint structs.
+@npoints: the number of elements in the @points array.
+@fill_rule: specifies which pixels are included in the region when the polygon
+overlaps itself.
+@Returns: a new #GdkRegion based on the given polygon.


 <!-- ##### ENUM GdkFillRule ##### -->
@@ -131,19 +137,19 @@ included in the region, while areas overlapped an even number of times are not.

 <!-- ##### FUNCTION gdk_region_destroy ##### -->
 <para>
-
+Destroys a #GdkRegion.
 </para>

-@region: 
+@region: a #GdkRegion.


 <!-- ##### FUNCTION gdk_region_get_clipbox ##### -->
 <para>
-
+Returns the smallest rectangle which includes the entire #GdkRegion.
 </para>

-@region: 
-@rectangle: 
+@region: a #GdkRegion.
+@rectangle: returns the smallest rectangle which includes all of @region.


 <!-- ##### FUNCTION gdk_region_get_rectangles ##### -->
@@ -158,42 +164,44 @@ included in the region, while areas overlapped an even number of times are not.

 <!-- ##### FUNCTION gdk_region_empty ##### -->
 <para>
-
+Returns %TRUE if the #GdkRegion is empty.
 </para>

-@region: 
-@Returns: 
+@region: a #GdkRegion.
+@Returns: %TRUE if @region is empty.


 <!-- ##### FUNCTION gdk_region_equal ##### -->
 <para>
-
+Returns %TRUE if the two regions are the same.
 </para>

-@region1: 
-@region2: 
-@Returns: 
+@region1: a #GdkRegion.
+@region2: a #GdkRegion.
+@Returns: %TRUE if @region1 and @region2 are equal.


 <!-- ##### FUNCTION gdk_region_point_in ##### -->
 <para>
-
+Returns %TRUE if a point is in a region.
 </para>

-@region: 
-@x: 
-@y: 
-@Returns: 
+@region: a #GdkRegion.
+@x: the x coordinate of a point.
+@y: the y coordinate of a point.
+@Returns: %TRUE if the point is in @region.


 <!-- ##### FUNCTION gdk_region_rect_in ##### -->
 <para>
-
+Tests whether a rectangle is within a region.
 </para>

-@region: 
-@rectangle: 
-@Returns: 
+@region: a #GdkRegion.
+@rect: a #GdkRectangle.
+@Returns: %GDK_OVERLAP_RECTANGLE_IN, %GDK_OVERLAP_RECTANGLE_OUT, or
+%GDK_OVERLAP_RECTANGLE_PART, depending on whether the rectangle is inside,
+outside, or partly inside the #GdkRegion, respectively.


 <!-- ##### ENUM GdkOverlapType ##### -->
@@ -207,22 +215,23 @@ Specifies the possible values returned by gdk_region_rect_in().

 <!-- ##### FUNCTION gdk_region_offset ##### -->
 <para>
-
+Moves a region the specified distance.
 </para>

-@region: 
-@dx: 
-@dy: 
+@region: a #GdkRegion.
+@dx: the distance to move the region horizontally.
+@dy: the distance to move the region vertically.


 <!-- ##### FUNCTION gdk_region_shrink ##### -->
 <para>
-
+Resizes a region by the specified amount.
+Positive values shrink the region. Negative values expand it.
 </para>

-@region: 
-@dx: 
-@dy: 
+@region: a #GdkRegion.
+@dx: the number of pixels to shrink the region horizontally.
+@dy: the number of pixels to shrink the region vertically.


 <!-- ##### FUNCTION gdk_region_union_with_rect ##### -->
@@ -289,14 +298,15 @@ gdk_region_spans_intersect_foreach().

 <!-- ##### FUNCTION gdk_region_spans_intersect_foreach ##### -->
 <para>
-
+Calls a function on each span in the intersection of @region and
+@spans.
 </para>

-@region: 
-@spans: 
-@n_spans: 
-@sorted: 
-@function: 
-@data: 
+@region: a #GdkRegion.
+@spans: an array of #GdkSpans.
+@n_spans: the length of @spans.
+@sorted: %TRUE if @spans is sorted wrt. the y coordinate.
+@function: function to call on each span in the intersection.
+@data: data to pass to @function.


--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/docs/reference/gdk/tmpl/rgb.sgml
@@ -278,18 +278,40 @@ start of the next.
 <!-- ##### ENUM GdkRgbDither ##### -->
 <para>
 Selects whether or not GdkRGB applies dithering
-to the image on display. 
+to the image on display. There are three values:
 </para>

+<itemizedlist>
+
+<listitem>
+<para>
+%GDK_RGB_DITHER_NONE: Never use dithering.
+</para>
+</listitem>
+
+<listitem>
+<para>
+%GDK_RGB_DITHER_NORMAL: Use dithering in 8 bits per pixel (and below)
+only.
+</para>
+</listitem>
+
+<listitem>
+<para>
+%GDK_RGB_DITHER_MAX: Use dithering in 16 bits per pixel and below.
+</para>
+</listitem>
+
+</itemizedlist>
+
 <para>
 Since GdkRGB currently only handles images with 8 bits per component,
 dithering on 24 bit per pixel displays is a moot point.
 </para>

-@GDK_RGB_DITHER_NONE: Never use dithering.
-@GDK_RGB_DITHER_NORMAL: Use dithering in 8 bits per pixel (and below)
-only.
-@GDK_RGB_DITHER_MAX: Use dithering in 16 bits per pixel and below.
+@GDK_RGB_DITHER_NONE: 
+@GDK_RGB_DITHER_NORMAL: 
+@GDK_RGB_DITHER_MAX: 

 <!-- ##### FUNCTION gdk_rgb_cmap_new ##### -->
 <para>
--- a/docs/reference/gdk/tmpl/threads.sgml
+++ b/docs/reference/gdk/tmpl/threads.sgml
@@ -22,11 +22,6 @@ which protects all use of GTK+. That is, only one thread can use GTK+
 at any given time.
 </para>
 <para>
-Unfortunately the above holds with the X11 backend only. With the
-Win32 backend, GDK calls should not be attempted from multiple threads
-at all.
-</para>
-<para>
 You must call g_thread_init() and gdk_threads_init() before executing
 any other GTK+ or GDK functions in a threaded GTK+ program.
 </para>
@@ -295,7 +290,8 @@ Leaves a critical region begun with gdk_threads_enter().
 <!-- ##### VARIABLE gdk_threads_mutex ##### -->
 <para>
 The #GMutex used to implement the critical region for
-gdk_threads_enter()/gdk_threads_leave(). 
+gdk_threads_enter()/gdk_threads_leave(). This variable should not be
+used directly &mdash; consider it private.
 </para>


--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -141,7 +141,8 @@ ratio.
 </para>

@min_width: minimum width of window (or -1 to use requisition, with #GtkWindow only)
-@min_height: minimum height of window (or -1 to use requisition, with #GtkWindow only)
+@min_height minimum height of window (or -1 to use requisition, with #GtkWindow only)
+@min_height: 
@max_width: maximum width of window (or -1 to use requisition, with #GtkWindow only)
@max_height: maximum height of window (or -1 to use requisition, with #GtkWindow only)
@base_width: allowed window widths are @base_width + @width_inc * N where N is any integer (-1 allowed with #GtkWindow)
@@ -211,12 +212,6 @@ window types.
@GDK_WINDOW_TYPE_HINT_DOCK: Used for creating dock or panel windows.
@GDK_WINDOW_TYPE_HINT_DESKTOP: Used for creating the desktop background 
 window.
-@GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU: 
-@GDK_WINDOW_TYPE_HINT_POPUP_MENU: 
-@GDK_WINDOW_TYPE_HINT_TOOLTIP: 
-@GDK_WINDOW_TYPE_HINT_NOTIFICATION: 
-@GDK_WINDOW_TYPE_HINT_COMBO: 
-@GDK_WINDOW_TYPE_HINT_DND: 

 <!-- ##### STRUCT GdkWindowAttr ##### -->
 <para>
@@ -902,44 +897,6 @@ backend, <type>MSG</type>s for Win32).
@window: 


-<!-- ##### FUNCTION gdk_window_input_shape_combine_mask ##### -->
-<para>
-
-</para>
-
-@window: 
-@mask: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION gdk_window_input_shape_combine_region ##### -->
-<para>
-
-</para>
-
-@window: 
-@shape_region: 
-@offset_x: 
-@offset_y: 
-
-
-<!-- ##### FUNCTION gdk_window_set_child_input_shapes ##### -->
-<para>
-
-</para>
-
-@window: 
-
-
-<!-- ##### FUNCTION gdk_window_merge_child_input_shapes ##### -->
-<para>
-
-</para>
-
-@window: 
-
-
 <!-- ##### FUNCTION gdk_window_set_static_gravities ##### -->
 <para>

@@ -1077,15 +1034,6 @@ Deprecated equivalent to gdk_drawable_set_colormap()
@hint: 


-<!-- ##### FUNCTION gdk_window_get_type_hint ##### -->
-<para>
-
-</para>
-
-@window: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_window_set_skip_taskbar_hint ##### -->
 <para>

--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -280,19 +280,6 @@ Another name for GDK_DRAWABLE_XID().
@Returns: 


-<!-- ##### FUNCTION gdk_pixmap_foreign_new_for_screen ##### -->
-<para>
-
-</para>
-
-@screen: 
-@anid: 
-@width: 
-@height: 
-@depth: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_window_foreign_new ##### -->
 <para>

@@ -373,7 +360,7 @@ Obtains the #GdkFont for the given Xlib font ID, or %NULL if no #GdkFont has
 been created for @xid.
 </para>

-@xid: an Xlib font ID
+@xid: 


 <!-- ##### MACRO gdk_font_lookup_for_display ##### -->
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -33,7 +33,6 @@ IGNORE_HFILES=				\
 	gtkfilechooserembed.h		\
 	gtkfilechooserentry.h		\
 	gtkfilechooserprivate.h		\
-	gtkfilechoosersettings.h	\
 	gtkfilechooserutils.h		\
 	gtkfilesystem.h			\
 	gtkfilesystemmodel.h		\
@@ -49,19 +48,8 @@ IGNORE_HFILES=				\
 	gtkmnemonichash.h		\
 	gtkpathbar.h			\
 	gtkplugprivate.h		\
-	gtkprintbackend.h		\
-	gtkprinteroption.h		\
-	gtkprinteroptionset.h		\
-	gtkprinteroptionwidget.h	\
-	gtkprinter-private.h		\
-	gtkprint-win32.h		\
-	gtkprintutils.h			\
-	gtkprintoperation-private.h	\
 	gtkprivate.h			\
 	gtkrbtree.h			\
-	gtkrecentchooserdefault.h	\
-	gtkrecentchooserutils.h		\
-	gtkrecentchooserprivate.h	\
 	gtksequence.h			\
 	gtksocketprivate.h		\
 	gtktreedatalist.h		\
@@ -76,11 +64,9 @@ IGNORE_HFILES=				\
 	gtktexttypes.h			\
 	gtktextutil.h			\
 	gtktoggleactionprivate.h	\
-	gtktrayicon.h			\
 	gtktypebuiltins.h		\
 	gtkxembed.h			\
 	gtkwin32embed.h			\
-	gtkwin32embedwidget.h		\
 	xdgmime				\
 	xembed.h

@@ -111,7 +97,6 @@ content_files =					\
 	changes-1.2.sgml			\
 	changes-2.0.sgml			\
 	compiling.sgml				\
-	directfb.sgml				\
 	framebuffer.sgml			\
 	glossary.xml				\
 	migrating-checklist.sgml		\
@@ -121,11 +106,7 @@ content_files =					\
 	migrating-GtkIconView.sgml		\
 	migrating-GtkAboutDialog.sgml		\
 	migrating-GtkColorButton.sgml		\
-	migrating-GtkAssistant.sgml		\
-	migrating-GtkRecentChooser.sgml 	\
-	migrating-GtkLinkButton.sgml		\
 	objects_grouped.sgml			\
-	osx.sgml				\
 	question_index.sgml			\
 	resources.sgml				\
 	text_widget.sgml			\
@@ -145,9 +126,6 @@ expand_content_files = 				\
 	migrating-GtkIconView.sgml		\
 	migrating-GtkAboutDialog.sgml		\
 	migrating-GtkColorButton.sgml		\
-	migrating-GtkAssistant.sgml		\
-	migrating-GtkRecentChooser.sgml 	\
-	migrating-GtkLinkButton.sgml		\
 	tree_widget.sgml			\
 	text_widget.sgml			\
 	question_index.sgml
@@ -198,10 +176,8 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-help.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-home.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-index.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-indent-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-indent-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-unindent-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-unindent-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-indent.png			\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-unindent.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-italic.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-ltr.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-rtl.png		\
@@ -214,10 +190,6 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/20/gtk-no.png			\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-ok.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-open.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-landscape.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-portrait.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-landscape.png \
-	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-portrait.png \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-paste.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-preferences.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-print.png			\
@@ -269,7 +241,6 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-leave-fullscreen.png	\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-info.png			\
 	$(srcdir)/images/accel-label.png				\
-	$(srcdir)/images/assistant.png					\
 	$(srcdir)/images/button.png					\
 	$(srcdir)/images/check-button.png				\
 	$(srcdir)/images/color-button.png				\
@@ -285,18 +256,14 @@ HTML_IMAGES = \
 	$(srcdir)/images/icon-view.png					\
 	$(srcdir)/images/image.png					\
 	$(srcdir)/images/label.png					\
-	$(srcdir)/images/link-button.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/pagesetupdialog.png				\
-	$(srcdir)/images/printdialog.png				\
 	$(srcdir)/images/progressbar.png				\
 	$(srcdir)/images/radio-group.png				\
-	$(srcdir)/images/recentchooserdialog.png			\
 	$(srcdir)/images/scales.png					\
 	$(srcdir)/images/scrolledwindow.png				\
 	$(srcdir)/images/separator.png					\
--- a/docs/reference/gtk/directfb.sgml
+++ b/docs/reference/gtk/directfb.sgml
@@ -1,105 +0,0 @@
-<refentry id="gtk-directfb">
-<refmeta>
-<refentrytitle>Using GTK+ on DirectFB</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GTK Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>Using GTK+ on DirectFB</refname>
-<refpurpose>
-DirectFB-specific aspects of using GTK+
-</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Using GTK+ on DirectFB</title>
-
-<para>
-The DirectFB port of GTK+ is an implementation of GDK (and therefore GTK+) 
-on top of the <ulink url="http://www.directfb.org">DirectFB</ulink> 
-libraries.
-</para>
-
-<para>
-Like the obsolete linux-fb port of GTK+, it runs on the Linux framebuffer,
-but the DirectFB libraries provide additional features like hardware graphics 
-acceleration, input device handling and abstraction and an integrated windowing 
-system.
-</para>
-
-<refsect2><title>Build requirements</title>
-
-<para>
-Beyond the usual GTK+ build requirements, the DirectFB backend (obviously) needs 
-the DirectFB libraries (at least 0.9.21) and Cairo compiled with DirectFB support.
-</para>
-
-</refsect2>
-
-<!--
-  FIXME: it seems most of the options listed in _gdk_windowing_args
-  are ignored, and they need to be described by somebody who knows 
-  what they are supposed to do...
-
-<refsect2><title>DirectFB-specific commandline options</title>
-
-<para>
-The DirectFB GDB backend can be influenced with some additional 
-command line arguments.
-</para>
-
-<formalpara>
-  <title><systemitem>dfb-help</systemitem></title>
-  <para>
-    Display help for DirectFB-specific commandline options.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>dfb=<replaceable>value</replaceable></systemitem></title>
-  <para>
-    Possible values: sdl, system. 
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>disable-aa-fonts=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    If <replaceable>number</replaceable> is 1, disable antialising for fonts.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>argb-font=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    If <replaceable>number</replaceable> is 1, enable ARGB fonts.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>transparent-unfocused=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    If <replaceable>number</replaceable> is 1, make unfocused windows transparent.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>glyph-surface-cache=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    Set the size of the glyph surface cache. The default value is 8.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><systemitem>enable-color-keyring=<replaceable>number</replaceable></systemitem></title>
-  <para>
-    If <replaceable>number</replaceable> is 1, turn on the color keyring.
-  </para>
-</formalpara>
-
-->
-
-</refsect1>
-
-</refentry>
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -9,7 +9,6 @@
 <!ENTITY GtkAlignment SYSTEM "xml/gtkalignment.xml">
 <!ENTITY GtkArrow SYSTEM "xml/gtkarrow.xml">
 <!ENTITY GtkAspectFrame SYSTEM "xml/gtkaspectframe.xml">
-<!ENTITY GtkAssistant SYSTEM "xml/gtkassistant.xml">
 <!ENTITY GtkButtonBox SYSTEM "xml/gtkbbox.xml">
 <!ENTITY GtkBin SYSTEM "xml/gtkbin.xml">
 <!ENTITY GtkBox SYSTEM "xml/gtkbox.xml">
@@ -67,7 +66,6 @@
 <!ENTITY GtkItemFactory SYSTEM "xml/gtkitemfactory.xml">
 <!ENTITY GtkLabel SYSTEM "xml/gtklabel.xml">
 <!ENTITY GtkLayout SYSTEM "xml/gtklayout.xml">
-<!ENTITY GtkLinkButton SYSTEM "xml/gtklinkbutton.xml">
 <!ENTITY GtkList SYSTEM "xml/gtklist.xml">
 <!ENTITY GtkListItem SYSTEM "xml/gtklistitem.xml">
 <!ENTITY GtkMenu SYSTEM "xml/gtkmenu.xml">
@@ -84,15 +82,6 @@
 <!ENTITY GtkPixmap SYSTEM "xml/gtkpixmap.xml">
 <!ENTITY GtkPlug SYSTEM "xml/gtkplug.xml">
 <!ENTITY GtkPreview SYSTEM "xml/gtkpreview.xml">
-<!ENTITY GtkPrintOperation SYSTEM "xml/gtkprintoperation.xml">
-<!ENTITY GtkPrintContext SYSTEM "xml/gtkprintcontext.xml">
-<!ENTITY GtkPrintSettings SYSTEM "xml/gtkprintsettings.xml">
-<!ENTITY GtkPageSetup SYSTEM "xml/gtkpagesetup.xml">
-<!ENTITY GtkPaperSize SYSTEM "xml/gtkpapersize.xml">
-<!ENTITY GtkPrinter SYSTEM "xml/gtkprinter.xml">
-<!ENTITY GtkPrintJob SYSTEM "xml/gtkprintjob.xml">
-<!ENTITY GtkPrintUnixDialog SYSTEM "xml/gtkprintunixdialog.xml">
-<!ENTITY GtkPageSetupUnixDialog SYSTEM "xml/gtkpagesetupunixdialog.xml">
 <!ENTITY GtkProgress SYSTEM "xml/gtkprogress.xml">
 <!ENTITY GtkProgressBar SYSTEM "xml/gtkprogressbar.xml">
 <!ENTITY GtkRadioAction SYSTEM "xml/gtkradioaction.xml">
@@ -100,12 +89,6 @@
 <!ENTITY GtkRadioMenuItem SYSTEM "xml/gtkradiomenuitem.xml">
 <!ENTITY GtkRadioToolButton SYSTEM "xml/gtkradiotoolbutton.xml">
 <!ENTITY GtkRange SYSTEM "xml/gtkrange.xml">
-<!ENTITY GtkRecentChooser SYSTEM "xml/gtkrecentchooser.xml">
-<!ENTITY GtkRecentChooserDialog SYSTEM "xml/gtkrecentchooserdialog.xml">
-<!ENTITY GtkRecentChooserMenu SYSTEM "xml/gtkrecentchoosermenu.xml">
-<!ENTITY GtkRecentChooserWidget SYSTEM "xml/gtkrecentchooserwidget.xml">
-<!ENTITY GtkRecentFilter SYSTEM "xml/gtkrecentfilter.xml">
-<!ENTITY GtkRecentManager SYSTEM "xml/gtkrecentmanager.xml">
 <!ENTITY GtkRuler SYSTEM "xml/gtkruler.xml">
 <!ENTITY GtkScale SYSTEM "xml/gtkscale.xml">
 <!ENTITY GtkScrollbar SYSTEM "xml/gtkscrollbar.xml">
@@ -153,7 +136,6 @@
 <!ENTITY GtkCellRendererCombo SYSTEM "xml/gtkcellrenderercombo.xml">
 <!ENTITY GtkCellRendererPixbuf SYSTEM "xml/gtkcellrendererpixbuf.xml">
 <!ENTITY GtkCellRendererProgress SYSTEM "xml/gtkcellrendererprogress.xml">
-<!ENTITY GtkCellRendererSpin SYSTEM "xml/gtkcellrendererspin.xml">
 <!ENTITY GtkCellRendererText SYSTEM "xml/gtkcellrenderertext.xml">
 <!ENTITY GtkCellRendererToggle SYSTEM "xml/gtkcellrenderertoggle.xml">
 <!ENTITY GtkCellView SYSTEM "xml/gtkcellview.xml">
@@ -204,22 +186,16 @@
 <!ENTITY gtk-Windows SYSTEM "windows.sgml">
 <!ENTITY gtk-Framebuffer SYSTEM "framebuffer.sgml">
 <!ENTITY gtk-X11 SYSTEM "x11.sgml">
-<!ENTITY gtk-OSX SYSTEM "osx.sgml">
-<!ENTITY gtk-DirectFB SYSTEM "directfb.sgml">
 <!ENTITY gtk-Questions SYSTEM "xml/question_index.sgml">
 <!ENTITY gtk-Changes-1-2 SYSTEM "changes-1.2.sgml">
 <!ENTITY gtk-Changes-2-0 SYSTEM "changes-2.0.sgml">
 <!ENTITY gtk-migrating-checklist SYSTEM "xml/migrating-checklist.sgml">
-<!ENTITY gtk-migrating-Cairo SYSTEM "xml/migrating-Cairo.sgml">
 <!ENTITY gtk-migrating-GtkFileChooser SYSTEM "xml/migrating-GtkFileChooser.sgml">
 <!ENTITY gtk-migrating-GtkAction SYSTEM "xml/migrating-GtkAction.sgml">
 <!ENTITY gtk-migrating-GtkComboBox SYSTEM "xml/migrating-GtkComboBox.sgml">
 <!ENTITY gtk-migrating-GtkIconView SYSTEM "xml/migrating-GtkIconView.sgml">
 <!ENTITY gtk-migrating-GtkAboutDialog SYSTEM "xml/migrating-GtkAboutDialog.sgml">
 <!ENTITY gtk-migrating-GtkColorButton SYSTEM "xml/migrating-GtkColorButton.sgml">
-<!ENTITY gtk-migrating-GtkAssistant SYSTEM "xml/migrating-GtkAssistant.sgml">
-<!ENTITY gtk-migrating-GtkRecentChooser SYSTEM "xml/migrating-GtkRecentChooser.sgml">
-<!ENTITY gtk-migrating-GtkLinkButton SYSTEM "xml/migrating-GtkLinkButton.sgml">
 <!ENTITY 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">
@@ -320,11 +296,9 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
    &gtk-Building;
    &gtk-Compiling;
    &gtk-Running;
-    &gtk-X11;
    &gtk-Windows;
-    &gtk-OSX;
-    &gtk-DirectFB;
    &gtk-Framebuffer;
+    &gtk-X11;
    &gtk-Resources;
    &gtk-Questions;
  </part>
@@ -373,7 +347,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
        &GtkWindow;
        &GtkWindowGroup;
        &GtkAboutDialog;
-        &GtkAssistant;
    </chapter>

    <chapter id="DisplayWidgets">
@@ -392,7 +365,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
        &GtkCheckButton;
        &GtkRadioButton;
        &GtkToggleButton;
-        &GtkLinkButton;
    </chapter>

    <chapter id="NumericEntry">
@@ -436,7 +408,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
        &GtkCellRendererCombo;
        &GtkCellRendererPixbuf;
        &GtkCellRendererProgress;
-        &GtkCellRendererSpin;
        &GtkCellRendererText;
        &GtkCellRendererToggle;
        &GtkListStore;
@@ -522,19 +493,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
        &GtkScrolledWindow;
    </chapter>

-    <chapter id="Printing">
-      <title>Printing</title>
-      &GtkPrintOperation;
-      &GtkPrintContext;
-      &GtkPrintSettings;
-      &GtkPageSetup;
-      &GtkPaperSize;
-      &GtkPrinter;
-      &GtkPrintJob; 
-      &GtkPrintUnixDialog;
-      &GtkPageSetupUnixDialog;
-    </chapter>
-
    <chapter id="MiscObjects">
      <title>Miscellaneous</title>
        &GtkAdjustment;
@@ -584,16 +542,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
        &GtkVRuler;
    </chapter>

-    <chapter id="RecentDocuments">
-      <title>Recently Used Documents</title>
-      &GtkRecentManager;
-      &GtkRecentChooser;
-      &GtkRecentChooserDialog;
-      &GtkRecentChooserMenu;
-      &GtkRecentChooserWidget;
-      &GtkRecentFilter;
-    </chapter>
-
    <chapter id="DeprecatedObjects">
      <title>Deprecated</title>
        &GtkCList;      
@@ -636,9 +584,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
    &gtk-migrating-GtkIconView;
    &gtk-migrating-GtkAboutDialog;
    &gtk-migrating-GtkColorButton;
-    &gtk-migrating-GtkAssistant;
-    &gtk-migrating-GtkRecentChooser;
-    &gtk-migrating-GtkLinkButton;
  </part>

  <part>
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
--- a/docs/reference/gtk/gtk.types
+++ b/docs/reference/gtk/gtk.types
@@ -1,8 +1,4 @@
 #include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
-#include <gtk/gtkpagesetupunixdialog.h>
-#include <gtk/gtkprinter.h>
-#include <gtk/gtkprintjob.h>

 gtk_about_dialog_get_type
 gtk_accel_group_get_type
@@ -15,7 +11,6 @@ gtk_adjustment_get_type
 gtk_alignment_get_type
 gtk_arrow_get_type
 gtk_aspect_frame_get_type
-gtk_assistant_get_type
 gtk_bin_get_type
 gtk_box_get_type
 gtk_button_box_get_type
@@ -28,7 +23,6 @@ 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_spin_get_type
 gtk_cell_renderer_text_get_type
 gtk_cell_renderer_toggle_get_type
 gtk_cell_view_get_type
@@ -86,7 +80,6 @@ gtk_item_factory_get_type
 gtk_item_get_type
 gtk_label_get_type
 gtk_layout_get_type
-gtk_link_button_get_type
 gtk_list_get_type
 gtk_list_item_get_type
 gtk_list_store_get_type
@@ -101,19 +94,10 @@ gtk_notebook_get_type
 gtk_object_get_type
 gtk_old_editable_get_type
 gtk_option_menu_get_type
-gtk_page_setup_get_type
-gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type
-gtk_paper_size_get_type
 gtk_pixmap_get_type
 gtk_plug_get_type
 gtk_preview_get_type
-gtk_printer_get_type
-gtk_print_context_get_type
-gtk_print_job_get_type
-gtk_print_operation_get_type
-gtk_print_settings_get_type
-gtk_print_unix_dialog_get_type
 gtk_progress_bar_get_type
 gtk_progress_get_type
 gtk_radio_action_get_type
@@ -122,11 +106,6 @@ gtk_radio_menu_item_get_type
 gtk_radio_tool_button_get_type
 gtk_range_get_type
 gtk_rc_style_get_type
-gtk_recent_chooser_get_type
-gtk_recent_chooser_dialog_get_type
-gtk_recent_chooser_menu_get_type
-gtk_recent_chooser_widget_get_type
-gtk_recent_manager_get_type
 gtk_ruler_get_type
 gtk_scale_get_type
 gtk_scrollbar_get_type
--- a/docs/reference/gtk/images/assistant.png
+++ b/docs/reference/gtk/images/assistant.png
--- a/docs/reference/gtk/images/filechooser.png
+++ b/docs/reference/gtk/images/filechooser.png
--- a/docs/reference/gtk/images/link-button.png
+++ b/docs/reference/gtk/images/link-button.png
--- a/docs/reference/gtk/images/pagesetupdialog.png
+++ b/docs/reference/gtk/images/pagesetupdialog.png
--- a/docs/reference/gtk/images/printdialog.png
+++ b/docs/reference/gtk/images/printdialog.png
--- a/docs/reference/gtk/images/recentchooserdialog.png
+++ b/docs/reference/gtk/images/recentchooserdialog.png
--- a/docs/reference/gtk/migrating-GtkAssistant.sgml
+++ b/docs/reference/gtk/migrating-GtkAssistant.sgml
@@ -1,170 +0,0 @@
-<chapter id="gtk-migrating-GtkAssistant">
-  <chapterinfo>
-    <author>
-      <firstname>Carlos</firstname>
-      <surname>Garnacho</surname>
-      <affiliation>
-	<address>
-	  <email>carlosg@gnome.org</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from GnomeDruid to GtkAssistant</title>
-
-  <para>
-    Since version 2.10, GTK+ provides the GtkAssistant widget as a replacement
-    for the <structname>GnomeDruid</structname> widget in the libgnomeui library.
-  </para>
-
-  <para>
-    Conceptually, both <structname>GtkAssistant</structname> and <structname>GnomeDruid</structname>
-    do the same task, but there are several areas where the API has been completely
-    redesigned, so this chapter covers the main changes between both widgets.
-  </para>
-
-  <section id="inserting-pages">
-    <title>Inserting pages</title>
-
-    <para>
-      <structname>GnomeDruid</structname> was implemented as a container for
-	 <structname>GnomeDruidPage</structname> abstract objects, which are implemented by the
-	 <structname>GnomeDruidPageEdge</structname> and <structname>GnomeDruidPageStandard</structname>
-	 widgets. Instead, <structname>GtkAssistant</structname> allows any widget to be a page, and implements
-	 per-page settings (such as page type or title) as child properties. So instead of:
-    </para>
-
-    <programlisting>
-/* Page 1 */
-page = gnome_druid_page_edge_new (GNOME_EDGE_START);
-gnome_druid_page_edge_set_test (GNOME_DRUID_PAGE_EDGE (page),
-                                "Welcome to the assistant, it will make your life easier");
-gtk_widget_show (page);
-gnome_druid_append_page (GNOME_DRUID (druid), GNOME_DRUID_PAGE (page));
-
-/* Page 2 */
-page = gnome_druid_page_standard_new ();
-gtk_container_add (GTK_CONTAINER (GNOME_DRUID_PAGE_STANDARD (page)->vbox,
-                   create_page1 ());
-gtk_widget_show_all (page);
-gnome_druid_append_page (GNOME_DRUID (druid), GNOME_DRUID_PAGE (page));
-
-/* Page 3 */
-page = gnome_druid_page_edge_new (GNOME_EDGE_FINISH);
-gnome_druid_page_edge_set_test (GNOME_DRUID_PAGE_EDGE (page),
-                                "Now you are done, your life is easier");
-gtk_widget_show (page);
-gnome_druid_append_page (GNOME_DRUID (druid), GNOME_DRUID_PAGE (page));
-    </programlisting>
-
-    <para>
-      You have to write:
-    </para>
-
-    <programlisting>
-gtk_assistant_append_page (GTK_ASSISTANT (assistant),
-                           gtk_label_new ("Welcome to the assistant, it will make your life easier"));
-gtk_assistant_append_page (GTK_ASSISTANT (assistant),
-                           create_page1 ());
-gtk_assistant_append_page (GTK_ASSISTANT (assistant),
-                           gtk_label_new ("Now you are done, your life is easier");
-    </programlisting>
-  </section>
-
-  <section id="decorating-the-assistant-pages">
-    <title>Decorating the assistant pages</title>
-
-    <para>
-      To decorate your assistant pages, <structname>GtkAssistant</structname> provides similar functions
-	 to <structname>GnomeDruid</structname>, so you have to transform code like this:
-    </para>
-
-    <programlisting>
-gnome_druid_page_edge_set_title (GNOME_DRUID_PAGE_EDGE (page), "Welcome");
-gnome_druid_page_edge_set_logo (GNOME_DRUID_PAGE_EDGE (page), logo_pixbuf);
-gnome_druid_page_edge_set_watermark (GNOME_DRUID_PAGE_EDGE (page), watermark_pixbuf);
-    </programlisting>
-
-    <para>
-    Into this:
-    </para>
-
-    <programlisting>
-gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page_widget, "Welcome");
-gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), page_widget, logo_pixbuf);
-gtk_assistant_set_page_side_image (GTK_ASSISTANT (assistant), page_widget, watermark_pixbuf);
-    </programlisting>
-
-    <para>
-      Where page_widget is the widget used as a page.
-    </para>
-  </section>
-
-  <section id="setting-the-page-flow">
-    <title>Setting the page flow</title>
-
-    <para>
-      Here is the area where <structname>GtkAssistant</structname> and <structname>GnomeDruid</structname>
-	 differ the most. While <structname>GnomeDruid</structname> used the "next" and "back" signals from the 
-	 <structname>GnomeDruidPage</structname>, <structname>GtkAssistant</structname> uses the following
-	 techniques:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-	   <para>gtk_assistant_set_forward_page_func (): Allows to define a GtkAssistantPageFunc to let the
-	   assistant know which will be the following page given the current page.</para>
-      </listitem>
-      <listitem>
-	   <para>gtk_assistant_set_page_complete (): Lets the assistant know whether the specified page is complete
-	   or not, updating buttons state accordingly.</para>
-      </listitem>
-      <listitem>
-	   <para>gtk_assistant_set_page_type (): Lets the assistant know the page role and update the buttons
-	   state accordingly. Pages can have the following roles:</para>
-	   <simplelist>
-	     <member>Intro</member>
-		<member>Content</member>
-		<member>Progress</member>
-		<member>Confirmation</member>
-		<member>Summary</member>
-	   </simplelist>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      A sample GtkAssistantPageFunc could look like this:
-    </para>
-
-    <programlisting>
-static gint
-forward_page_function (gint     current_page,
-                       gpointer data)
-{
-  switch (current_page)
-    {
-    case 0:
-      return 1;
-    case 1:
-      if (check_page1_data ())
-	   return 2;
-	 else
-	   return 3;
-    case 2:
-      return 3;
-    default:
-      return -1;
-    }
-}
-    </programlisting>
-
-  </section>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
-->
--- a/docs/reference/gtk/migrating-GtkLinkButton.sgml
+++ b/docs/reference/gtk/migrating-GtkLinkButton.sgml
@@ -1,72 +0,0 @@
-<chapter id="gtk-migrating-GtkLinkButton">
-
-  <title>Migrating from GnomeHRef to GtkLinkButton</title>
-
-  <para>
-    Since version 2.10, GTK+ provides the #GtkLinkButton widget as a
-    replacement for the <structname>GnomeHRef</structname> widget
-    in the libgnomeui library.
-  </para>
-
-  <para>
-    Porting an application from <structname>GnomeHRef</structname> to
-    #GtkLinkButton is very simple. #GtkLinkButton does not have a
-    default action for "clicked" signal. So instead of simply creating
-    the widget
-    <informalexample><programlisting>
-      GtkWidget *button;
-
-      button = gnome_href_new (url, "");
-    </programlisting></informalexample>
-    you will have to handle the activation of the #GtkLinkButton, using
-    the "clicked" signal for instance
-    <informalexample><programlisting>
-      static void
-      link_button_clicked_cb (GtkWidget *widget,
-                              gpointer   data)
-      {
-        const gchar *link;
-
-	link = gtk_link_button_get_uri (GTK_LINK_BUTTON (widget));
-	open_browser_at_url (link);
-      }
-
-      /* ... */
-      
-        GtkWidget *button;
-
-	button = gtk_link_button_new (url);
-	g_signal_connect (button, "clicked",
-	                  G_CALLBACK (link_button_clicked_cb), NULL);
-     </programlisting></informalexample>
-    If you have more than one #GtkLinkButton instead of connecting
-    a signal to each one, you can use a "hook function" which will be
-    called whenever a user activates a link button
-    <informalexample><programlisting>
-      static void
-      link_button_hook (GtkLinkButton *button,
-                        const gchar   *link,
-			gpointer       user_data)
-      
-      {
-        open_browser_at_url (link);
-      }
-      
-      /* ... */
-      
-        GtkWidget *button1 = gtk_link_button_new (uri1);
-	GtkWidget *button2 = gtk_link_button_new (uri2);
-
-        gtk_link_button_set_uri_hook (link_button_hook, NULL, NULL);
-    </programlisting></informalexample>
-
-  </para>
-     
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
-->
--- a/docs/reference/gtk/migrating-GtkRecentChooser.sgml
+++ b/docs/reference/gtk/migrating-GtkRecentChooser.sgml
@@ -1,319 +0,0 @@
-<chapter id="gtk-migrating-GtkRecentChooser">
-  <chapterinfo>
-    <author>
-      <firstname>Emmanuele</firstname>
-      <lastname>Bassi</lastname>
-      <affiliation>
-        <address>
-	  <email>ebassi@gmail.com</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from EggRecent to GtkRecentChooser</title>
-
-  <para>
-    Since version 2.10, GTK+ provides a way of handling the recently used
-    documents. It is similar to the code that has lived inside the libegg
-    library and has been incorporated by many applications. The GTK+ version
-    aims to completely replace that code, and offers many distinctive features
-    that improve the registration and visualization of the recently used
-    documents, such as:
-  </para>
-
-  <para>
-    <itemizedlist>
-      <listitem><para>
-        Better performances while reading and writing the list of recently used
-	files
-      </para></listitem>
-      <listitem><para>
-        More meta-data available for each recent document, like the
-	applications that have registered a document inside the list, the last
-	time and the number of times the same application did register a
-	document inside the list, an optional user readable name and
-	description of the document
-      </para></listitem>
-      <listitem><para>
-        Improved the ability to sort and filter the documents, also using
-	custom sorting and filtering functions
-      </para></listitem>
-      <listitem><para>
-        New widgets for displaying the list, and better integration with
-	current #GtkFileChooser and #GtkUIManager widgets
-      </para></listitem>
-    </itemizedlist>
-  </para>
-
-  <section id="gtkrecent-manager">
-    <title>Managing the Recently Used Documents</title>
-
-    <para>
-      #GtkRecentManager is used to manage the Recently Used Documents. To
-      create a new #GtkRecentManager, you simply call gtk_recent_manager_new().
-      Like the <structname>EggRecentModel</structname> inside EggRecent, the
-      #GtkRecentManager loads the list of the recent documents and notifies
-      you of changes inside the list.
-    </para>
-
-    <para>
-      Usually, instead of creating a new #GtkRecentManager each time you
-      need it, you'll want to use the gtk_recent_manager_get_default()
-      function.
-    </para>
-
-    <para>
-      To add a document to the list, you can use gtk_recent_manager_add_item(),
-      like:
-      <informalexample><programlisting>
-        GtkRecentManager *manager;
-
-	manager = gtk_recent_manager_new (<!-- -->);
-
-	if (!gtk_recent_manager_add_item (manager, document_uri))
-	  {
-	    /* warn about the error */
-	  }
-	
-	g_object_unref (manager);
-      </programlisting></informalexample>
-      The gtk_recent_manager_add_item() function will try and guess some of the
-      meta-data associated to a URI. If you know some of meta-data about the
-      document yourself, set the desired fields of a #GtkRecentData structure
-      and pass it to the gtk_recent_manager_add_full() function instead:
-      <informalexample><programlisting>
-        GtkRecentManager *manager;
-        GtkRecentData *recent_data;
-
-	manager = gtk_recent_manager_new (<!-- -->);
-	
-	recent_data = g_new0 (GtkRecentData, 1);
-	/* the user visible name of the document (maybe its title); should
-	 * be preferred when displaying the item into the list
-	 */
-        recent_data-&gt;display_name = document_name;
-	
-	/* the MIME type is mandatory */
-	recent_data-&gt;mime_type = document_mime_type;
-
-	/* the name of the application that is registering the document
-	 * (also mandatory); usually, the same name you used with
-	 * the g_set_application_name (<!-- -->) function.
-	 */
-	recent_data-&amp;app_name = APP_NAME;
-
-	/* the command to open a file; the %u string will be automagically
-	 * expanded to the document's URI when getting the application's
-	 * command line from the GtkRecentInfo object with
-	 * gtk_recent_info_get_application_info (<!-- -->)
-	 */
-	recent_data-&amp;app_exec = g_strjoin (" ", g_get_prgname (<!-- -->), "--open-file", "%u", NULL);
-
-	if (!gtk_recent_manager_add_full (manager, document_uri, recent_data))
-	  {
-	    /* warn about the error */
-	  }
-
-	g_free (recent_data-&gt;app_exec);
-	g_free (recent_data);
-	g_object_unref (manager);
-      </programlisting></informalexample>
-    </para>
-
-    <para>
-      Getting the list of items is also similar to
-      <structname>EggRecentModel</structname>; the GtkRecentInfo data is
-      allocated at look up time in order not to waste memory keeping it
-      around, so you must remember to free the data inside the list and then
-      the list itself when you are done using it:
-      <informalexample><programlisting>
-        GtkRecentManager *manager;
-        GList *recent_items, *l;
-
-	manager = gtk_recent_manager_get_default(<!-- -->);
-
-	recent_items = gtk_recent_manager_get_items (manager);
-	for (l = recent_items; l != NULL; l = l-&gt;next)
-	  {
-	    GtkRecentInfo *recent_info = l-&gt;data;
-
-	    do_something_with_the_item (recent_info);
-	  }
-	
-	/* free everything and the list */
-	g_list_foreach (recent_items, (GFunc) gtk_recent_info_unref, NULL);
-	g_list_free (recent_items);
-      </programlisting></informalexample>
-      You can also look up a single item:
-      <informalexample><programlisting>
-        GtkRecentInfo *recent_info;
-	GError *error = NULL;
-
-	recent_info = gtk_recent_manager_lookup_item (manager, document_uri, &amp;error);
-	if (error)
-	  {
-	    display_error (error);
-
-	    g_error_free (error);
-	  }
-	else
-	  {
-	    do_something_with_the_item (recent_info);
-
-	    gtk_recent_info_unref (recent_info);
-	  }
-      </programlisting></informalexample>
-      The #GtkRecentInfo is a reference counted boxed type, and it holds all
-      the meta-data of a recently used document, like its display name, its
-      description, the list of each application that has registered the
-      document or the list of groups to which the document belong.
-    </para>
-  
-  </section> <!-- gtkrecent-manager -->
-
-  <section id="gtkrecent-chooser">
-    <title>Displaying the Recently Used Documents</title>
-
-    <para>
-      Displaying the Recently Used Documents list is handled by any widget
-      implementing the #GtkRecentChooser interface. These widgets also handle
-      the sorting and filtering of the list; they will create their own
-      #GtkRecentManager objects by default:
-      <informalexample><programlisting>
-        GtkWidget *chooser;
-	gint response;
-
-	/* create a new dialog with the recently used documents list shown
-	 * using a GtkTreeView widget
-	 */
-	chooser = gtk_recent_chooser_dialog_new ("Recent Documents",
-	                                         parent_window,
-						 GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
-						 GTK_STOCK_OPEN, GTK_RESPONSE_OK,
-						 NULL);
-        /* set the sorting order to "most recently used first" */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_MRU);
-	response = gtk_dialog_run (GTK_DIALOG (chooser));
-	if (response == GTK_RESPONSE_OK)
-	  {
-	    GtkRecentInfo *info;
-
-            info = gtk_recent_chooser_get_current_item (GTK_RECENT_CHOOSER (chooser));
-	    do_something_with_the_item (info);
-
-	    gtk_recent_info_unref (info);
-	  }
-	
-	gtk_widget_destroy (chooser);
-      </programlisting></informalexample>
-    </para>
-    
-  </section> <!-- gtkrecent-chooser -->
-
-  <section id="gtkrecent-advanced">
-    <title>Advanced usage</title>
-
-    <para>
-      The #GtkRecentChooser widgets might display items sorted and filtered,
-      either with already supplied or custom sorting and filtering functions.
-      The biggest difference from the <structname>EggRecentView</structname>
-      widgets in EggRecent is that the #GtkRecentChooser widgets will use
-      their own copy of the list and will apply the sorting and filtering
-      functions only on the copy; this allows the creation of many viewers
-      with a single controller, like using many #GtkTreeView with a single
-      #GtkTreeModel instance.
-    </para>
-
-    <para>
-      Available sorting methods are:
-      <informalexample><programlisting>
-        /* no sorting */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_NONE);
-	
-        /* most recently used first */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_MRU);
-	
-	/* most recently used last */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_LRU);
-      </programlisting></informalexample>
-      You can create your own sorting function, and the use the
-      GTK_RECENT_SORT_CUSTOM method:
-      <informalexample><programlisting>
-	/* custom sorting function, based on the registration count
-	 * (most used first)
-	 */
-	static void
-	sort_by_usage_count (GtkRecentInfo *a,
-                             GtkRecentInfo *b,
-                             gpointer       data)
-        {
-	  gint count_a, count_b;
-
-	  count_a = count_b = 0;
-
-	  if (gtk_recent_info_has_application (a, APP_NAME))
-	    gtk_recent_info_get_application_info (a, APP_NAME, NULL, &amp;count_a, NULL);
-
-	  if (gtk_recent_info_has_application (b, APP_NAME))
-	    gtk_recent_info_get_application_info (b, APP_NAME, NULL, &amp;count_b, NULL);
-
-	  return count_a &lt; count_b;
-	}
-
-	...
-
-	  /* set custom sorting and set the custom sorting function */
-	  gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser),
-	                                    GTK_RECENT_SORT_CUSTOM);
-	  gtk_recent_chooser_set_sort_func (GTK_RECENT_CHOOSER,
-	                                    sort_by_usage_count,
-			  		    NULL, /* sort function data */
-					    NULL  /* destroy notify for the data */);
-      </programlisting></informalexample>
-    </para>
-
-    <para>
-      Filtering is done using the #GtkRecentFilter object, similar to the
-      #GtkFileFilter object used by the #GtkFileChooser widgets. The
-      #GtkRecentFilter object has a set of pre-defined options based on the
-      meta-data exposed by the #GtkRecentInfo object. It also allows custom
-      filtering function:
-      <informalexample><programlisting>
-        GtkRecentFilter *filter;
-
-	filter = gtk_recent_filter_new (<!-- -->);
-	
-	/* set the user visible name of the filter */
-	gtk_recent_filter_set_name (filter, "Since Last Month");
-
-	/* set the maximum age of a recently used document */
-	gtk_recent_filter_set_age (filter, 31);
-
-	/* the chooser takes the ownership of the object */
-	gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (chooser), filter);
-
-	/* set the currently used filter */
-	gtk_recent_chooser_set_filter (GTK_RECENT_CHOOSER (chooser), filter);
-
-	filter = gtk_recent_filter_new (<!-- -->);
-	gtk_recent_filter_set_name (filter, "Every text file");
-	gtk_recent_filter_set_mime_type (filter, "text/plain");
-
-	gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (chooser), filter);
-      </programlisting></informalexample>
-      The #GtkRecentChooserWidget and #GtkRecentChooserDialog widgets allow
-      multiple filters and the selection of an appropriate one; the
-      #GtkRecentChooserMenu widget allows just a single filter object.
-    </para>
-    
-  </section> <!-- gtkrecent-advanced -->
-  
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
-->
--- a/docs/reference/gtk/migrating-checklist.sgml
+++ b/docs/reference/gtk/migrating-checklist.sgml
@@ -68,8 +68,8 @@ do_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
      event_time = gtk_get_current_event_time (<!-- -->);
    }

-  gtk_menu_attach_to_widget (GTK_MENU (menu), my_widget, NULL);
-  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
+  gtk_menu_attach_to_widget (GTK_MENU (popup), my_widget, NULL);
+  gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL, 
                  button, event_time);
 }
 	</programlisting>
--- a/docs/reference/gtk/osx.sgml
+++ b/docs/reference/gtk/osx.sgml
@@ -1,35 +0,0 @@
-<refentry id="gtk-osx">
-<refmeta>
-<refentrytitle>Using GTK+ on Mac OS X</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GTK Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>Using GTK+ on Mac OS X</refname>
-<refpurpose>
-OS X-specific aspects of using GTK+
-</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Using GTK+ on Mac OS X</title>
-
-<para>
-The Mac OS X port of GTK+ is an implementation of GDK (and therefore GTK+) 
-on top of the Quarz API.
-</para>
-
-<para>
-Currently, the Mac OS X port does not use any additional commandline options
-or environment variables. 
-</para>
-
-<para>
-For up-to-date information about the current status of this port, see the
-<ulink url="http://developer.imendio.com/wiki/Gtk_Mac_OS_X">project page</ulink>.
-</para>
-
-</refsect1>
-
-</refentry>
--- a/docs/reference/gtk/question_index.sgml
+++ b/docs/reference/gtk/question_index.sgml
@@ -205,15 +205,13 @@ You eventually have to call gettext() on the string to actually fetch the
 translation.  _() both marks the string for translation and actually translates it.
 </para>
 <para>
-Nowadays, GLib provides the common shorthand macros in the header file
-<filename>gi18n.h</filename>, so you don't have to define them yourself, just
-include that header.
-</para>
-<para>
 Code using these macros ends up looking like this:
 <informalexample>
 <programlisting>
- #include &lt;gi18n.h&gt;
+ #include &lt;libintl.h&gt;
+
+ #define  _(x)  gettext (x)
+ #define N_(x)  x

 static const char *global_variable = N_("Translate this string");

@@ -240,11 +238,6 @@ of using the default.For dgettext() the _() macro can be defined as:
 </programlisting>
 </informalexample>
 </para>
-<para>
-Again, GLib comes with the <filename>gi18n-lib.h</filename>, saving you the trouble
-of defining the macros by hand. The macros in that header expect the translation
-domain to be specified by the %GETTEXT_PACKAGE macro. 
-</para>
 </answer>
 </qandaentry>

@@ -524,45 +517,6 @@ volatile GType dummy = GTK_TYPE_BLAH;
 </para>
 </answer>
 </qandaentry>
-
-<qandaentry>
-<question>
-<para>
-How do I create a transparent toplevel window ?
-</para>
-</question>
-
-<answer>
-<para>
-To make a window transparent, it needs to use a visual which supports that.
-This is done by getting the RGBA colormap of the screen with 
-gdk_screen_get_rgba_colormap() and setting it on the window. Note that
-gdk_screen_get_rgba_colormap() will return %NULL if transparent windows
-are not supported on the screen; also note that this may change from
-screen to screen, so it needs to be repeated whenever the window is moved
-to a different screen.
-<informalexample><programlisting>
-GdkColormap *colormap;
-
-colormap = gdk_screen_get_rgba_colormap (screen);
-if (!colormap)
-  colormap = gtk_screen_get_rgb_colormap (screen);
-
-gtk_widget_set_colormap (widget, colormap);
-</programlisting></informalexample>
-One possibility to fill the alpha channel on the window is to use
-gdk_draw_rgb_32_image().
-</para>
-<para>
-Note that the presence of an RGBA visual is no guarantee that the
-window will actually appear transparent on screen. On X11, this 
-requires a compositing manager to be running. See 
-gtk_widget_is_composited() for a way to find out if the alpha
-channel will be respected.
-</para>
-</answer>
-</qandaentry>
-
 </qandadiv>

 <qandadiv><title>Which widget should I use...</title>
@@ -931,83 +885,6 @@ See gtk_tree_view_set_expander_column() and gtk_tree_view_column_set_visible().

 </qandadiv>

-<qandadiv><title>Using cairo with GTK+</title>
-
-<qandaentry>
-<question><para>
-How do I use cairo to draw in GTK+ applications ?
-</para></question>
-
-<answer><para>
-USe gdk_cairo_create() to obtain a cairo context for drawing
-on a GDK window or pixmap. See <link linkend="gdk-Cairo-Interaction">Cairo 
-Interaction</link> for some more useful functions.
-</para></answer>
-</qandaentry>
-
-<qandaentry>
-<question><para>
-I have created a cairo context with gdk_cairo_create(), but when I
-later use it, my drawing does not show up. Why is that ?
-</para></question>
-
-<answer>
-<para>
-All drawing in GTK+ is normally done in an expose handler, and GTK+
-creates a temporary pixmap for double-buffering the drawing. If you 
-create a cairo context outside the expose handler, it is backed
-by the GDK window itself, not the double-buffering pixmap. Consequently,
-any drawing you do with that cairo context gets overwritten at the 
-end of the expose handler, when the double-buffering pixmap is copied
-back.
-</para>
-<para>
-Possible solutions to this problem are:
-<itemizedlist>
-<listitem><para>
-Turn off double-buffering, with gtk_widget_set_double_buffered().
-This is not ideal, since it can cause some flickering.
-</para></listitem>
-<listitem><para>
-Create the cairo context inside the expose handler. If you do this,
-gdk_create_cairo() arranges for it to be backed by the double-buffering 
-pixmap. This is the preferred solution, and is used throughout GTK+
-itself.
-</para></listitem>
-</itemizedlist>
-</para>
-</answer>
-</qandaentry>
-
-<qandaentry>
-<question><para>
-Can I improve the performance of my application by using the
-Glitz backend of cairo ?
-</para></question>
-
-<answer><para>
-No. The GDK X11 backend uses the cairo X backend (and the other
-GDK backends use their respective native cairo backends). The
-GTK+ developers believe that the best way to improving the GDK
-drawing performance is to optimize the cairo X backend and the
-relevant code paths in the X server that is uses (mostly the
-Render extension).
-</para></answer>
-</qandaentry>
-
-<qandaentry>
-<question><para>
-Can I use cairo to draw on a #GdkPixbuf ?
-</para></question>
-
-<answer><para>
-No, at least not yet. The cairo image surface does not support the
-pixel format used by GdkPixbuf. 
-</para></answer>
-</qandaentry>
-
-</qandadiv>
-
 </qandaset>

 </refsect1>
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -174,14 +174,6 @@ additional environment variables.
      <term>geometry</term>
      <listitem><para>Size allocation</para></listitem>
    </varlistentry>
-    <varlistentry>
-      <term>icontheme</term>
-      <listitem><para>Icon themes</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>printing</term>
-      <listitem><para>Printing support</para></listitem>
-    </varlistentry>

  </variablelist>
  The special value <literal>all</literal> can be used to turn on all debug options.
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -336,18 +336,6 @@ Turns off certain object flags.  (Private)
@obj: the object to affect.
@flag: the flags to unset.

-<!-- ##### MACRO GTK_PRINT_SETTINGS_NUM_COPIES ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO GTK_PRINT_SETTINGS_PRINT_TO_FILE ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO GTK_STOCK_BUTTON_APPLY ##### -->
 <para>

@@ -525,12 +513,6 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
@b: 
@Returns: 

-<!-- ##### ARG GtkAboutDialog:link-color ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT GtkAccelEntry ##### -->
 <para>
 This is a private struct used by GTK+ internally, don't worry about it.
@@ -638,20 +620,6 @@ Define a function pointer.  Deprecated.
 </para>


-<!-- ##### SIGNAL GtkComboBox::popup-hide ##### -->
-<para>
-
-</para>
-
-@combobox: the object which received the signal.
-
-<!-- ##### SIGNAL GtkComboBox::popup-show ##### -->
-<para>
-
-</para>
-
-@combobox: the object which received the signal.
-
 <!-- ##### ARG GtkComboBox:appearance ##### -->
 <para>

@@ -957,33 +925,6 @@ a RC file.
@menubar: the object which received the signal.
@arg1: 

-<!-- ##### SIGNAL GtkNotebook::tab-added ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL GtkNotebook::tab-removed ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL GtkNotebook::tab-reordered ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-@arg2: 
-
 <!-- ##### ARG GtkObject:object-signal ##### -->
 <para>
 Setting this with a GtkType of GTK_TYPE_SIGNAL connects
@@ -1138,12 +1079,6 @@ after other user handlers and the default handler.
@user_data: 
@seq_id: 

-<!-- ##### ARG GtkPrintOperation:number-of-pages ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### ENUM GtkPrivateFlags ##### -->
 <para>

@@ -2201,13 +2136,6 @@ Claim or disclaim ownership of the PRIMARY X selection.
@claim: if %TRUE, claim the selection, otherwise, disclaim it.
@time: the timestamp for claiming the selection.

-<!-- ##### FUNCTION gtk_file_chooser_error_quark ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
 <!-- ##### FUNCTION gtk_file_chooser_get_folder_mode ##### -->
 <para>

@@ -2795,78 +2723,6 @@ Set the the handle size to @size x @size pixels.
@pspec: 
@pattern: 

-<!-- ##### FUNCTION gtk_print_context_create_context ##### -->
-<para>
-
-</para>
-
-@context: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_print_context_create_layout ##### -->
-<para>
-
-</para>
-
-@context: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_print_context_get_cairo ##### -->
-<para>
-
-</para>
-
-@context: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_print_context_get_fontmap ##### -->
-<para>
-
-</para>
-
-@context: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_print_operation_set_nr_of_pages ##### -->
-<para>
-
-</para>
-
-@op: 
-@n_pages: 
-
-<!-- ##### FUNCTION gtk_print_settings_get_num_copies ##### -->
-<para>
-
-</para>
-
-@settings: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_print_settings_get_print_to_file ##### -->
-<para>
-
-</para>
-
-@settings: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_print_settings_set_num_copies ##### -->
-<para>
-
-</para>
-
-@settings: 
-@num_copies: 
-
-<!-- ##### FUNCTION gtk_print_settings_set_print_to_file ##### -->
-<para>
-
-</para>
-
-@settings: 
-@print_to_file: 
-
 <!-- ##### FUNCTION gtk_rc_init ##### -->
 <para>
 Internal function.
--- a/docs/reference/gtk/tmpl/gtkaboutdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkaboutdialog.sgml
@@ -114,6 +114,11 @@ only private fields and should not be directly accessed.

 </para>

+<!-- ##### ARG GtkAboutDialog:link-color ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_about_dialog_new ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
@@ -94,6 +94,9 @@ Deprecated equivalent of g_object_unref().
@accel_mods: 
@accel_flags: 
@closure: 
+<!-- # Unused Parameters # -->
+@accel_path_quark: 
+@path_quark: 


 <!-- ##### FUNCTION gtk_accel_group_connect_by_path ##### -->
@@ -138,6 +141,9 @@ Deprecated equivalent of g_object_unref().
@accel_group: 
@closure: 
@Returns: 
+<!-- # Unused Parameters # -->
+@accel_key: 
+@accel_mods: 


 <!-- ##### FUNCTION gtk_accel_group_disconnect_key ##### -->
@@ -210,6 +216,8 @@ Deprecated equivalent of g_object_unref().
@accel_key: 
@accel_mods: 
@Returns: 
+<!-- # Unused Parameters # -->
+@acceleratable: 


 <!-- ##### FUNCTION gtk_accel_groups_from_object ##### -->
--- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml
@@ -114,6 +114,8 @@ Creates a new #GtkAccelLabel.

@accel_label: 
@accel_closure: 
+<!-- # Unused Parameters # -->
+@closure: 


 <!-- ##### FUNCTION gtk_accel_label_get_accel_widget ##### -->
--- a/docs/reference/gtk/tmpl/gtkaction.sgml
+++ b/docs/reference/gtk/tmpl/gtkaction.sgml
@@ -75,11 +75,6 @@ and should not be accessed directly.

 </para>

-<!-- ##### ARG GtkAction:icon-name ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkAction:is-important ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkactiongroup.sgml
+++ b/docs/reference/gtk/tmpl/gtkactiongroup.sgml
@@ -200,8 +200,7 @@ gtk_action_group_add_actions() to construct actions.
 </para>

@name: The name of the action.
-@stock_id: The stock id for the action, or the name of an icon from the icon 
-    theme.
+@stock_id: The stock id for the action.
@label: The label for the action. This field should typically be marked for 
    translation, see gtk_action_group_set_translation_domain().
@accelerator: The accelerator for the action, in the format understood by 
@@ -240,8 +239,7 @@ gtk_action_group_add_toggle_actions() to construct toggle actions.
 </para>

@name: The name of the action.
-@stock_id: The stock id for the action, or the name of an icon from the icon 
-    theme.
+@stock_id: The stock id for the action.
@label: The label for the action. This field should typically be marked for 
    translation, see gtk_action_group_set_translation_domain().
@accelerator: The accelerator for the action, in the format understood by 
@@ -281,8 +279,7 @@ gtk_action_group_add_radio_actions() to construct groups of radio actions.
 </para>

@name: The name of the action.
-@stock_id: The stock id for the action, or the name of an icon from the icon 
-    theme.
+@stock_id: The stock id for the action.
@label: The label for the action. This field should typically be marked for 
    translation, see gtk_action_group_set_translation_domain().
@accelerator: The accelerator for the action, in the format understood by 
--- a/docs/reference/gtk/tmpl/gtkarrow.sgml
+++ b/docs/reference/gtk/tmpl/gtkarrow.sgml
@@ -39,20 +39,35 @@ style of an arrow can be changed after creation by using gtk_arrow_set().

 <!-- ##### STRUCT GtkArrow ##### -->
 <para>
-The #GtkArrow struct containes the following fields.
+The #GtkArrow-struct containes the following fields.
 (These fields should be considered read-only. They should never be set by
-an application.)
+an application.)
+
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
+<tbody>
+
+<row>
+<entry>#gint16 <structfield>arrow_type</structfield>;</entry>
+<entry>the direction of the arrow, one of #GtkArrowType.</entry>
+</row>
+
+<row>
+<entry>#gint16 <structfield>shadow_type</structfield>;</entry>
+<entry>the style of the arrow, one of #GtkShadowType.</entry>
+</row>
+</tbody></tgroup></informaltable>
 </para>


 <!-- ##### ARG GtkArrow:arrow-type ##### -->
-<para>
-
+<para>
+
 </para>

 <!-- ##### ARG GtkArrow:shadow-type ##### -->
-<para>
-
+<para>
+
 </para>

 <!-- ##### FUNCTION gtk_arrow_new ##### -->
--- a/docs/reference/gtk/tmpl/gtkassistant.sgml
+++ b/docs/reference/gtk/tmpl/gtkassistant.sgml
@@ -1,334 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAssistant
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget used to guide users through multi-step operations
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkAssistant is a widget used to represent a generally complex
-operation splitted in several steps, guiding the user through its pages
-and controlling the page flow to collect the necessary data.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAssistant ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkAssistant::apply ##### -->
-<para>
-
-</para>
-
-@assistant: the object which received the signal.
-
-<!-- ##### SIGNAL GtkAssistant::cancel ##### -->
-<para>
-
-</para>
-
-@assistant: the object which received the signal.
-
-<!-- ##### SIGNAL GtkAssistant::close ##### -->
-<para>
-
-</para>
-
-@assistant: the object which received the signal.
-
-<!-- ##### SIGNAL GtkAssistant::prepare ##### -->
-<para>
-
-</para>
-
-@assistant: the object which received the signal.
-@widget: 
-
-<!-- ##### ARG GtkAssistant:complete ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:header-image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:page-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:sidebar-image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:content-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:header-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_assistant_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_current_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_current_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page_num: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_n_pages ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_nth_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page_num: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_prepend_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_append_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_insert_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@position: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION GtkAssistantPageFunc ##### -->
-<para>
-A function used by gtk_assistant_set_forward_page_func() to know which
-is the next page given a current one. It's called both for computing the
-next page when the user presses the "forward" button and for handling
-the behavior of the "last" button.
-</para>
-
-@current_page: The page number used to calculate the next page.
-@data: user data.
-@Returns: The next page number.
-
-
-<!-- ##### FUNCTION gtk_assistant_set_forward_page_func ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page_func: 
-@data: 
-@destroy: 
-
-
-<!-- ##### ENUM GtkAssistantPageType ##### -->
-<para>
-An enum for determining the page role inside the #GtkAssistant. It's used to
-handle buttons sensitivity and visibility.
-</para>
-
-<para>
-Note that an assistant needs to end its page flow with a page of type GTK_ASSISTANT_PAGE_CONFIRM
-or GTK_ASSISTANT_PAGE_SUMMARY to be correct.
-</para>
-
-@GTK_ASSISTANT_PAGE_CONTENT: The page has regular contents.
-@GTK_ASSISTANT_PAGE_INTRO: The page contains an introduction to the assistant task.
-@GTK_ASSISTANT_PAGE_CONFIRM: The page lets the user confirm or deny the changes.
-@GTK_ASSISTANT_PAGE_SUMMARY: The page informs the user of the changes done.
-@GTK_ASSISTANT_PAGE_PROGRESS: Used for tasks that take a long time to complete, blocks the assistant until the page is marked as complete.
-
-<!-- ##### FUNCTION gtk_assistant_set_page_type ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@type: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_type ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_page_title ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@title: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_title ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_page_header_image ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@pixbuf: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_header_image ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_page_side_image ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@pixbuf: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_side_image ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_page_complete ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@complete: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_complete ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_add_action_widget ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@child: 
-
-
-<!-- ##### FUNCTION gtk_assistant_remove_action_widget ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@child: 
-
-
-<!-- ##### FUNCTION gtk_assistant_update_buttons_state ##### -->
-<para>
-
-</para>
-
-@assistant: 
-
-
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -39,38 +39,41 @@ This should not be accessed directly.  Use the accessor functions below.

 <!-- ##### SIGNAL GtkButton::clicked ##### -->
 <para>
-
+Emitted when a button clicked on by the mouse and the cursor stays on the
+button.  If the cursor is not on the button when the mouse button is released,
+the signal is not emitted.
 </para>

-@button: 
+@button: the object which received the signal.

 <!-- ##### SIGNAL GtkButton::enter ##### -->
 <para>
-
+Emitted when the mouse cursor enters the region of the button.
 </para>

-@button: 
+@button: the object which received the signal.

 <!-- ##### SIGNAL GtkButton::leave ##### -->
 <para>
-
+Emitted when the mouse cursor leaves the region of the button.
 </para>

-@button: 
+@button: the object which received the signal.

 <!-- ##### SIGNAL GtkButton::pressed ##### -->
 <para>
-
+Emitted when the button is initially pressed.
 </para>

-@button: 
+@button: the object which received the signal.

 <!-- ##### SIGNAL GtkButton::released ##### -->
 <para>
-
+Emitted when a button which is pressed is released, no matter where the
+mouse cursor is.
 </para>

-@button: 
+@button: the object which received the signal.

 <!-- ##### ARG GtkButton:focus-on-click ##### -->
 <para>
@@ -82,11 +85,6 @@ This should not be accessed directly.  Use the accessor functions below.

 </para>

-<!-- ##### ARG GtkButton:image-position ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkButton:label ##### -->
 <para>

@@ -142,16 +140,6 @@ This should not be accessed directly.  Use the accessor functions below.

 </para>

-<!-- ##### ARG GtkButton:image-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:inner-border ##### -->
-<para>
-
-</para>
-
 <!-- ##### FUNCTION gtk_button_new ##### -->
 <para>
 Creates a new #GtkButton widget. To add a child widget to the button,
@@ -285,6 +273,8 @@ Returns the current relief style of the given #GtkButton.

@button: 
@use_stock: 
+<!-- # Unused Parameters # -->
+@value: 


 <!-- ##### FUNCTION gtk_button_get_use_underline ##### -->
@@ -303,6 +293,8 @@ Returns the current relief style of the given #GtkButton.

@button: 
@use_underline: 
+<!-- # Unused Parameters # -->
+@value: 


 <!-- ##### FUNCTION gtk_button_set_focus_on_click ##### -->
@@ -361,21 +353,3 @@ Returns the current relief style of the given #GtkButton.
@Returns: 


-<!-- ##### FUNCTION gtk_button_set_image_position ##### -->
-<para>
-
-</para>
-
-@button: 
-@position: 
-
-
-<!-- ##### FUNCTION gtk_button_get_image_position ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
--- a/docs/reference/gtk/tmpl/gtkcelllayout.sgml
+++ b/docs/reference/gtk/tmpl/gtkcelllayout.sgml
@@ -11,18 +11,6 @@ want to provide a #GtkTreeViewColumn-like API for packing cells, setting
 attributes and data funcs. 
 </para>

-<para>
-One of the notable features provided by implementations of GtkCellLayout
-are <emphasis>attributes</emphasis>. Attributes let you set the properties
-in flexible ways. They can just be set to constant values like regular
-properties. But they can also be mapped to a column of the underlying 
-tree model with gtk_cell_layout_set_attributes(), which means that the value 
-of the attribute can change from cell to cell as they are rendered by the 
-cell renderer. Finally, it is possible to specify a function with 
-gtk_cell_layout_set_cell_data_func() that is called to determine the value 
-of the attribute for each cell that is rendered.
-</para>
-
 <!-- ##### SECTION See_Also ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml
@@ -1,86 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRendererAccel
-
-<!-- ##### SECTION Short_Description ##### -->
-Renders a keyboard accelerator in a cell
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCellRendererAccel displays a keyboard accelerator (i.e. a 
-key combination like &lt;Control&gt;-a). If the cell renderer is editable, the 
-accelerator can be changed by simply typing the new combination.
-</para>
-
-<para>
-The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkCellRendererAccel ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkCellRendererAccel::accel-cleared ##### -->
-<para>
-
-</para>
-
-@cellrendereraccel: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkCellRendererAccel::accel-edited ##### -->
-<para>
-
-</para>
-
-@cellrendereraccel: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-
-<!-- ##### ARG GtkCellRendererAccel:accel-key ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererAccel:accel-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererAccel:accel-mods ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererAccel:keycode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GtkCellRendererAccelMode ##### -->
-<para>
-
-</para>
-
-@GTK_CELL_RENDERER_ACCEL_MODE_GTK: 
-@GTK_CELL_RENDERER_ACCEL_MODE_OTHER: 
-
-<!-- ##### FUNCTION gtk_cell_renderer_accel_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
--- a/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml
@@ -6,24 +6,18 @@ Renders a combobox in a cell

 <!-- ##### SECTION Long_Description ##### -->
 <para>
-#GtkCellRendererCombo renders text in a cell like #GtkCellRendererText from 
-which it is derived. But while #GtkCellRendererText offers a simple entry to 
-edit the text, #GtkCellRendererCombo offers a #GtkComboBox or #GtkComboBoxEntry
-widget to edit the text. The values to display in the combo box are taken from 
-the tree model specified in the 
-<link linkend="GtkCellRendererCombo--model">model</link> property.
+#GtkCellRendererCombo renders text in a cell like #GtkCellRendererText from which it
+is derived. But while #GtkCellRendererText offers a simple entry to edit the text,
+#GtkCellRendererCombo offers a #GtkComboBox or #GtkComboBoxEntry widget to edit 
+the text. The values to display in the combo box are taken from the tree model 
+specified in the <link linkend="GtkCellRendererCombo--model">model</link> property.
 </para>

 <para>
-The combo cell renderer takes care of adding a text cell renderer to the combo 
-box and sets it to display the column specified by its 
-<link linkend="GtkCellRendererCombo--text-column">text-column</link> 
-property. Further properties of the comnbo box can be set in a handler for the 
-editing-started signal.
-</para>
-
-<para>
-The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
+The combo cell renderer takes care of adding a text cell renderer to the combo box
+and sets it to display the column specified by its 
+<link linkend="GtkCellRendererCombo--text-column">text-column</link> property. Further
+cell renderers can be added in a handler for the editing-started signal.
 </para>

 <!-- ##### SECTION See_Also ##### -->
--- a/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml
@@ -6,12 +6,7 @@ Renders numbers as progress bars

 <!-- ##### SECTION Long_Description ##### -->
 <para>
-#GtkCellRendererProgress renders a numeric value as a progress par in a cell.
-Additionally, it can display a text on top of the progress bar.
-</para>

-<para>
-The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6.
 </para>

 <!-- ##### SECTION See_Also ##### -->
--- a/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml
@@ -1,64 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRendererSpin
-
-<!-- ##### SECTION Short_Description ##### -->
-Renders a spin button in a cell
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCellRendererSpin renders text in a cell like #GtkCellRendererText from 
-which it is derived. But while #GtkCellRendererText offers a simple entry to 
-edit the text, #GtkCellRendererSpin offers a #GtkSpinButton widget. Of course,
-that means that the text has to be parseable as a floating point number.
-</para>
-
-<para>
-The range of the spinbutton is taken from the adjustment property of the
-cell renderer, which can be set explicitly or mapped to a column in the 
-tree model, like all properties of cell renders. #GtkCellRendererSpin
-also has properties for the climb rate and the number of digits to
-display. Other #GtkSpinButton properties can be set in a handler for the
-start-editing signal.
-</para>
-
-<para>
-The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkCellRendererText, #GtkSpinButton
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkCellRendererSpin ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkCellRendererSpin:adjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererSpin:climb-rate ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererSpin:digits ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_cell_renderer_spin_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
--- a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
@@ -40,11 +40,6 @@ the #GtkCellRendererText allows to edit its text using an entry.
@arg1: 
@arg2: 

-<!-- ##### ARG GtkCellRendererText:alignment ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCellRendererText:attributes ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
@@ -49,11 +49,6 @@ property. When activated, it emits the toggled signal.

 </para>

-<!-- ##### ARG GtkCellRendererToggle:indicator-size ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCellRendererToggle:radio ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcellview.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellview.sgml
@@ -41,11 +41,6 @@ and drag and drop.

 </para>

-<!-- ##### ARG GtkCellView:model ##### -->
-<para>
-
-</para>
-
 <!-- ##### FUNCTION gtk_cell_view_new ##### -->
 <para>

@@ -135,5 +130,7 @@ and drag and drop.

@cell_view: 
@Returns: 
+<!-- # Unused Parameters # -->
+@cellview: 


--- a/docs/reference/gtk/tmpl/gtkclipboard.sgml
+++ b/docs/reference/gtk/tmpl/gtkclipboard.sgml
@@ -152,18 +152,6 @@ Storing data on clipboards
@Since: 2.4


-<!-- ##### USER_FUNCTION GtkClipboardRichTextReceivedFunc ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@format: 
-@text: 
-@length: 
-@data: 
-
-
 <!-- ##### USER_FUNCTION GtkClipboardGetFunc ##### -->
 <para>
 A function that will be called to provide the contents of the selection.
@@ -331,17 +319,6 @@ will not be used again.
@user_data: 


-<!-- ##### FUNCTION gtk_clipboard_request_rich_text ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@buffer: 
-@callback: 
-@user_data: 
-
-
 <!-- ##### FUNCTION gtk_clipboard_wait_for_contents ##### -->
 <para>

@@ -370,18 +347,6 @@ will not be used again.
@Returns: 


-<!-- ##### FUNCTION gtk_clipboard_wait_for_rich_text ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@buffer: 
-@format: 
-@length: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_clipboard_wait_is_text_available ##### -->
 <para>

@@ -400,16 +365,6 @@ will not be used again.
@Returns: 


-<!-- ##### FUNCTION gtk_clipboard_wait_is_rich_text_available ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@buffer: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_clipboard_wait_for_targets ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcolorbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkcolorbutton.sgml
@@ -6,9 +6,8 @@ A button to launch a color selection dialog

 <!-- ##### SECTION Long_Description ##### -->
 <para>
-The #GtkColorButton is a button which displays the currently selected color 
-an allows to open a color selection dialog to change the color. It is suitable 
-widget for selecting a color in a preference dialog.
+The #GtkColorButton is a button which displays the currently selected color an allows to open a color 
+selection dialog to change the color. It is suitable widget for selecting a color in a preference dialog.
 </para>

 <!-- ##### SECTION See_Also ##### -->
@@ -21,8 +20,7 @@ widget for selecting a color in a preference dialog.

 <!-- ##### STRUCT GtkColorButton ##### -->
 <para>
-The GtkColorButton struct has only private fields and 
-should not be used directly.
+
 </para>


--- a/docs/reference/gtk/tmpl/gtkcombo.sgml
+++ b/docs/reference/gtk/tmpl/gtkcombo.sgml
@@ -95,7 +95,7 @@ an application.)

@entry: the text entry field.
@list: the list shown in the drop-down window.
-@Deprecated: 2.4: Use #GtkComboBox instead.
+@Deprecated: Use #GtkComboBox instead.

 <!-- ##### ARG GtkCombo:allow-empty ##### -->
 <para>
@@ -128,7 +128,7 @@ Creates a new #GtkCombo.
 </para>

@Returns: a new #GtkCombo.
-@Deprecated: 2.4: Use #GtkComboBox instead.
+@Deprecated: Use #GtkComboBox instead.


 <!-- ##### FUNCTION gtk_combo_set_popdown_strings ##### -->
@@ -139,7 +139,7 @@ Convenience function to set all of the items in the popup list.

@combo: a #GtkCombo.
@strings: a list of strings, or %NULL to clear the popup list
-@Deprecated: 2.4: Use #GtkComboBox instead.
+@Deprecated: Use #GtkComboBox instead.


 <!-- ##### FUNCTION gtk_combo_set_value_in_list ##### -->
@@ -155,7 +155,7 @@ If an empty field is acceptable, the @ok_if_empty parameter should be %TRUE.
@combo: a #GtkCombo.
@val: %TRUE if the value entered must match one of the values in the list.
@ok_if_empty: %TRUE if an empty value is considered valid.
-@Deprecated: 2.4: Use #GtkComboBox instead.
+@Deprecated: Use #GtkComboBox instead.


 <!-- ##### FUNCTION gtk_combo_set_use_arrows ##### -->
@@ -167,7 +167,7 @@ the list. This is on by default.
@combo: a #GtkCombo.
@val: %TRUE if the arrow keys can be used to step through the items in 
     the list.
-@Deprecated: 2.4: Use #GtkComboBox instead.
+@Deprecated: Use #GtkComboBox instead.


 <!-- ##### FUNCTION gtk_combo_set_use_arrows_always ##### -->
@@ -177,7 +177,7 @@ Obsolete function, does nothing.

@combo: a #GtkCombo.
@val: unused
-@Deprecated: 2.4: Use #GtkComboBox instead.
+@Deprecated: Use #GtkComboBox instead.


 <!-- ##### FUNCTION gtk_combo_set_case_sensitive ##### -->
@@ -193,7 +193,7 @@ worried about differences in case.

@combo: a #GtkCombo.
@val: %TRUE if the text in the list items is case sensitive.
-@Deprecated: 2.4: Use #GtkComboBox instead.
+@Deprecated: Use #GtkComboBox instead.


 <!-- ##### FUNCTION gtk_combo_set_item_string ##### -->
@@ -205,7 +205,7 @@ selected. This is needed if the list item is not a simple label.
@combo: a #GtkCombo.
@item: a #GtkItem.
@item_value: the string to place in the #GtkEntry when @item is selected.
-@Deprecated: 2.4: Use #GtkComboBox instead.
+@Deprecated: Use #GtkComboBox instead.


 <!-- ##### FUNCTION gtk_combo_disable_activate ##### -->
@@ -217,6 +217,6 @@ instead.
 </para>

@combo: a #GtkCombo.
-@Deprecated: 2.4: Use #GtkComboBox instead.
+@Deprecated: Use #GtkComboBox instead.


--- a/docs/reference/gtk/tmpl/gtkcombobox.sgml
+++ b/docs/reference/gtk/tmpl/gtkcombobox.sgml
@@ -85,21 +85,11 @@ gtk_combo_box_get_active_text().

 </para>

-<!-- ##### ARG GtkComboBox:popup-shown ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkComboBox:row-span-column ##### -->
 <para>

 </para>

-<!-- ##### ARG GtkComboBox:tearoff-title ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkComboBox:wrap-width ##### -->
 <para>

@@ -116,6 +106,8 @@ gtk_combo_box_get_active_text().
 </para>

@Returns: 
+<!-- # Unused Parameters # -->
+@model: 


 <!-- ##### FUNCTION gtk_combo_box_new_with_model ##### -->
@@ -197,6 +189,8 @@ gtk_combo_box_get_active_text().

@combo_box: 
@index_: 
+<!-- # Unused Parameters # -->
+@index: 


 <!-- ##### FUNCTION gtk_combo_box_get_active_iter ##### -->
@@ -353,24 +347,6 @@ gtk_combo_box_get_active_text().
@Returns: 


-<!-- ##### FUNCTION gtk_combo_box_set_title ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@title: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_title ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_combo_box_set_focus_on_click ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
+++ b/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
@@ -19,15 +19,6 @@ and the entry will show the content of the text column in the selected row.  To
 get the text from the entry, use gtk_combo_box_get_active_text().
 </para>

-<para>The changed signal will be emitted while typing into a GtkComboBoxEntry, 
-as well as when selecting an item from the GtkComboBoxEntry's list. Use 
-gtk_combo_box_get_active() or gtk_combo_box_get_active_iter() to discover 
-whether an item was actually selected from the list.
-</para>
-
-<para>Connect to the activate signal of the GtkEntry (use gtk_bin_get_child()) to 
-detect when the user actually finishes entering text.</para>
-
 <para>
 The convenience API to construct simple text-only #GtkComboBox<!-- -->es can
 also be used with #GtkComboBoxEntry<!-- -->s which have been constructed
@@ -59,6 +50,9 @@ with gtk_combo_box_entry_new_text().
 </para>

@Returns: 
+<!-- # Unused Parameters # -->
+@model: 
+@text_column: 


 <!-- ##### FUNCTION gtk_combo_box_entry_new_with_model ##### -->
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -260,6 +260,7 @@ Does the same as gtk_container_set_border_width().
 Does the same as gtk_container_get_children().
 </para>

+@Returns: 
@Deprecated: Use gtk_container_get_children() instead.


@@ -363,6 +364,8 @@ Does the same as gtk_container_get_children().
@child: 
@first_prop_name: 
@Varargs: 
+<!-- # Unused Parameters # -->
+@first_arg_name: 


 <!-- ##### FUNCTION gtk_container_child_get_property ##### -->
@@ -482,6 +485,8 @@ Does the same as gtk_container_get_children().
@cclass: 
@property_name: 
@Returns: 
+<!-- # Unused Parameters # -->
+@class: 


 <!-- ##### FUNCTION gtk_container_class_install_child_property ##### -->
@@ -492,6 +497,8 @@ Does the same as gtk_container_get_children().
@cclass: 
@property_id: 
@pspec: 
+<!-- # Unused Parameters # -->
+@class: 


 <!-- ##### FUNCTION gtk_container_class_list_child_properties ##### -->
@@ -502,5 +509,7 @@ Does the same as gtk_container_get_children().
@cclass: 
@n_properties: 
@Returns: 
+<!-- # Unused Parameters # -->
+@class: 


--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -281,6 +281,8 @@ directly, but into the @vbox and @action_area, as described above.
@dialog: 
@child: 
@response_id: 
+<!-- # Unused Parameters # -->
+@widget: 


 <!-- ##### FUNCTION gtk_dialog_get_has_separator ##### -->
--- a/docs/reference/gtk/tmpl/gtkdnd.sgml
+++ b/docs/reference/gtk/tmpl/gtkdnd.sgml
@@ -164,24 +164,6 @@ notification of drags.
@widget: 


-<!-- ##### FUNCTION gtk_drag_dest_set_track_motion ##### -->
-<para>
-
-</para>
-
-@widget: 
-@track_motion: 
-
-
-<!-- ##### FUNCTION gtk_drag_dest_get_track_motion ##### -->
-<para>
-
-</para>
-
-@widget: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_drag_finish ##### -->
 <para>
 Informs the drag source that the drop is finished, and
--- a/docs/reference/gtk/tmpl/gtkentry.sgml
+++ b/docs/reference/gtk/tmpl/gtkentry.sgml
@@ -131,11 +131,6 @@ The #GtkEntry-struct struct contains only private data.

 </para>

-<!-- ##### ARG GtkEntry:inner-border ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkEntry:invisible-char ##### -->
 <para>

@@ -161,11 +156,6 @@ The #GtkEntry-struct struct contains only private data.

 </para>

-<!-- ##### ARG GtkEntry:truncate-multiline ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkEntry:visibility ##### -->
 <para>

@@ -181,21 +171,12 @@ The #GtkEntry-struct struct contains only private data.

 </para>

+<!-- ##### FUNCTION gtk_entry_new ##### -->
 <para>
 Creates a new #GtkEntry widget.
 </para>

-<!-- ##### ARG GtkEntry:inner-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_entry_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
+@Returns: a new #GtkEntry.


 <!-- ##### FUNCTION gtk_entry_new_with_max_length ##### -->
@@ -342,15 +323,6 @@ use gtk_editable_set_editable() instead.
@Returns: 


-<!-- ##### FUNCTION gtk_entry_get_inner_border ##### -->
-<para>
-
-</para>
-
-@entry: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_entry_get_width_chars ##### -->
 <para>

@@ -378,15 +350,6 @@ use gtk_editable_set_editable() instead.
@setting: 


-<!-- ##### FUNCTION gtk_entry_set_inner_border ##### -->
-<para>
-
-</para>
-
-@entry: 
-@border: 
-
-
 <!-- ##### FUNCTION gtk_entry_set_width_chars ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkentrycompletion.sgml
+++ b/docs/reference/gtk/tmpl/gtkentrycompletion.sgml
@@ -145,6 +145,8 @@ to the unmodified key via <literal>gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp

@completion: 
@Returns: 
+<!-- # Unused Parameters # -->
+@entry: 


 <!-- ##### FUNCTION gtk_entry_completion_set_model ##### -->
@@ -218,6 +220,8 @@ to the unmodified key via <literal>gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp
@completion: 
@index_: 
@text: 
+<!-- # Unused Parameters # -->
+@index: 


 <!-- ##### FUNCTION gtk_entry_completion_insert_action_markup ##### -->
@@ -228,6 +232,8 @@ to the unmodified key via <literal>gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp
@completion: 
@index_: 
@markup: 
+<!-- # Unused Parameters # -->
+@index: 


 <!-- ##### FUNCTION gtk_entry_completion_delete_action ##### -->
@@ -237,6 +243,8 @@ to the unmodified key via <literal>gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp

@completion: 
@index_: 
+<!-- # Unused Parameters # -->
+@index: 


 <!-- ##### FUNCTION gtk_entry_completion_set_text_column ##### -->
--- a/docs/reference/gtk/tmpl/gtkenums.sgml
+++ b/docs/reference/gtk/tmpl/gtkenums.sgml
@@ -58,7 +58,6 @@ Used to indicate the direction in which a #GtkArrow should point.
@GTK_ARROW_DOWN: Represents a downward pointing arrow.
@GTK_ARROW_LEFT: Represents a left pointing arrow.
@GTK_ARROW_RIGHT: Represents a right pointing arrow.
-@GTK_ARROW_NONE: No arrow. Since 2.10.

 <!-- ##### ENUM GtkAttachOptions ##### -->
 <para>
@@ -361,8 +360,9 @@ Used to change the appearance of an outline typically provided by a #GtkFrame.
@GTK_SHADOW_NONE: No outline.
@GTK_SHADOW_IN: The outline is bevelled inwards.
@GTK_SHADOW_OUT: The outline is bevelled outwards like a button.
-@GTK_SHADOW_ETCHED_IN: The outline has a sunken 3d appearance.
-@GTK_SHADOW_ETCHED_OUT: The outline has a raised 3d appearance
+@GTK_SHADOW_ETCHED_IN: The outline itself is an inward bevel, but the frame
+does
+@GTK_SHADOW_ETCHED_OUT: 

 <!-- ##### ENUM GtkSideType ##### -->
 <para>
@@ -410,9 +410,7 @@ Indicates the direction a sub-menu will appear.
 <para>
 Used to customize the appearance of a #GtkToolbar. Note that 
 setting the toolbar style overrides the user's preferences
-for the default toolbar style.  Note that if the button has only
-a label set and GTK_TOOLBAR_ICONS is used, the label will be
-visible, and vice versa.
+for the default toolbar style.
 </para>

@GTK_TOOLBAR_ICONS: Buttons display only icons in the toolbar.
--- a/docs/reference/gtk/tmpl/gtkfilechooser.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilechooser.sgml
@@ -209,14 +209,8 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data)
 	      <row>
 		<entry>location-popup</entry>
 		<entry>
-		  <keycombo><keycap>Control</keycap><keycap>L</keycap></keycombo> (empty path);
-		  <keycap>/</keycap> (path of "/")<footnote>
-		    <para>
-		      Both the individual <keycap>/</keycap> key and the
-		      numeric keypad's "divide" key are supported.
-		    </para>
-		  </footnote>;
-		  <keycap>~</keycap> (path of "~")
+		  <keycombo><keycap>Control</keycap><keycap>L</keycap></keycombo>;
+		  <keycap>/</keycap>
 		</entry>
 	      </row>
 	      <row>
@@ -293,12 +287,10 @@ class "GtkFileChooserDefault" binding "my-own-gtkfilechooser-bindings"
 	  put in the text entry for the file name.  By default this is bound to
 	  <keycombo><keycap>Control</keycap><keycap>L</keycap></keycombo>
 	  with a <parameter>path</parameter> string of "" (the empty
-	  string).  It is also bound to <keycap>/</keycap> with a
+	  string); it is also bound to <keycap>/</keycap> with a
 	  <parameter>path</parameter> string of "<literal>/</literal>"
 	  (a slash):  this lets you type <keycap>/</keycap> and
-	  immediately type a path name.  On Unix systems, this is bound to
-	  <keycap>~</keycap> (tilde) with a <parameter>path</parameter> string
-	  of "~" itself for access to home directories.
+	  immediately type a path name.
 	</para>

 	<variablelist role="params">
@@ -781,7 +773,14 @@ gtk_widget_destroy (chooser);

@GTK_FILE_CHOOSER_ERROR_NONEXISTENT: Indicates that a file does not exist.
@GTK_FILE_CHOOSER_ERROR_BAD_FILENAME: Indicates a malformed filename.
-@GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS: 
+
+<!-- ##### FUNCTION gtk_file_chooser_error_quark ##### -->
+<para>
+
+</para>
+
+@Returns: 
+

 <!-- ##### FUNCTION gtk_file_chooser_set_action ##### -->
 <para>
@@ -808,6 +807,8 @@ gtk_widget_destroy (chooser);

@chooser: 
@local_only: 
+<!-- # Unused Parameters # -->
+@files_only: 


 <!-- ##### FUNCTION gtk_file_chooser_get_local_only ##### -->
@@ -1091,6 +1092,8 @@ gtk_widget_destroy (chooser);

@chooser: 
@Returns: 
+<!-- # Unused Parameters # -->
+@file_chooser: 


 <!-- ##### FUNCTION gtk_file_chooser_get_preview_uri ##### -->
@@ -1100,6 +1103,8 @@ gtk_widget_destroy (chooser);

@chooser: 
@Returns: 
+<!-- # Unused Parameters # -->
+@file_chooser: 


 <!-- ##### FUNCTION gtk_file_chooser_set_extra_widget ##### -->
@@ -1205,6 +1210,8 @@ gtk_widget_destroy (chooser);
@uri: 
@error: 
@Returns: 
+<!-- # Unused Parameters # -->
+@folder: 


 <!-- ##### FUNCTION gtk_file_chooser_remove_shortcut_folder_uri ##### -->
@@ -1216,6 +1223,8 @@ gtk_widget_destroy (chooser);
@uri: 
@error: 
@Returns: 
+<!-- # Unused Parameters # -->
+@folder: 


 <!-- ##### FUNCTION gtk_file_chooser_list_shortcut_folder_uris ##### -->
--- a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
@@ -62,11 +62,6 @@ This should not be accessed directly.  Use the accessor functions below.

 </para>

-<!-- ##### ARG GtkFileChooserButton:focus-on-click ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkFileChooserButton:title ##### -->
 <para>

@@ -143,21 +138,3 @@ This should not be accessed directly.  Use the accessor functions below.
@n_chars: 


-<!-- ##### FUNCTION gtk_file_chooser_button_get_focus_on_click ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_file_chooser_button_set_focus_on_click ##### -->
-<para>
-
-</para>
-
-@button: 
-@focus_on_click: 
-
-
--- a/docs/reference/gtk/tmpl/gtkfontbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontbutton.sgml
@@ -20,8 +20,7 @@ dialog to change the font. It is suitable widget for selecting a font in a prefe

 <!-- ##### STRUCT GtkFontButton ##### -->
 <para>
-The GtkFontButton struct has only private members and should not be used
-directly.
+
 </para>


--- a/docs/reference/gtk/tmpl/gtkfontsel.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontsel.sgml
@@ -16,7 +16,8 @@ To set the font which is initially selected, use
 gtk_font_selection_set_font_name().
 </para>
 <para>
-To get the selected font use gtk_font_selection_get_font_name().
+To get the selected font use gtk_font_selection_get_font()
+or gtk_font_selection_get_font_name().
 </para>
 <para>
 To change the text which is shown in the preview area, use
@@ -79,19 +80,24 @@ Gets the currently-selected font.

 <!-- ##### FUNCTION gtk_font_selection_get_font_name ##### -->
 <para>
+Gets the currently-selected font name.
 </para>

-@fontsel: 
-@Returns: 
+@fontsel: a #GtkFontSelection.
+@Returns: the name of the currently selected font, or %NULL if
+    no font is selected.  You should g_free() the returned font name
+    after you are done with it.
+A newly allocated string with the currently-se


 <!-- ##### FUNCTION gtk_font_selection_set_font_name ##### -->
 <para>
+Sets the currently-selected font.
 </para>

-@fontsel: 
-@fontname: 
-@Returns: 
+@fontsel: a #GtkFontSelection.
+@fontname: a fontname.
+@Returns: %TRUE if the font was found.


 <!-- ##### FUNCTION gtk_font_selection_get_preview_text ##### -->
--- a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
@@ -13,7 +13,8 @@ To set the font which is initially selected, use
 gtk_font_selection_dialog_set_font_name().
 </para>
 <para>
-To get the selected font use gtk_font_selection_dialog_get_font_name().
+To get the selected font use gtk_font_selection_dialog_get_font()
+or gtk_font_selection_dialog_get_font_name().
 </para>
 <para>
 To change the text which is shown in the preview area, use
@@ -66,10 +67,11 @@ Gets the currently-selected font.

 <!-- ##### FUNCTION gtk_font_selection_dialog_get_font_name ##### -->
 <para>
+Gets the currently-selected font name.
 </para>

-@fsd: 
-@Returns: 
+@fsd: a #GtkFontSelectionDialog.
+@Returns: the currently-selected font name, or %NULL if no font is selected.


 <!-- ##### FUNCTION gtk_font_selection_dialog_set_font_name ##### -->
--- a/docs/reference/gtk/tmpl/gtkiconfactory.sgml
+++ b/docs/reference/gtk/tmpl/gtkiconfactory.sgml
@@ -220,6 +220,8 @@ looking up the icon to use for a given stock ID.
@width: 
@height: 
@Returns: 
+<!-- # Unused Parameters # -->
+@alias: 


 <!-- ##### FUNCTION gtk_icon_size_lookup_for_settings ##### -->
@@ -243,6 +245,8 @@ looking up the icon to use for a given stock ID.
@width: 
@height: 
@Returns: 
+<!-- # Unused Parameters # -->
+@alias: 


 <!-- ##### FUNCTION gtk_icon_size_register_alias ##### -->
--- a/docs/reference/gtk/tmpl/gtkicontheme.sgml
+++ b/docs/reference/gtk/tmpl/gtkicontheme.sgml
@@ -84,8 +84,8 @@ pixbuf = gtk_icon_theme_load_icon (icon_theme,
                                   &amp;error);
 if (!pixbuf)
  {
-    g_warning ("Couldn't load icon: &percnt;s", error-&gt;message);
-    g_error_free (error);
+    g_warning ("Couldn't load icon: &percnt;s", error->message);
+    g_error_free (message);
  }
 else
  {
@@ -140,7 +140,7 @@ gtk_icon_theme_set_custom_theme().

 <!-- ##### MACRO GTK_ICON_THEME_ERROR ##### -->
 <para>
-The #GQuark used for #GtkIconThemeError errors.
+
 </para>


--- a/docs/reference/gtk/tmpl/gtkiconview.sgml
+++ b/docs/reference/gtk/tmpl/gtkiconview.sgml
@@ -180,9 +180,11 @@ A function used by gtk_icon_view_selected_foreach() to map all
 selected rows.  It will be called on every selected row in the view.
 </para>

-@icon_view: a #GtkIconView
+@icon_view: 
@path: The #GtkTreePath of a selected row
@data: user data
+<!-- # Unused Parameters # -->
+@model: The #GtkTreeModel being viewed


 <!-- ##### FUNCTION gtk_icon_view_new ##### -->
@@ -561,15 +563,15 @@ selected rows.  It will be called on every selected row in the view.

 <!-- ##### ENUM GtkIconViewDropPosition ##### -->
 <para>
-An enum for determining where a dropped item goes.
+
 </para>

-@GTK_ICON_VIEW_NO_DROP: no drop possible
-@GTK_ICON_VIEW_DROP_INTO: dropped item replaces the item
-@GTK_ICON_VIEW_DROP_LEFT: droppped item is inserted to the left
-@GTK_ICON_VIEW_DROP_RIGHT: dropped item is inserted to the right
-@GTK_ICON_VIEW_DROP_ABOVE: dropped item is inserted above
-@GTK_ICON_VIEW_DROP_BELOW: dropped item is inserted below
+@GTK_ICON_VIEW_NO_DROP: 
+@GTK_ICON_VIEW_DROP_INTO: 
+@GTK_ICON_VIEW_DROP_LEFT: 
+@GTK_ICON_VIEW_DROP_RIGHT: 
+@GTK_ICON_VIEW_DROP_ABOVE: 
+@GTK_ICON_VIEW_DROP_BELOW: 

 <!-- ##### FUNCTION gtk_icon_view_enable_model_drag_source ##### -->
 <para>
--- a/Show More
+++ b/Show More