2.8.14

Wed Mar  8 15:17:21 2006  Tim Janik  <timj@imendio.com>

        * gtk/gtkentry.c (gtk_entry_adjust_scroll): constrain text area to
        positive values (#316712).

.cvsignore

@@ -19,7 +19,6 @@ 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

AUTHORS

@@ -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

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.

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
-

INSTALL

@@ -18,8 +18,8 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-2.9.1.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.9.1			   # change to the toplevel directory
+  % gzip -cd gtk+-2.8.14.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.8.14			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
   % make				   # build GTK
   [ Become root if necessary ]

MAINTAINERS

@@ -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.

Makefile.am

@@ -17,8 +17,6 @@ EXTRA_DIST =			\
 	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 +132,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 +188,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

NEWS

@@ -1,162 +1,378 @@
-Overview of Changes from GTK+ 2.9.0 to 2.9.1
-============================================
+Overview of Changes from GTK+ 2.8.13 to GTK+ 2.8.14
+===================================================
 
-* 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
+* Fixed invalid memory access in g_object_sink() from GLib-2.10.0 (in
+  combination with GLib-2.10, at least GLib-2.10.1 is required now).
 
-* GtkImage has an image property 
+* Bugs fixed: 
+ 320132 Drag cursor position not identical with the drag hotspot
+        [Christian Neumair]
+ 333133 wrong appearance for colour button [Christian Persch]
+ 321301 ms-windows-engine differences from native GUI - combo boxes
+        [Jernej Simončič, Dom Lachowicz]
+ 333291 Focus line of GtkExpander at the wrong place in RTL mode
+        [Benjamin Berg]
+ 324562 XInput events are at incorrect xy-coordinates [Denis Auroux]
+ 142536 Wacom pointer offset when using TopY other than 0 [Robert Ögren]
+ 332985 GtkButton doesn't allow image-only buttons via "image" 
+        property [Kalle Vahlmann]
+ 333555 When changing icon of button, icon does not change
+ 332466 Strange row spacing in GtkIconView when item width is set
+        [Donald Straney]
+ 333363 build_insensitive_pixmap does not check return value 
+        from gdk_pixbuf_get_from_drawable [Ed Catmur]
+ 333268 Crash in gnome-program when running a program with an wrong display
+        [Paolo Maggi, Christian Persch]
+ 333377 Cursor does not appear everytime when clicking on the widget
+        [Steve Frécinaux]
+ 323401 blink_cb optimization is not working
+ 316689 GtkTreeView does not resize correctly [Chris Lord]
+ 148518 Fix incremental loading of 8-bit pcx files [Magnus Bergmann]
 
-* GtkTextBuffer has a cursor-position property
+* Updated translations (cy,de,es,nn,pl)
 
-* Arrow sizes in scrolled menus and notebooks are themable
 
-* GDK keysyms have be synched with Xorg 7.1
+Overview of Changes from GTK+ 2.8.12 to GTK+ 2.8.13
+===================================================
 
 * 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
+ 330732 Can't select some items in GtkIconView [Donald Straney]
+ 330944 gtk_icon_theme_list_icons: example contexts don't work
+        [John Spray]
+ 331097 gnopernicus crashes on changing display screen source 
+        for magnifier [Oana Serb]
+ 331467 evince crashes in gdk_region_union_with_rect [Benjamin Berg]
+ 331820 Small error in _gdk_gc_update_context [Matthias]
+ 331785 gtk.Notebook.get_current_page() returns incorrect page 
+        number when pages hidden [Sebastien Bacher]
+ 331940 GtkAboutDialog not responsive to Escape key [Daniel Drake]
+ 331440 GtkNotebook popup menu not keynavigatable [Paolo Borelli]
+ 331651 GtkRadioButton does not issue notify::active
+ 332059 Make more use of G_DISABLE_ASSERT in TextView code 
+        [Arnaud Charlet]
 
-* Updated translations (de,es,gl,gu,nl)
+* Updated translations (eu,ka,uk)
 
 
-Overview of Changes from GTK+ 2.8.x to 2.9.0
-============================================
+Overview of Changes from GTK+ 2.8.11 to GTK+ 2.8.12
+===================================================
 
-* GtkStatusIcon, a cross-platform "tray icon" API
+* The font picker button can now display fractional
+  font sizes [Ross Burton]
 
-* GtkAssistant, a widget for creating multi-step wizards
+* Updates for the windows theme [Dom Lachowicz]
 
-* GtkLinkButton, a widget that displays a clickable hyperlink
+* Workaround for cairo hitting a slow path in the
+  X server [Federico Mena Quintero]
 
-* GtkRecentChooser, widgets to display and select recently used files
+* Bugs fixed:
+ 145243 root window drag FROM testdnd not working [Andrew S. Dixon]
+ 321054 Pointer grabs misbehave on Win32 [Tor Lillqvist]
+ 322042 Buggy RTL support in ellipsized labels [Behdad Esfahbod] 
+ 325521 enter_notify_event are not received on popup 
+        window in Win32 [Tor Lillqvist]
+ 327217 set_decorations() is overridden by window type 
+        hint [John Ehresman]
+ 327375 accept_focus isn't respected [John Ehresman]
+ 328820 they keypad '/' key should open the "open location" 
+        dialog [Federico Mena Quintero]
+ 329144 critical in gtk_widget_event [Wouter Bolsterlee]
+ 329124 distclean removes README [Kjartan Maraas, Tim Janik]
+ 329208 unsetting the "active" property of GtkToggleToolButton 
+        doesn't work properly [Guillaume Cottenceau]
+ 329876 Crash in gtktreemodelfilter.c when using gtk-demo 
+        with file picker [Kristian Rietveld]
+ 329099 gtk_misc_set_padding fails with labels in RTL 
+        locales [Hooman Mesgary]
+ 330022 Wrong pixel values in rsvg_cairo_render_image [Dom Lachowicz]
+ 330177 gtk_entry_completion_match_selected generates a critical 
+        warning when completion model is empty [Raphael Slinckx]
+ 330389 gtk_file_info_copy corrupts memory [Markku Vire]
+ 330563 image loaders don't check callbacks for NULL [Benjamin Otte]
 
-* GtkPrintOperation, cross-platform printing support
+* Documentation improvements [Ross Burton, Murray Cumming, 
+  Mart Raudsepp, Federico Mena Quintero, Milosz Derezynski]
 
-* A framework for rich text copy and paste and DND
+* Translation updates (cy,lt,nl,pt,ru,sr,sr@Latn,vi)
 
-* GtkCellRendererAccel, a cell renderer for key combinations
 
-* GtkCellRendererSpin, a cell renderer which edits numeric values 
-  using a spin button
+Overview of Changes from GTK+ 2.8.10 to GTK+ 2.8.11
+===================================================
 
-* GtkAction works with named icons in addition to stock icons
+* Avoid memory overruns in the pixbuf theme engine
+  with nonsensical gradient specifications.  [Matthias]
 
-* GtkNotebook supports DND, allowing to reorder tabs, move tabs
-  between notebooks and drop tabs on the desktop to open a new window
+* Bugs fixed:
+ 326003 Cursor doesn't move as expected [Evert Verhellen]
+ 326806 Segfault from combination of gtk_container_set_resize_mode() 
+        and GtkComboBox [Sebastien Bacher]
+ 327751 segfault in update_cursor on amd64 [Ryan Lovett]
+ 327538 eog crashes at launch under AIX [Christophe Belle]
+ 153213 "~" should bring up the location dialog [Dan Winship]
+ 327934 gtk_text_layout_get_cursor_locations() chokes on 
+        layout=0x0 [Christian Kirbach]
 
-* GtkTreeView:
-  - Enhanced customizability (e.g. grouping) with the
-    show-expanders and level-indentation properties
-  - Allow to embed the search popup
-  - Better search popup positioning
+* Documentation improvements [Federico Mena Quintero]
 
-* 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
+* Translation updates (es,pt_BR,zh_HK,zh_TW)
 
-* Animations can now be globally controlled by settings
+Overview of Changes from GTK+ 2.8.9 to GTK+ 2.8.10
+==================================================
+* Derive GtkObject from GInitiallyUnowned instead of
+  GObject, if possible. Note that this change is known
+  to break versions of the GTK+ Perl bindings older
+  than GTK+ Perl 2.13.4. [Tim Janik]
 
-* The gtk-touchscreen-mode setting controls a number of changes
-  that make GTK+ work better on touchscreens
+* Add a setting to allow falling back to another icon
+  theme before trying hicolor. [Rodney Dawes]
 
-* Password entries can optionally show the last entered character
-  for a short while, controlled by the password-hint-timeout setting
+* Require GLib 2.8.5
 
-* GTK+ can now consult an additional fallback icon theme before
-  falling back to hicolor
+* Updated translations (ca,el,es,fr,hi,it,ko,pt_BR,vi)
 
-* 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
+* Bugs fixed:
+ 137351 GtkEntryCompletion sometimes selects first completion item
+        [Niklas Knutsson]
+ 165714 GtkEntryCompletion doesn't complete on paste [Christian Neumair]
+ 317687 gnome-panel crash by clicking on settings
+ 321548 speed up gtk_text_iter_set_visible_line_index [Paolo 
+        Borelli]
+ 323843 Garbage in gtk_text_view_get_border_window_size()
+ 323876 Broadcasting _GTK_LOAD_ICONTHEMES is a performance 
+        bug [Peter Lund]
+ 324044 Documentation entry for GtkTreeView::row-activated 
+        [Davyd Madeley]
+ 323504 Gtk-CRITICAL when dragging a launcher from the menu 
+        to the top panel [Kjartan Maraas]
+ 323655 Improved support for Icon Naming Spec in unix filesystem 
+        backend [Rodney Dawes]
+ 323995 hidden widgets distort the left/right/up/down focus 
+        order [Dan Winship]
+ 324588 icon_view auto dnd and the item-activated signal 
+        [Dave Andreoli]
+ 322475 icon view's horizontal layout doesn't respect 
+        item_width [Alex Graveley]
+ 324815 Typo in gtkwindow.c [Ross Burton]
+ 324996 Description about gtk_im_context_filter_keypress on API 
+        reference
+ 323666 gdk_window_scroll doesn't invalidate if another top-level 
+        is above window [John Ehresman]
+ 322264 gdk_drawable_get_visible_region win32 / x11 inconsistency 
+        [John Ehresman]
+ 325358 word erase in text fields considers space as a separate 
+        word [Akkana Peck]
+ 325443 gtk_drag_begin doesn't work unless given a motion event 
+        [Peter Harvey]
+ 325723 gtk_ui_manager_get_toplevels does not return an empty 
+        list [Steve Chaplin]
+ 305894 excessive memory use in gdk_pixbuf_new_from_file_XXX 
+        functions [Denis Vlasenko, Michael Natterer]
+ 325199 The API reference for gtk_exit() states that it's 
+        deprecated but doesn't state the replacement function, 
+        if any [Ævar Arnfjörð Bjarmason]
+ 325869 GtkViewPort not releasing signal handlers on destruction
+        [Jorn Baayen]
+ 325782 GtkToolButton ::clicked signal should set G_SIGNAL_ACTION 
+        [Martyn Russell]
+ 325817 FileChooserButton uses "Home" instead of directory name 
+        [Federico Mena Quintero]
+ 326098 label alignment is wrong when width-chars is set [Benjamin Otte]
+ 326200 translations in GtkActionGroup erroneously translated 
+        [Christian Stimming]
+ 326429 in gtk.h, twice the same lines [Benoît Carpentier]
+ 326064 Artifacts on some widgets [Andrew Conkling]
 
-* 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
+Overview of Changes from GTK+ 2.8.8 to GTK+ 2.8.9
+=================================================
+* Bugs fixed:
+ 321560 File chooser filter behaves weird [Bogdan Nicula,
+        Federico Mena Quintero]
+ 317999 2.8.4 to 2.8.6: sound-juicer crash, fileselector 
+        assertions [Sebastian Bacher]
+ 322569 On unsetting the Model, GtkTreeView does not clear 
+        it's associated TreeSelection [Milosz Derezynski] 
+ 322998 Crash on selecting a file of null mime-type [Sadrul 
+        Habib Chowdhury]
+ 323024 gtktoolbutton leaks a pixbuf [Paolo Borelli]
+ 323209 GdkEvent leaked in gtktreeview.c / 
+        gtk_tree_view_key_press [Crispin Flowerday]
+ 323073 Typo in trap_activate_cb() [Sadrul Habib Chowdhury]
+ 323045 gtkcalendar.c: The identifier is already declared. 
+        [Kazuki Iwamoto]
+ 323386 gtk_menu_attach_to_widget() does not take NULL 
+        detacher [Jorn Baayen]
+ 307196 Unhinted fonts are measured incorrectly and drawing 
+        problems occur as a result [Alex Jones, Behdad Esfahbod]
+ 316310 unwanted scrolling in recent gtk [Paolo Borelli]
+ 322019 Toolbars without icons are invisible in icon-only 
+        mode [Ross Burton]
+ 323077 Search-entry in the TreeView not working properly 
+        [Sadrul Habib Chowdhury]
+ 323475 gtktoolbutton.c:562: warning: 'image' is used 
+        uninitialized in this function [Ross Burton]
+ 323577 reference count of textbuffer increases with each 
+        paste 
+ 323629 gtk_selection_data_get_uris leaks memory
+        [Markku Vire]
 
-* Bug fixes
-  - Too many to list them here
+* Other changes
+ - Remove GMemChunk from public header files to
+   support building against GLib 2.10 [Matthias Clasen]
+ - Report errors in option parsing [Matthias]
+ - Merge upstream xdgmime changes to handle duplicate
+   glob patterns [Matthias]
+
+Overview of Changes from GTK+ 2.8.7 to GTK+ 2.8.8
+=================================================
+* GtkFileChooser
+ - Make F2 work for renaming bookmarks [Jaap A. Haitsma, 
+   Paolo Borelli]
+* GtkEntry
+ - Turn off input methods in password entries [James Su]
+* Win32 changes
+ - Various visual improvements to the ms-windows
+   theme [Dom Lachowicz]
+ - Rework window decoration handling [Tor Lillqvist]
+ - Fix localized weekday and month names in GtkCalendar [Tor]
+ - Make urgency hint work on NT4 [Tor]
+* Other fixes [Arjan van de Ven, Philip Langdale, Jens
+  Granseuer, Bogdan Nicula, Benedikt Meurer, Michael
+  Natterer, Kazuki Iwamoto, Paolo Borelli, Søren Sandmann,
+  Jean-Yves Lefort, Milosz Derezynski, Tze'ela Hebron]
+* Documentation improvements [Elie De Brauwer]
+* Updated translations (be,hu,sk,th,wa)
+
+Overview of Changes from GTK+ 2.8.6 to GTK+ 2.8.7
+=================================================
+* GtkFileChooser
+ - Don't special-case the names of Home and Desktop 
+   [Federico Mena Quintero]
+ - Avoid loading more than one directory initially.
+   [Federico]
+ - Make the file chooser work better with window
+   groups [Christian Persch]
+ - Improve keynav in the pathbar [Carlos Garnacho,
+   Andrei Yurkevich]
+ - Don't access unmounted volumes [Federico]
+* GtkTextView
+ - Avoid quadratic blowup when deleting text with
+   lots of tags [Matthias Clasen]
+ - Fix drag-selection corner cases [Arvind S N, 
+   Paolo Borelli]
+* GtkEntry
+ - Add the entry completion popup to the window
+   group  [Christian Persch]
+* GtkTreeView
+ - Fix background drawing in RTL locales [Eric Cazeaux]
+ - Handle Shift-G for going back in typeahead 
+   search [Christian Neumair]
+* GtkComboBox
+ - Leave Ctrl-PageUp/PageDown to applications 
+   [Christian Neumair]
+* Fix compilation problems with gtkcalendar.c 
+  [Matthias Hasselmann]
+* Add labels for GTK_STOCK_CONNECT and 
+  GTK_STOCK_DISCONNECT items [Richard Hult]
+* Resolve symbols in dlopened modules lazily  [Laszlo
+  Peter]
+* GDK
+ - Don't try to set overlarge window icons [Claudio 
+   Saavedra]
+ - Improve handling of odd keymaps [Kean Johnston]
+* Win32 changes
+ - Speed up compositing [John Ehresman]
+ - Improve handling of clipboard [Tor Lillqvist]
+ - Improve visuals of scrollbars, toolbars, handleboxes
+   and menubars in the ms-windows theme [Dom Lachowicz]
+ - Make icon masks work on Win98 [Peter Zelezny]
+ - Hide resize and maximize buttons on non-resizable
+   windows [Tor]
+ - Don't hide dotfiles [Tor]
+* Bug fixes [Kazuki Iwamoto, Ross Burton, Michael
+  Natterer, Bogdan Nicula, Damien Carbery, Gustavo
+  Carneiro, Tommi Komulainen, Thomas Klausner, 
+  Alexander Larsson, Bastien Nocera, Federico
+  Mena Quintero, John Ehresman, Paolo Borelli,
+  Antonio Sacchi, Christian Persch, Carlos
+  Garnacho, Jeremy Cook, Nickolay V. Shmyrev,
+  Richard Hult, Maxim Udushlivy, Peter Zelezny]
+* Documentation improvements [Paolo Borelli,
+  Christian Neumair, Christian Persch
+
+Overview of Changes from GTK+ 2.8.5 to GTK+ 2.8.6
+=================================================
+* GtkFileChooser
+ - Don't reload the current folder unnecessarily on map [Federico
+   Mena Quintero]
+* Revert a change from 2.8.5 that could lead to assertion 
+  failures when finalizing GtkStyles [Matthias Clasen]
+* Remove context prefixes from Portugese translations [Duarte 
+  Henriques]
+  
+Overview of Changes from GTK+ 2.8.4 to GTK+ 2.8.5
+=================================================
+* GtkFileChooser
+ - Don't clear the file name entry too often when
+   in SAVE mode.  [Jürg Billeter]
+ - Reduce the startup time in OPEN mode [Federico 
+   Mena Quintero]
+* Stop drag in GtkPaned when grab shadowed [Matthias Clasen]
+* Correct the calculation for the first weekday
+  in GtkCalendar [Matthias Clasen]
+* Use a larger buffer when determining the image
+  format in gdk-pixbuf [Sebastian Bacher, Dom Lachowicz]
+* Win32 bug fixes [Kazuki Iwamoto, Tor Lillqvist]
+* Other bug fixes [Tor Lillqvist, Gustavo Carneiro,
+  Paolo Borelli, Ray Strode, Søren Sandmann, Tommi Komulainen,
+  Benjamin Berg]
+
+Overview of Changes from GTK+ 2.8.3 to GTK+ 2.8.4
+=================================================
+* GtkFileChooser
+ - Turn off the profiling code [Federico Mena Quintero]
+* GtkEntryCompletion
+ - Make completion work with multibyte characters
+   [Tommi Komulainen]
+ - Improve positioning of large popups [Tommi Komulainen]
+* GtkTreeView
+ - Make column reordering by DND work better [Dan
+   Winship]
+* GtkCalendar
+ - Correctly determine the first weekday from
+   nl_langinfo() [Stanislav Brabec]
+* GtkFontSel, GtkFontButton
+ - Handle invalid font names better [Michael R. Walton,
+   Ed Catmur]
+* Deliver destroy events [Chris Lahey]
+* Fix redrawing of widgets in the the presence
+  of shaped child windows [Dan Winship]
+* Win32 changes
+ - Prune unnecessary mouse events [Tor Lillqvist]
+ - Fix memory corruption when using display 
+   names [Tor Lillqvist]
+* Other bug fixes [Alexander Larsson, John Cupitt,
+  John Finlay, Kjartan Maraas, Thomas Leonard,
+  Guillaume Cottenceau, Alexander Nedotsukov, Tim Janik,
+  Tor Lillqvist, Tommi Komulainen
+* Documentation improvements [Guillaume Cottenceau,
+  Torsten Schoenfeld, Damon Chaplin, Vincent Untz,
+  Tommi Komulainen, Federico Mena Quintero
+* New and updated translations (bg,bn,et,eu,fr,gl,hi,it,
+  ku,ru,sr,sv,tr,vi)
+
+Overview of Changes from GTK+ 2.8.2 to GTK+ 2.8.3
+=================================================
+* Fix problems with the handling of initial settings
+  for font options and cursor themes [Frederic Crozat, 
+  Joe Markus Clarke, Owen Taylor, Kjartan Maraas]
+* Add a --ignore-theme-index option to 
+  gtk-update-icon-cache [JP Rosevaar]
+* Other bug fixes [Christian Persch, Owen Taylor,
+  Ed Catmur, Thomas Fitzsimmons, JP Rosevaar, Tor
+  Lillqvist, Colin Walters, Yong Wang, Matthias,
+  Kjartan Maraas, Christian Persch, Mark McLoughlin]
+* Updated translations (ca,es,fr,pt_BR)
 
 Overview of Changes from GTK+ 2.8.1 to GTK+ 2.8.2
 =================================================

README

@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.9.1. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.8.14. 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.
@@ -25,47 +25,6 @@ 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
-
-* Suffixes 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.
-
 Release notes
 =============
 

README.cvs-commits

@@ -28,7 +28,7 @@ to ask people commiting to GTK+ to follow a few rules:
 2) There must be a ChangeLog for every commit. (If you discover that
    you only committed half the files you meant to and need to fix that
    up, or something, you don't need a new ChangeLog entry. But in general,
-   ChangeLog entries are mandatory.) Changes without ChangeLog entries
+   ChangeLog entries are mandatory.) Changes with out ChangeLog entries
    will be reverted.
 
 3) There _must_ be a ChangeLog for every commit.
@@ -38,7 +38,7 @@ Notes:
 * If you are going to be changing many files in an experimental fashion,
   it probably is a good idea to create a separate branch for your changes.
 
-* The ChangeLog entries should preferably match in date format
+* The ChangeLog entries should preferrably match in date format
   with the existing entries. You can set how emacs does this
   by using customize mode:
 

README.in

@@ -25,47 +25,6 @@ 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
-
-* Suffixes 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.
-
 Release notes
 =============
 

config.h.win32.in

@@ -31,15 +31,13 @@
 /* #undef HAVE_STPCPY */
 /* #undef HAVE_XSHM_H */
 /* #undef HAVE_SHAPE_EXT */
-/* #undef HAVE_SOLARIS_XINERAMA */
 /* #undef HAVE_SYS_SELECT_H */
 #ifndef _MSC_VER
 #define HAVE_SYS_TIME_H 1
 #else /* _MSC_VER */
 /* #undef HAVE_SYS_TIME_H */
 #endif /* _MSC_VER */
-/* #undef HAVE_XFREE_XINERAMA */
-/* #undef HAVE_XINERAMA */
+#define HAVE_WINSOCK_H 1
 #define HAVE_WINTAB 1
 /* #undef HAVE_XCONVERTCASE */
 /* #undef HAVE_XFT */
@@ -55,6 +53,9 @@
 #define USE_MMX 1
 #endif
 
+/* Define to use X11R6 additions to XIM */
+/* #undef USE_X11R6_XIM */
+
 /* Define to use XKB extension */
 /* #undef HAVE_XKB */
 
@@ -85,184 +86,204 @@
    The entries are in sort -df order: alphabetical, case insensitive,
    ignoring punctuation (such as underscores).  */
 
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define if using `alloca.c'. */
+/* #undef C_ALLOCA */
+
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
-/* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "UNUSED"
+/* Define if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
 
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define if you have the <argz.h> header file. */
+/* #undef HAVE_ARGZ_H */
+
+/* Define if you have the `bind_textdomain_codeset' function. */
+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
 
 /* Is the wctype implementation broken */
 /* #undef HAVE_BROKEN_WCTYPE */
 
-/* Define to 1 if you have the `dcgettext' function. */
+/* Define if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
+/* Define if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
-/* Define to 1 if you have the `flockfile' function. */
-/* #undef HAVE_FLOCKFILE */
+/* Define if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
 
-/* Define to 1 if you have the `getpagesize' function. */
+/* Define if you have the `getpagesize' function. */
 #ifndef _MSC_VER
 #define HAVE_GETPAGESIZE 1
 #else /* _MSC_VER */
 /* #undef HAVE_GETPAGESIZE */
 #endif /* _MSC_VER */
 
-/* Define to 1 if you have the `getresuid' function. */
+/* Define if you have the `getresuid' function. */
 /* #undef HAVE_GETRESUID */
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_INTTYPES_H 1
-#else /* _MSC_VER */
+/* Define if you have the <inttypes.h> header file. */
 /* #undef HAVE_INTTYPES_H */
-#endif /* _MSC_VER */
 
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
 
-/* Define to 1 if you have the <locale.h> header file. */
+/* Define if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
-/* Define to 1 if you have the `lstat' function. */
+/* Define if you have the `lstat' function. */
 /* #undef HAVE_LSTAT */
 
-/* Define to 1 if you have the `mallinfo' function. */
-/* #undef HAVE_MALLINFO */
+/* Define if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
 
-/* Define to 1 if you have the <memory.h> header file. */
+/* Define if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
-/* Define to 1 if you have the `mkstemp' function. */
+/* Define if you have the `mkstemp' function. */
 /* #undef HAVE_MKSTEMP */
 
-/* Define to 1 if you have a working `mmap' system call. */
+/* Define if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
-/* Define to 1 if you have the <pwd.h> header file. */
+/* Define if you have the `munmap' function. */
+/* #undef HAVE_MUNMAP */
+
+/* Define if you have the <nl_types.h> header file. */
+/* #undef HAVE_NL_TYPES_H */
+
+/* Define if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define if you have the <pwd.h> header file. */
 /* #undef HAVE_PWD_H */
 
-/* Have the Xrandr extension library */
-/* #undef HAVE_RANDR */
+/* Define if you have the `setenv' function. */
+/* #undef HAVE_SETENV */
 
-/* Define to 1 if you have the <stdint.h> header file. */
+/* Define if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define if you have the <stdint.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_STDINT_H 1
 #else /* _MSC_VER */
 /* #undef HAVE_STDINT_H */
 #endif /* _MSC_VER */
 
-/* Define to 1 if you have the <stdlib.h> header file. */
+/* Define if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
-/* Define to 1 if you have the <strings.h> header file. */
+/* Define if you have the `strcasecmp' function. */
+#ifndef _MSC_VER
+#define HAVE_STRCASECMP 1
+#else /* _MSC_VER */
+/* #undef HAVE_STRCASECMP */
+#endif /* _MSC_VER */
+
+/* Define if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define if you have the <strings.h> header file. */
 /* #undef HAVE_STRINGS_H */
 
-/* Define to 1 if you have the <string.h> header file. */
+/* Define if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define to 1 if you have the <sys/stat.h> header file. */
+/* Define if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
-/* Define to 1 if you have the <sys/time.h> header file. */
+/* Define if you have the <sys/time.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_SYS_TIME_H 1
 #else /* _MSC_VER */
 /* #undef HAVE_SYS_TIME_H */
 #endif /* _MSC_VER */
 
-/* Define to 1 if you have the <sys/types.h> header file. */
+/* Define if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
 /* #undef HAVE_SYS_WAIT_H */
 
-/* Define to 1 if you have the <unistd.h> header file. */
+/* Define if you have the <unistd.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_UNISTD_H 1
 #else /* _MSC_VER */
 /* #undef HAVE_UNISTD_H */
 #endif /* _MSC_VER */
 
-/* Have uxtheme.h include file */
-#define HAVE_UXTHEME_H 1
-
 /* Have wchar.h include file */
 #define HAVE_WCHAR_H 1
 
 /* Have wctype.h include file */
 #define HAVE_WCTYPE_H 1
 
-/* Define if we have X11R6 */
-/* #undef HAVE_X11R6 */
+/* Define if you have the <winsock.h> header file. */
+#define HAVE_WINSOCK_H 1
 
-/* Define to 1 if you have the `XConvertCase' function. */
-/* #undef HAVE_XCONVERTCASE */
+/* Define if you have the `__argz_count' function. */
+/* #undef HAVE___ARGZ_COUNT */
 
-/* Have the Xcursor library */
-/* #undef HAVE_XCURSOR */
+/* Define if you have the `__argz_next' function. */
+/* #undef HAVE___ARGZ_NEXT */
 
-/* Have the XFIXES X extension */
-/* #undef HAVE_XFIXES */
-
-/* Define to 1 if you have the `XInternAtoms' function. */
-/* #undef HAVE_XINTERNATOMS */
-
-/* Have the SYNC extension library */
-/* #undef HAVE_XSYNC */
-
-/* Define if _NL_TIME_FIRST_WEEKDAY is available */
-/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
-
-/* Define if <X11/extensions/XIproto.h> needed for xReply */
-/* #undef NEED_XIPROTO_H_FOR_XREPLY */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "gtk+"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gtk+ 2.9.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gtk+"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
+/* Define if you have the `__argz_stringify' function. */
+/* #undef HAVE___ARGZ_STRINGIFY */
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
-/* Define to 1 if you have the ANSI C header files. */
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
+
+/* Define if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* Whether to load modules via .la files rather than directly */
-/* #undef USE_LA_MODULES */
-
-/* Define to 1 if the X Window System is missing or not being used. */
+/* Define if the X Window System is missing or not being used. */
 /* #undef X_DISPLAY_MISSING */
 
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define gid_t int
 
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+/* #undef inline */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define uid_t int

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], [9])
-m4_define([gtk_micro_version], [1])
+m4_define([gtk_minor_version], [8])
+m4_define([gtk_micro_version], [14])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_interface_age], [14])
 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.10.1])
-m4_define([pango_required_version], [1.13.0])
+m4_define([glib_required_version], [2.8.5])
+m4_define([pango_required_version], [1.9.0])
 m4_define([atk_required_version], [1.0.1])
-m4_define([cairo_required_version], [1.1.6])
+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]] 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) ;;
+  *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb or win32.]);;
 esac
 
 gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
@@ -370,8 +370,8 @@ AC_ARG_ENABLE(explicit-deps,
 AC_MSG_CHECKING([Whether to write dependencies into .pc files])
 case $enable_explicit_deps in
   auto)
-    deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh`
-    if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
+    deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
+    if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
       enable_explicit_deps=yes  
     else
       enable_explicit_deps=no  
@@ -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 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 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@Latn sr@ije sv ta te th tk tr uk uz uz@Latn vi wa xh yi zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
 AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
@@ -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
@@ -1037,10 +993,10 @@ if test $cross_compiling = yes; then
   fi
 fi
 
-if test ! -f $srcdir/gtk/gtkbuiltincache.h && 
+if test ! -f $srcdir/gtk/stock-icons/gtkstockpixbufs.h && 
    test "x$REBUILD_PNGS" = "x#" ; then
      AC_MSG_ERROR([
-*** gtkbuiltincache.h is not in the tree, and cannot be built
+*** gtkstockpixbufs.h is not in the tree, and cannot be built
 *** because you don't have libpng, or (when cross-compiling) you 
 *** don't have a prebuilt gdk-pixbuf-csource on the host system.])
 fi
@@ -1093,7 +1049,6 @@ if test "x$gdktarget" = "xx11"; 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`"
     
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
@@ -1119,7 +1074,7 @@ if test "x$gdktarget" = "xx11"; then
 
     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 -lXrender $X_EXTRA_LIBS"
   fi
 
   # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
@@ -1275,7 +1230,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
 
@@ -1371,13 +1326,6 @@ else
   AM_CONDITIONAL(USE_WIN32, false)
 fi
 
-if test "x$gdktarget" = "xquartz"; then
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
-  AM_CONDITIONAL(USE_QUARTZ, true)
-else
-  AM_CONDITIONAL(USE_QUARTZ, false)
-fi
-
 GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
 GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
 
@@ -1405,27 +1353,6 @@ else
   AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
 fi
 
-if test "x$gdktarget" = "xdirectfb"; then
-  DIRECTFB_REQUIRED_VERSION=0.9.21
-  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 directfb` $GDK_EXTRA_CFLAGS"
-      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs 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
@@ -1535,36 +1462,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`
-
-  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
 ################################################################
@@ -1673,12 +1570,6 @@ elif test "x$gdktarget" = "xlinux-fb" ; then
   gdk_windowing='
 #define GDK_WINDOWING_FB
 #define GDK_NATIVE_WINDOW_POINTER'
-elif test "x$gdktarget" = "xquartz" ; then
-  gdk_windowing='
-#define GDK_WINDOWING_QUARTZ'
-elif test "x$gdktarget" = "xdirectfb" ; then
-  gdk_windowing='
-#define GDK_WINDOWING_DIRECTFB'
 fi
 
 if test x$gdk_wchar_h = xyes; then
@@ -1704,7 +1595,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
@@ -1736,12 +1626,11 @@ gdk/win32/Makefile
 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
 gtk/gtk-win32.rc
+gtk/stock-icons/Makefile
 gtk/theme-bits/Makefile
 gtk/xdgmime/Makefile
 modules/Makefile
@@ -1751,10 +1640,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/pdf/Makefile
 perf/Makefile
 contrib/Makefile
 contrib/gdk-pixbuf-xlib/Makefile

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,10 +1,30 @@
-2006-05-16  Matthias Clasen  <mclasen@redhat.com>
+2006-03-08  Matthias Clasen  <mclasen@redhat.com>
 
-	* === Released 2.9.1 ====
+	* === Released 2.8.14 ===
 
-2006-05-04  Matthias Clasen  <mclasen@redhat.com>
+2006-02-24  Matthias Clasen  <mclasen@redhat.com>
 
-	* === Released 2.9.0 ===
+	* === Released 2.8.13 ===
+
+2006-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.12 === 
+
+2006-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.11 ===
+
+2006-01-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.10 ===
+	
+2005-12-09  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.8.9 ===
+
+2005-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* ===  Released 2.8.8 ===
 
 2005-11-17  Matthias Clasen  <mclasen@redhat.com>
 
@@ -12,11 +32,31 @@
 	* gdk-pixbuf-xlibrgb.c: const correctness fixes
 	found by Arjan van de Ven and gcc.
 
+2005-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.7 ===
+
 2005-10-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk-pixbuf-xlib-2.0.pc.in (Requires): Require
 	gmodule-no-export-2.0 instead of gmodule-2.0
 
+2005-10-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.6 ===
+
+2005-10-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.5 ===
+
+2005-09-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.4 ===
+
+2005-08-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.3 ===
+
 2005-08-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.8.2 ===

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 = \

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			\

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 			\

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

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)
     {

demos/gtk-demo/iconview_edit.c

@@ -63,7 +63,6 @@ set_cell_color (GtkCellLayout   *cell_layout,
       (color.red   >> 8) << 24 |
       (color.green >> 8) << 16 |
       (color.blue  >> 8) << 8;
-
   g_free (text);
 
   pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 24, 24);

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);
-  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_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_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_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;
-}

demos/testgtk/main.c

@@ -1,392 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <gtk/gtk.h>
-
-#include <demos.h>
-
-static GtkTextBuffer *info_buffer;
-static GtkTextBuffer *source_buffer;
-
-static gchar *current_file = NULL;
-
-enum {
-  TITLE_COLUMN,
-  FILENAME_COLUMN,
-  FUNC_COLUMN,
-  ITALIC_COLUMN,
-  NUM_COLUMNS
-};
-
-gboolean
-read_line (FILE *stream, GString *str)
-{
-  int n_read = 0;
-  
-  flockfile (stream);
-
-  g_string_truncate (str, 0);
-  
-  while (1)
-    {
-      int c;
-      
-      c = getc_unlocked (stream);
-
-      if (c == EOF)
-	goto done;
-      else
-	n_read++;
-
-      switch (c)
-	{
-	case '\r':
-	case '\n':
-	  {
-	    int next_c = getc_unlocked (stream);
-	    
-	    if (!(next_c == EOF ||
-		  (c == '\r' && next_c == '\n') ||
-		  (c == '\n' && next_c == '\r')))
-	      ungetc (next_c, stream);
-	    
-	    goto done;
-	  }
-	default:
-	  g_string_append_c (str, c);
-	}
-    }
-
- done:
-
-  funlockfile (stream);
-
-  return n_read > 0;
-}
-
-void
-load_file (const gchar *filename)
-{
-  FILE *file;
-  GtkTextIter start, end;
-  GString *buffer = g_string_new (NULL);
-  int state = 0;
-  gboolean in_para = 0;
-
-  if (current_file && !strcmp (current_file, filename))
-    return;
-
-  g_free (current_file);
-  current_file = g_strdup (filename);
-  
-  gtk_text_buffer_get_bounds (info_buffer, &start, &end);
-  gtk_text_buffer_delete (info_buffer, &start, &end);
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_delete (source_buffer, &start, &end);
-
-  file = fopen (filename, "r");
-  if (!file)
-    {
-      g_warning ("Cannot open %s: %s\n", filename, g_strerror (errno));
-      return;
-    }
-
-  gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
-  while (read_line (file, buffer))
-    {
-      gchar *p = buffer->str;
-      gchar *q;
-      
-      switch (state)
-	{
-	case 0:
-	  /* Reading title */
-	  while (*p == '/' || *p == '*' || isspace (*p))
-	    p++;
-	  q = p + strlen (p);
-	  while (q > p && isspace (*(q - 1)))
-	    q--;
-
-	  if (q > p)
-	    {
-	      int len_chars = g_utf8_pointer_to_offset (p, q);
-
-	      end = start;
-
-	      g_assert (strlen (p) >= q - p);
-	      gtk_text_buffer_insert (info_buffer, &end, p, q - p);
-	      start = end;
-
-	      gtk_text_iter_backward_chars (&start, len_chars);
-	      gtk_text_buffer_apply_tag_by_name (info_buffer, "title", &start, &end);
-
-	      start = end;
-	      
-	      state++;
-	    }
-	  break;
-	    
-	case 1:
-	  /* Reading body of info section */
-	  while (isspace (*p))
-	    p++;
-	  if (*p == '*' && *(p + 1) == '/')
-	    {
-	      gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
-	      state++;
-	    }
-	  else
-	    {
-	      int len;
-	      
-	      while (*p == '*' || isspace (*p))
-		p++;
-
-	      len = strlen (p);
-	      while (isspace (*(p + len - 1)))
-		len--;
-	      
-	      if (len > 0)
-		{
-		  if (in_para)
-		    gtk_text_buffer_insert (info_buffer, &start, " ", 1);
-
-		  g_assert (strlen (p) >= len);
-		  gtk_text_buffer_insert (info_buffer, &start, p, len);
-		  in_para = 1;
-		}
-	      else
-		{
-		  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-		  in_para = 0;
-		}
-	    }
-	  break;
-
-	case 2:
-	  /* Skipping blank lines */
-	  while (isspace (*p))
-	    p++;
-	  if (*p)
-	    {
-	      p = buffer->str;
-	      state++;
-	      /* Fall through */
-	    }
-	  else
-	    break;
-	  
-	case 3:
-	  /* Reading program body */
-	  gtk_text_buffer_insert (source_buffer, &start, p, -1);
-	  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-	  break;
-	}
-    }
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_apply_tag_by_name (info_buffer, "source", &start, &end);
-}
-
-gboolean
-button_press_event_cb (GtkTreeView    *tree_view,
-		       GdkEventButton *event,
-		       GtkTreeModel   *model)
-{
-  if (event->type == GDK_2BUTTON_PRESS)
-    {
-      GtkTreePath *path = NULL;
-
-      gtk_tree_view_get_path_at_pos (tree_view,
-				     event->window,
-				     event->x,
-				     event->y,
-				     &path,
-				     NULL);
-
-      if (path)
-	{
-	  GtkTreeIter iter;
-	  gboolean italic;
-	  GVoidFunc func;
-
-	  gtk_tree_model_get_iter (model, &iter, path);
-	  gtk_tree_store_get (GTK_TREE_STORE (model),
-			      &iter,
-			      FUNC_COLUMN, &func,
-			      ITALIC_COLUMN, &italic,
-			      -1);
-	  (func) ();
-	  gtk_tree_store_set (GTK_TREE_STORE (model),
-			      &iter,
-			      ITALIC_COLUMN, !italic,
-			      -1);
-	  gtk_tree_path_free (path);
-	}
-
-      gtk_signal_emit_stop_by_name (GTK_OBJECT (tree_view),
-				    "button_press_event");
-      return TRUE;
-    }
-  
-  return FALSE;
-}
-
-static void
-selection_cb (GtkTreeSelection *selection,
-	      GtkTreeModel     *model)
-{
-  GtkTreeIter iter;
-  GValue value = {0, };
-
-  if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
-    return;
-
-  gtk_tree_model_get_value (model, &iter,
-			    FILENAME_COLUMN,
-			    &value);
-  load_file (g_value_get_string (&value));
-  g_value_unset (&value);
-}
-
-static GtkWidget *
-create_text (GtkTextBuffer **buffer,
-	     gboolean        is_source)
-{
-  GtkWidget *scrolled_window;
-  GtkWidget *text_view;
-  PangoFontDescription *font_desc;
-
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-				  GTK_POLICY_AUTOMATIC,
-				  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-				       GTK_SHADOW_IN);
-  
-  text_view = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
-  
-  *buffer = gtk_text_buffer_new (NULL);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), *buffer);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
-
-  if (is_source)
-    {
-      font_desc = pango_font_description_from_string ("Courier 10");
-      gtk_widget_modify_font (text_view, font_desc);
-      pango_font_description_free (font_desc);
-    }
-  
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), !is_source);
-  
-  return scrolled_window;
-}
-
-/* Technically a list, but if we do go to 80 demos, we may want to move to a tree */
-static GtkWidget *
-create_tree (void)
-{
-  GtkTreeSelection *selection;
-  GtkCellRenderer *cell;
-  GtkWidget *tree_view;
-  GtkTreeViewColumn *column;
-  GtkTreeStore *model;
-  GtkTreeIter iter;
-  gint i;
-
-  model = gtk_tree_store_new_with_types (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
-  tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-
-  gtk_tree_selection_set_type (GTK_TREE_SELECTION (selection),
-			       GTK_TREE_SELECTION_SINGLE);
-  gtk_widget_set_usize (tree_view, 200, -1);
-
-  for (i=0; i < G_N_ELEMENTS (testgtk_demos); i++)
-    {
-      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
-
-      gtk_tree_store_set (GTK_TREE_STORE (model),
-			  &iter,
-			  TITLE_COLUMN, testgtk_demos[i].title,
-			  FILENAME_COLUMN, testgtk_demos[i].filename,
-			  FUNC_COLUMN, testgtk_demos[i].func,
-			  ITALIC_COLUMN, FALSE,
-			  -1);
-    }
-
-  cell = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Widget",
-						     cell,
-						     "text", TITLE_COLUMN,
-						     "italic", ITALIC_COLUMN,
-						     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
-			       GTK_TREE_VIEW_COLUMN (column));
-
-  gtk_signal_connect (GTK_OBJECT (selection), "selection_changed", selection_cb, model);
-  gtk_signal_connect (GTK_OBJECT (tree_view), "button_press_event", GTK_SIGNAL_FUNC (button_press_event_cb), model);
-
-  return tree_view;
-}
-
-int
-main (int argc, char **argv)
-{
-  GtkWidget *window;
-  GtkWidget *notebook;
-  GtkWidget *hbox;
-  GtkWidget *tree;
-  GtkTextTag *tag;
-
-  gtk_init (&argc, &argv);
-  
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
-
-  tree = create_tree ();
-  gtk_box_pack_start (GTK_BOX (hbox), tree, FALSE, FALSE, 0);
-
-  notebook = gtk_notebook_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&info_buffer, FALSE),
-			    gtk_label_new ("Info"));
-
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&source_buffer, TRUE),
-			    gtk_label_new ("Source"));
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "title");
-  gtk_object_set (GTK_OBJECT (tag),
-		 "font", "Sans 18",
-		 NULL);
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "source");
-  gtk_object_set (GTK_OBJECT (tag),
-		  "font", "Courier 10",
-		  "pixels_above_lines", 0,
-		  "pixels_below_lines", 0,
-		 NULL);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-  gtk_widget_show_all (window);
-  
-
-  load_file (testgtk_demos[0].filename);
-  
-  gtk_main ();
-
-  return 0;
-}

docs/reference/ChangeLog

@@ -1,386 +1,63 @@
-2006-05-16  Matthias Clasen  <mclasen@redhat.com>
+2006-03-08  Matthias Clasen  <mclasen@redhat.com>
 
-	* === Released 2.9.1 ====
+	* === Released 2.8.14 ===
 
-2006-05-16  Matthias Clasen  <mclasen@redhat.com>
+2006-02-24  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/tmpl/gtkstock.sgml: 
-	* gtk/Makefile.am: Add fourth stock orientation. 
+	* === Released 2.8.13 ===
 
-2006-05-15  Matthias Clasen  <mclasen@redhat.com>
+2006-02-11  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
+	* === Released 2.8.12 === 
 
 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>
 
+	Merged from HEAD:
+
 	* gtk/tmpl/gtkfilechooser.sgml: Mention that ~ is also a default
 	key binding.
 
-2006-01-23  Matthias Clasen  <mclasen@redhat.com>
+2006-01-25  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/gtk-sections.txt: 
-	* gtk/gtk-docs.sgml: 
-	* gtk/gtk.types: Add GtkLinkButton docs
+	* === Released 2.8.11 ===
 
-2006-01-18  Matthias Clasen  <mclasen@redhat.com>
+2006-01-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.10 ===
 	
-	* 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, Ævar Arnfjörð Bjarmason)
 
-2005-12-20  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkcombo.sgml: Small additions
-
-2005-12-19  Matthias Clasen  <mclasen@redhat.com>
+2005-12-09  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)
+	* === Released 2.8.9 ===
 
 2005-11-28  Matthias Clasen  <mclasen@redhat.com>
-	
-	* gtk/tmpl/gtkobject.sgml: Update docs on floating references
 
-2005-11-23  Matthias Clasen  <mclasen@redhat.com>
+	* ===  Released 2.8.8 ===
 
-	* gtk/tmpl/gtkrc.sgml: Document symbolic colors and
-	color expressions.
+2005-11-15  Matthias Clasen  <mclasen@redhat.com>
 
-2005-11-23  Michael Natterer  <mitch@imendio.com>
+	* === Released 2.8.7 ===
 
-	* gtk/gtk-sections.txt: add gtk_style_lookup_color
+2005-10-04  Matthias Clasen  <mclasen@redhat.com>
 
-2005-11-21  Matthias Clasen  <mclasen@redhat.com>
+	* === Released 2.8.6 ===
 
-	* gtk/gtk-sections.txt: Add gtk_combo_box_[sg]et_title
+2005-10-03  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/Makefile.am (HTML_IMAGES): Fix some _ vs - confusion. 
+	* === Released 2.8.5 ===
 
-2005-11-14  Matthias Clasen  <mclasen@redhat.com>
+2005-09-27  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/tmpl/gtkstock.sgml: 
-	* gtk/Makefile.am (HTML_IMAGES): Update stock documentation
-	to refer to the new icon names.
-
-2005-11-10  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add new api.
-
-2005-11-07  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-update-icon-cache.xml: 
-	* gtk/gtk-update-icon-cache.1: Document the --source option.
-
-2005-10-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/tmpl/gtkfilechooser.sgml: Don't use deprecated functions
-	in examples.  (#319524, Vincent Untz)
-
-	* gtk/gtk-update-icon-cache.xml: Fix a typo.  (#319524, Vincent Untz)
-
-2005-10-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_text_buffer_get_has_selection().
-
-2005-10-05  Federico Mena Quintero  <federico@ximian.com>
-
-	* gtk/tmpl/gtkfilechooser.sgml: Document the "quick-bookmark"
-	binding signal.
-
-2005-10-04  Federico Mena Quintero  <federico@ximian.com>
-
-	* gtk/tmpl/gtkfilechooser.sgml: Document the "desktop-folder"
-	binding signal.
-
-2005-09-26  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/tmpl/gcs.sgml: Fix a comment.
-
-2005-09-22  Michael Natterer  <mitch@imendio.com>
-
-	* gtk/gtk-docs.sgml
-	* gtk/gtk-sections.txt
-	* gtk/gtk.types: GtkCellRendererKeys -> GtkCellRendererAccel
-
-Tue Sep 20 17:16:50 2005  Tim Janik  <timj@imendio.com>
-
-	* gtk/tmpl/gtkrc.sgml: added anchor. complexity doesn't get worse
-	than O(n^2) with recent glib.
+	* === Released 2.8.4 ===
 
 2005-09-15  Federico Mena Quintero  <federico@ximian.com>
 
@@ -395,67 +72,20 @@ Tue Sep 20 17:16:50 2005  Tim Janik  <timj@imendio.com>
 	for ::insert-text signal.  (#316094, Tommi
 	Komulainen)
 
-Tue Sep 13 14:16:27 2005  Tim Janik  <timj@imendio.com>
-
-	* gtk/tmpl/gtkrc.sgml: fixed wording and typos in some places.
-	added a new section "Optimizing RC Style Matches".
-
-2005-09-11  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdk-sections.txt: Add gdk_intern_static_string.
-
-2005-09-09  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-docs.sgml: 
-	* gtk/gtk-sections.txt: Add a section for GtkCellRendererKeys
-
-	* gdk/tmpl/event_structs.sgml: Document GdkEventKey.is_modifier.
-
-2005-09-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/tmpl/windows.sgml: Document new modifier bits.
-
 2005-09-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/tmpl/gtkpaned.sgml: Fix some typos.
 	(#315208, Vincent Untz)
 
-2005-08-30  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-sections.txt: Add gtk_window_[sg]et_deletable.
-	Add gtk_selection_data_targets_include_uri.
-	Add gtk_targets_include... functions.
-
 2005-08-29  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/tmpl/gtkstatusicon.sgml: Add a long description.
-
-	* gtk/Makefile.am (HTML_IMAGES): Add stock_select_all_24.png
-	
-	* gtk/gtk-sections.txt: 
-	* gtk/tmpl/gtkstock.sgml: Add GTK_STOCK_SELECT_ALL. 
-
-	* gtk/gtk.types: Add gtk_status_icon_get_type
-
-	* gtk/gtk-docs.sgml: Add GtkStatusIcon
-
-	* gtk/gtk-sections.txt: Add GtkStatusIcon
+	* === Released 2.8.3 ===
 
 2005-08-26  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtk-update-icon-cache.xml: 
 	* gtk/gtk-update-icon-cache.1: Updates.
 
-2005-08-26  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf/gdk-pixbuf.sgml: 
-	* gdk/gdk-docs.sgml: 
-	* gtk/gtk-docs.sgml: Add indices for new
-	symbols in 2.10
-
-	* gdk/gdk-sections.txt: Add font options
-	API.
-
 2005-08-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.8.2 ===

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>

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>
 
 

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 ##### -->

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 ##### -->

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.

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=			\

docs/reference/gdk/gdk-docs.sgml

@@ -104,8 +104,5 @@
   <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>  
 
 </book>

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
@@ -218,12 +215,6 @@ gdk_screen_get_monitor_at_point
 gdk_screen_get_monitor_at_window
 gdk_screen_broadcast_client_message
 gdk_screen_get_setting
-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 +690,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 +704,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
@@ -835,7 +821,6 @@ gdk_utf8_to_string_target
 gdk_utf8_to_compound_text
 gdk_utf8_to_compound_text_for_display
 gdk_atom_intern
-gdk_atom_intern_static_string
 gdk_atom_name
 gdk_property_get
 gdk_property_change
@@ -885,7 +870,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 +1239,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

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>
 

docs/reference/gdk/tmpl/event_structs.sgml

@@ -108,8 +108,6 @@ NUL byte, in which case looking at @length is necessary to distinguish
 it from the an empty translation.
 @hardware_keycode: the raw code of the key that was pressed or released.
 @group: the keyboard group.
-@is_modifier: a flag that indicates if @hardware_keycode is mapped to a
-  modifier. Since 2.10
 
 <!-- ##### STRUCT GdkEventButton ##### -->
 <para>

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 ##### -->

docs/reference/gdk/tmpl/gcs.sgml

@@ -170,7 +170,7 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
 This function is obsolete and should not be used.
 </para>
 
-@Deprecated: Use g_object_unref() instead
+@Deprecated: Use gdk_object_unref() instead
 <!-- # Unused Parameters # -->
 @gc: a #GdkGC.
 

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: 
-
-

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>
 
@@ -48,16 +41,6 @@ when GDK gets multihead support.
 
 @gdkscreen: the object which received the signal.
 
-<!-- ##### ARG GdkScreen:font-options ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkScreen:resolution ##### -->
-<para>
-
-</para>
-
 <!-- ##### FUNCTION gdk_screen_get_default ##### -->
 <para>
 
@@ -138,15 +121,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 +228,8 @@ when GDK gets multihead support.
 @screen: 
 @monitor_num: 
 @dest: 
+<!-- # Unused Parameters # -->
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_screen_get_monitor_at_point ##### -->
@@ -275,6 +251,8 @@ when GDK gets multihead support.
 @screen: 
 @window: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@anid: 
 
 
 <!-- ##### FUNCTION gdk_screen_broadcast_client_message ##### -->
@@ -297,60 +275,6 @@ when GDK gets multihead support.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_screen_get_font_options ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_screen_set_font_options ##### -->
-<para>
-
-</para>
-
-@screen: 
-@options: 
-
-
-<!-- ##### FUNCTION gdk_screen_get_resolution ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_screen_set_resolution ##### -->
-<para>
-
-</para>
-
-@screen: 
-@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>
 

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>

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 ##### -->

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -30,7 +30,6 @@ The type #GdkDrawable refers generically to any of
 these types.
 </para>
 
-@user_data: 
 
 <!-- ##### FUNCTION gdk_pixmap_new ##### -->
 <para>

docs/reference/gdk/tmpl/properties.sgml

@@ -235,15 +235,6 @@ Finds or creates an atom corresponding to a given string.
 @Returns: the atom corresponding to @atom_name.
 
 
-<!-- ##### FUNCTION gdk_atom_intern_static_string ##### -->
-<para>
-
-</para>
-
-@atom_name: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_atom_name ##### -->
 <para>
 Determines the string corresponding to an atom.

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.
 
 

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>

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>
 
 

docs/reference/gdk/tmpl/windows.sgml

@@ -30,7 +30,6 @@ The type #GdkDrawable refers generically to any of
 these types.
 </para>
 
-@user_data: 
 
 <!-- ##### ENUM GdkWindowType ##### -->
 <para>
@@ -142,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)
@@ -212,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>
@@ -903,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>
 
@@ -1078,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>
 
@@ -1217,11 +1164,6 @@ Hyper, Alt, Compose, Apple, CapsLock or ShiftLock.
 <para>
 Like the X Window System, GDK supports 8 modifier keys and 5 mouse buttons.
 </para>
-<para>
-Since 2.10, GDK recognizes which of the Meta, Super or Hyper keys are mapped 
-to Mod2 - Mod5, and indicates this by setting %GDK_SUPER_MASK, %GDK_HYPER_MASK
-or %GDK_META_MASK in the state field of key events.
-</para>
 
 @GDK_SHIFT_MASK: the Shift key.
 @GDK_LOCK_MASK: a Lock key (depending on the modifier mapping of the 
@@ -1243,9 +1185,6 @@ or %GDK_META_MASK in the state field of key events.
 @GDK_BUTTON3_MASK: the third mouse button.
 @GDK_BUTTON4_MASK: the fourth mouse button.
 @GDK_BUTTON5_MASK: the fifth mouse button.
-@GDK_SUPER_MASK: the Super modifier. Since 2.10
-@GDK_HYPER_MASK: the Hyper modifier. Since 2.10
-@GDK_META_MASK: the Meta modifier. Since 2.10
 @GDK_RELEASE_MASK: not used in GDK itself. GTK+ uses it to differentiate 
   between (keyval, modifiers) pairs from key press and release events.
 @GDK_MODIFIER_MASK: a mask covering all modifier types.

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 ##### -->

docs/reference/gtk/Makefile.am

@@ -48,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		\
@@ -75,7 +64,6 @@ IGNORE_HFILES=				\
 	gtktexttypes.h			\
 	gtktextutil.h			\
 	gtktoggleactionprivate.h	\
-	gtktrayicon.h			\
 	gtktypebuiltins.h		\
 	gtkxembed.h			\
 	gtkwin32embed.h			\
@@ -109,7 +97,6 @@ content_files =					\
 	changes-1.2.sgml			\
 	changes-2.0.sgml			\
 	compiling.sgml				\
-	directfb.sgml				\
 	framebuffer.sgml			\
 	glossary.xml				\
 	migrating-checklist.sgml		\
@@ -119,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			\
@@ -143,131 +126,111 @@ 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
 
 # Images to copy into HTML directory
 HTML_IMAGES = \
-	$(top_srcdir)/gtk/stock-icons/24/gtk-about.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-add.png			\
-	$(top_srcdir)/gtk/stock-icons/20/gtk-apply.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-bold.png			\
-	$(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-cdrom.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-clear.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-close.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-connect.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-convert.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-copy.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-cut.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-delete.png			\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-authentication.png 	\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-error.png		\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-info.png		\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-question.png	\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-warning.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-directory.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-disconnect.png		\
-	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd.png			\
-	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd-multiple.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-edit.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-execute.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-file.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-find.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-find-and-replace.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-bottom.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-first-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-first-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-last-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-last-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-top.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-back-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-back-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-down.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-forward-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-forward-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-up.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-harddisk.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-network.png		\
-	$(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-italic.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-center.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-fill.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-left.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-right.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-missing-image.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-new.png			\
-	$(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			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-preview.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-properties.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-quit.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-redo-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-redo-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-refresh.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-remove.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-revert-to-saved-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-revert-to-saved-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-floppy.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-save.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-save-as.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-select-all.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-select-color.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-color-picker.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-font.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-sort-ascending.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-sort-descending.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-spell-check.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-stop.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-strikethrough.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-underline.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undo-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undo-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/20/gtk-yes.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-100.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-fit.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-in.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-out.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-forward-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-forward-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-next-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-next-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-pause.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-play-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-play-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-previous-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-previous-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-record.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-rewind-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-rewind-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-stop.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-fullscreen.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-leave-fullscreen.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-info.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_about_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_add_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_apply_20.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_text_bold_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_cancel_20.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_cdrom_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_clear_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_close_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_connect_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_convert_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_copy_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_cut_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_trash_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_dialog_authentication_48.png \
+	$(top_srcdir)/gtk/stock-icons/stock_dialog_error_48.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_dialog_info_48.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_dialog_question_48.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_dialog_warning_48.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_directory_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_disconnect_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_dnd_32.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_dnd_multiple_32.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_edit_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_exec_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_file_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_search_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_search_replace_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_bottom_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_first_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_last_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_top_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_left_arrow_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_down_arrow_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_right_arrow_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_up_arrow_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_harddisk_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_network_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_help_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_home_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_index_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_text_indent_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_text_unindent_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_text_italic_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_jump_to_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_jump_to_rtl_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_align_center_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_align_justify_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_align_left_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_align_right_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_broken_image_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_new_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_no_20.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_ok_20.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_open_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_paste_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_preferences_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_print_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_print_preview_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_properties_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_exit_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_redo_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_redo_rtl_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_refresh_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_remove_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_revert_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_revert_rtl_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_save_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_save_as_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_colorselector_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_color_picker_25.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_font_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_sort_ascending_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_sort_descending_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_spellcheck_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_stop_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_text_strikethrough_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_undelete_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_undelete_rtl_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_text_underline_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_undo_24.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_undo_rtl_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_yes_20.png			\
+	$(top_srcdir)/gtk/stock-icons/stock_zoom_1_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_zoom_fit_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_zoom_in_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_zoom_out_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_media_forward_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_media_next_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_media_pause_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_media_play_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_media_play_rtl_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_media_previous_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_media_record_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_media_rewind_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_media_stop_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_fullscreen_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_leave_fullscreen_24.png	\
+	$(top_srcdir)/gtk/stock-icons/stock_info_24.png			\
 	$(srcdir)/images/accel-label.png				\
-	$(srcdir)/images/assistant.png					\
 	$(srcdir)/images/button.png					\
 	$(srcdir)/images/check-button.png				\
 	$(srcdir)/images/color-button.png				\
@@ -283,18 +246,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					\

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>

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">
@@ -117,7 +100,6 @@
 <!ENTITY GtkSocket SYSTEM "xml/gtksocket.xml">
 <!ENTITY GtkSpinButton SYSTEM "xml/gtkspinbutton.xml">
 <!ENTITY GtkStatusbar SYSTEM "xml/gtkstatusbar.xml">
-<!ENTITY GtkStatusIcon SYSTEM "xml/gtkstatusicon.xml">
 <!ENTITY GtkTable SYSTEM "xml/gtktable.xml">
 <!ENTITY GtkTearoffMenuItem SYSTEM "xml/gtktearoffmenuitem.xml">
 <!ENTITY GtkText SYSTEM "xml/gtktext.xml">
@@ -149,11 +131,9 @@
 <!ENTITY GtkCellEditable SYSTEM "xml/gtkcelleditable.xml">
 <!ENTITY GtkCellLayout SYSTEM "xml/gtkcelllayout.xml">
 <!ENTITY GtkCellRenderer SYSTEM "xml/gtkcellrenderer.xml">
-<!ENTITY GtkCellRendererAccel SYSTEM "xml/gtkcellrendereraccel.xml">
 <!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 +184,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 +294,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 +345,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkWindow;
         &GtkWindowGroup;
         &GtkAboutDialog;
-        &GtkAssistant;
     </chapter>
 
     <chapter id="DisplayWidgets">
@@ -383,7 +354,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkLabel;
         &GtkProgressBar;
         &GtkStatusbar;
-        &GtkStatusIcon;
     </chapter>
 
     <chapter id="ButtonWidgets">
@@ -392,7 +362,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkCheckButton;
         &GtkRadioButton;
         &GtkToggleButton;
-        &GtkLinkButton;
     </chapter>
 
     <chapter id="NumericEntry">
@@ -432,11 +401,9 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkCellLayout;
         &GtkCellRenderer;
         &GtkCellEditable;
-        &GtkCellRendererAccel;
         &GtkCellRendererCombo;
         &GtkCellRendererPixbuf;
         &GtkCellRendererProgress;
-        &GtkCellRendererSpin;
         &GtkCellRendererText;
         &GtkCellRendererToggle;
         &GtkListStore;
@@ -522,19 +489,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 +538,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 +580,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>
@@ -668,8 +609,5 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
   <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>  
 
 </book>

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

@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GTK\-UPDATE\-ICON\-CACH" "1" "11/07/2005" "" ""
+.TH "GTK\-UPDATE\-ICON\-CACH" "1" "08/26/2005" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -11,13 +11,13 @@
 gtk\-update\-icon\-cache \- Icon theme caching utility
 .SH "SYNOPSIS"
 .HP 22
-\fBgtk\-update\-icon\-cache\fR [\-\-force] [\-\-ignore\-theme\-index] [\-\-index\-only] [\-\-source\ [name]] [\-\-quiet] {iconpath}
+\fBgtk\-update\-icon\-cache\fR [\-\-force] [\-\-index\-only] [\-\-ignore\-theme\-index] [\-\-quiet] {iconpath}
 .SH "DESCRIPTION"
 .PP
 \fBgtk\-update\-icon\-cache\fR
 creates mmap()able cache files for icon themes.
 .PP
-It expects to be given the path to a icon theme directory containing an
+If expects to be given the path to a icon theme directory containing an
 \fIindex.theme\fR, e.g.
 \fI/usr/share/icons/hicolor\fR, and writes a
 \fIicon\-theme.cache\fR
@@ -39,11 +39,6 @@ refuses to create an icon cache in a directory which does not appear to be the t
 \-\-index\-only, \-i
 Don't include image data in the cache.
 .TP
-\-\-source, \-c
-Output a C header file declaring a constant
-\fIname\fR
-with the contents of the icon cache.
-.TP
 \-\-quiet, \-q
 Turn off verbose output.
 .SH "BUGS"

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

@@ -14,9 +14,8 @@
 <cmdsynopsis>
 <command>gtk-update-icon-cache</command>
 <arg choice="opt">--force</arg>
-<arg choice="opt">--ignore-theme-index</arg>
 <arg choice="opt">--index-only</arg>
-<arg choice="opt">--source<arg>name</arg></arg>
+<arg choice="opt">--ignore-theme-index</arg>
 <arg choice="opt">--quiet</arg>
 <arg choice="req">iconpath</arg>
 </cmdsynopsis>
@@ -27,7 +26,7 @@
 icon themes. 
 </para>
 <para>
-It expects to be given the path to a icon theme directory containing an
+If expects to be given the path to a icon theme directory containing an
 <filename>index.theme</filename>, e.g. <filename>/usr/share/icons/hicolor</filename>, 
 and writes a <filename>icon-theme.cache</filename> containing cached information
 about the icons in the directory tree below the given directory.
@@ -45,8 +44,8 @@ multiple applications, the overall memory consumption is reduced as well.
   <varlistentry>
     <term>--force</term>
     <term>-f</term>
-    <listitem><para>Overwrite an existing cache file even if it appears to be 
-         uptodate.</para></listitem>
+    <listitem><para>Overwrite an existing cache file even if it appears to be uptodate.
+    </para></listitem>
   </varlistentry>
 
   <varlistentry>
@@ -66,14 +65,6 @@ multiple applications, the overall memory consumption is reduced as well.
     </para></listitem>
   </varlistentry>
 
-  <varlistentry>
-    <term>--source</term>
-    <term>-c</term>
-    <listitem><para>Output a C header file declaring a constant 
-     <replaceable>name</replaceable> with the contents of the icon 
-     cache.</para></listitem>
-  </varlistentry>
-
   <varlistentry>
     <term>--quiet</term>
     <term>-q</term>

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
@@ -23,7 +18,6 @@ gtk_button_get_type
 gtk_calendar_get_type
 gtk_cell_editable_get_type
 gtk_cell_layout_get_type
-gtk_cell_renderer_accel_get_type
 gtk_cell_renderer_combo_get_type
 gtk_cell_renderer_get_type
 gtk_cell_renderer_pixbuf_get_type
@@ -85,7 +79,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
@@ -100,19 +93,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
@@ -133,7 +117,6 @@ gtk_size_group_get_type
 gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_statusbar_get_type
-gtk_status_icon_get_type
 gtk_style_get_type
 gtk_table_get_type
 gtk_tearoff_menu_item_get_type

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:
--->

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:
--->

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:
--->

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>

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>
 

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

@@ -336,12 +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_STOCK_BUTTON_APPLY ##### -->
 <para>
 
@@ -378,14 +372,6 @@ Turns off certain object flags.  (Private)
 </para>
 
 
-<!-- ##### MACRO GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT ##### -->
-<para>
-The "Reverse Portrait Orientation" item.
-<inlinegraphic fileref="gtk-orientation-reverse-portrait.png" format="PNG"></inlinegraphic>
-</para>
-
-@Since: 2.10
-
 <!-- ##### MACRO GTK_TIPS_QUERY ##### -->
 <para>
 
@@ -527,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.
@@ -640,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>
 
@@ -959,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
@@ -1140,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>
 
@@ -2203,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>
 
@@ -2797,30 +2723,6 @@ Set the the handle size to @size x @size pixels.
 @pspec: 
 @pattern: 
 
-<!-- ##### 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_set_num_copies ##### -->
-<para>
-
-</para>
-
-@settings: 
-@num_copies: 
-
 <!-- ##### FUNCTION gtk_rc_init ##### -->
 <para>
 Internal function.

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>
 

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 ##### -->

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 ##### -->

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>
 

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 

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: 
-
-

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>
@@ -137,11 +140,6 @@ This should not be accessed directly.  Use the accessor functions below.
 
 </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,
@@ -275,6 +273,8 @@ Returns the current relief style of the given #GtkButton.
 
 @button: 
 @use_stock: 
+<!-- # Unused Parameters # -->
+@value: 
 
 
 <!-- ##### FUNCTION gtk_button_get_use_underline ##### -->
@@ -293,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 ##### -->

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: 
-
-

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 ##### -->

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 ##### -->

docs/reference/gtk/tmpl/gtkcellrendererspin.sgml

@@ -1,50 +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 rante 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>
-
-@parent: 
-
-<!-- ##### FUNCTION gtk_cell_renderer_spin_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-

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>
 

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>
 

docs/reference/gtk/tmpl/gtkcellview.sgml

@@ -130,5 +130,7 @@ and drag and drop.
 
 @cell_view: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@cellview: 
 
 

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>
 

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>
 
 

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.
 
 

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>
 

docs/reference/gtk/tmpl/gtkcomboboxentry.sgml

@@ -59,6 +59,9 @@ with gtk_combo_box_entry_new_text().
 </para>
 
 @Returns: 
+<!-- # Unused Parameters # -->
+@model: 
+@text_column: 
 
 
 <!-- ##### FUNCTION gtk_combo_box_entry_new_with_model ##### -->

docs/reference/gtk/tmpl/gtkcontainer.sgml

@@ -364,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 ##### -->
@@ -483,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 ##### -->
@@ -493,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 ##### -->
@@ -503,5 +509,7 @@ Does the same as gtk_container_get_children().
 @cclass: 
 @n_properties: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@class: 
 
 

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 ##### -->

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

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>
 

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 ##### -->

docs/reference/gtk/tmpl/gtkfilechooser.sgml

@@ -132,7 +132,7 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data)
 
   gtk_image_set_from_pixbuf (GTK_IMAGE (preview), pixbuf);
   if (pixbuf)
-    gobject_unref (pixbuf);
+    gdk_pixbuf_unref (pixbuf);
 
   gtk_file_chooser_set_preview_widget_active (file_chooser, have_preview);
 }
@@ -240,14 +240,6 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data)
 		<entry>home-folder</entry>
 		<entry><keycombo><keycap>Alt</keycap><keycap>Home</keycap></keycombo></entry>
 	      </row>
-	      <row>
-		<entry>desktop-folder</entry>
-		<entry><keycombo><keycap>Alt</keycap><keycap>D</keycap></keycombo></entry>
-	      </row>
-	      <row>
-		<entry>quick-bookmark</entry>
-		<entry><keycombo><keycap>Alt</keycap><keycap>1</keycap></keycombo> through <keycombo><keycap>Alt</keycap><keycap>0</keycap></keycombo></entry>
-	      </row>
 	    </tbody>
 	  </tgroup>
 	</informaltable>
@@ -463,94 +455,6 @@ class "GtkFileChooserDefault" binding "misc-shortcut"
 	  </varlistentry>
 	</variablelist>
       </refsect3>
-
-      <refsect3 id="GtkFileChooserDefault-desktop-folder">
-	<title>The &quot;GtkFileChooserDefault::desktop-folder&quot; signal</title>
-
-	<programlisting>
-          void user_function (GtkFileChooserDefault *chooser,
-                              <link linkend="gpointer">gpointer</link> user_data);
-	</programlisting>
-
-	<para>
-	  This is used to make the file chooser show the user's Desktop
-	  folder in the file list.  By default this is bound to
-	  <keycombo><keycap>Alt</keycap><keycap>D</keycap></keycombo>.
-	</para>
-
-	<variablelist role="params">
-	  <varlistentry>
-	    <term><parameter>chooser</parameter>&nbsp;:</term>
-	    <listitem>
-	      <simpara>
-		the object which received the signal.
-	      </simpara>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><parameter>user_data</parameter>&nbsp;:</term>
-	    <listitem>
-	      <simpara>
-		user data set when the signal handler was connected.
-	      </simpara>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </refsect3>
-
-      <refsect3 id="GtkFileChooserDefault-quick-bookmark">
-	<title>The &quot;GtkFileChooserDefault::quick-bookmark&quot; signal</title>
-
-	<programlisting>
-          void user_function (GtkFileChooserDefault *chooser,
-                              gint bookmark_index,
-                              <link linkend="gpointer">gpointer</link> user_data);
-	</programlisting>
-
-	<para>
-	  This is used to make the file chooser switch to the bookmark
-	  specified in the <parameter>bookmark_index</parameter> parameter.
-	  For example, if you have three bookmarks, you can pass 0, 1, 2 to
-	  this signal to switch to each of them, respectively.  By default this is bound to
-	  <keycombo><keycap>Alt</keycap><keycap>1</keycap></keycombo>,
-	  <keycombo><keycap>Alt</keycap><keycap>2</keycap></keycombo>, 
-	  etc. until
-	  <keycombo><keycap>Alt</keycap><keycap>0</keycap></keycombo>.  Note
-	  that in the default binding,
-	  that <keycombo><keycap>Alt</keycap><keycap>1</keycap></keycombo> is
-	  actually defined to switch to the bookmark at index 0, and so on
-	  successively;
-	  <keycombo><keycap>Alt</keycap><keycap>0</keycap></keycombo> is
-	  defined to switch to the bookmark at index 10.
-	</para>
-
-	<variablelist role="params">
-	  <varlistentry>
-	    <term><parameter>chooser</parameter>&nbsp;:</term>
-	    <listitem>
-	      <simpara>
-		the object which received the signal.
-	      </simpara>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><parameter>bookmark_indes</parameter>&nbsp;:</term>
-	    <listitem>
-	      <simpara>
-		index of the bookmark to switch to; the indices start at 0.
-	      </simpara>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><parameter>user_data</parameter>&nbsp;:</term>
-	    <listitem>
-	      <simpara>
-		user data set when the signal handler was connected.
-	      </simpara>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </refsect3>
     </refsect2>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -781,7 +685,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 +719,8 @@ gtk_widget_destroy (chooser);
 
 @chooser: 
 @local_only: 
+<!-- # Unused Parameters # -->
+@files_only: 
 
 
 <!-- ##### FUNCTION gtk_file_chooser_get_local_only ##### -->
@@ -1091,6 +1004,8 @@ gtk_widget_destroy (chooser);
 
 @chooser: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@file_chooser: 
 
 
 <!-- ##### FUNCTION gtk_file_chooser_get_preview_uri ##### -->
@@ -1100,6 +1015,8 @@ gtk_widget_destroy (chooser);
 
 @chooser: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@file_chooser: 
 
 
 <!-- ##### FUNCTION gtk_file_chooser_set_extra_widget ##### -->
@@ -1205,6 +1122,8 @@ gtk_widget_destroy (chooser);
 @uri: 
 @error: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@folder: 
 
 
 <!-- ##### FUNCTION gtk_file_chooser_remove_shortcut_folder_uri ##### -->
@@ -1216,6 +1135,8 @@ gtk_widget_destroy (chooser);
 @uri: 
 @error: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@folder: 
 
 
 <!-- ##### FUNCTION gtk_file_chooser_list_shortcut_folder_uris ##### -->

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: 
-
-

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>
 
 

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 ##### -->

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 ##### -->

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 ##### -->

docs/reference/gtk/tmpl/gtkicontheme.sgml

@@ -84,8 +84,8 @@ pixbuf = gtk_icon_theme_load_icon (icon_theme,
                                    &error);
 if (!pixbuf)
   {
-    g_warning ("Couldn't load icon: %s", error->message);
-    g_error_free (error);
+    g_warning ("Couldn't load icon: %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>
 
 

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>

docs/reference/gtk/tmpl/gtkimage.sgml

@@ -189,8 +189,7 @@ functions), but they will all return %NULL values.
 @GTK_IMAGE_STOCK: the widget contains a stock icon name (see <xref linkend="gtk-Stock-Items"/>)
 @GTK_IMAGE_ICON_SET: the widget contains a #GtkIconSet
 @GTK_IMAGE_ANIMATION: the widget contains a #GdkPixbufAnimation
-@GTK_IMAGE_ICON_NAME: the widget contains a named icon. 
-  This image type was added in GTK+ 2.6
+@GTK_IMAGE_ICON_NAME: 
 
 <!-- ##### FUNCTION gtk_image_get_icon_set ##### -->
 <para>
@@ -438,6 +437,7 @@ functions), but they will all return %NULL values.
 
 @Returns: the #GtkImage
 <!-- # Unused Parameters # -->
+@val: 
 @mask: a #GdkBitmap that indicates which parts of the image should be transparent.