2.12.9

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

.cvsignore

@@ -19,14 +19,17 @@ stamp-h.in
 gtk+.spec
 gtk+-2.0.pc
 gtk+-2.0-uninstalled.pc
+gtk+-unix-print-2.0.pc
 gtk+-linux-fb-2.0.pc
 gtk+-nanox-2.0.pc
 gtk+-x11-2.0.pc
+gtk+-quartz-2.0.pc
 gdk-2.0.pc
 gdk-2.0-uninstalled.pc
 gdk-linux-fb-2.0.pc
 gdk-nanox-2.0.pc
 gdk-x11-2.0.pc
+gdk-quartz-2.0.pc
 gdk-pixbuf-2.0.pc
 gdk-pixbuf-2.0-uninstalled.pc
 gtk-zip.sh

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>
@@ -30,3 +30,36 @@ Owen Taylor       <otaylor@gtk.org>
 
 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 
+started as independent projects. We list the original authors here:
+
+
+MS-Windows theme engine
+-----------------------
+Raymond Penners
+Dom Lachowicz
+
+
+Pixbuf theme engine
+-------------------
+Owen Taylor
+
+
+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

@@ -0,0 +1,514 @@
+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

@@ -0,0 +1,500 @@
+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
+

ChangeLog.pre-1-2

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

ChangeLog.pre-2-0

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

HACKING

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

INSTALL

@@ -3,9 +3,9 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLib, Pango, and Atk libraries, available at the same location as GTK+
-   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
-   Pango-1.2 is recommended.)
+ - The GLib, Pango, ATK and cairo libraries, available at the same 
+   location as GTK+. GTK+ 2.12.9 requires at least GLib 2.12, 
+   Pango 1.13, ATK 1.9 and cairo 1.2.
 
  - The TIFF, PNG, and JPEG image loading libraries. You most
    likely have these installed on your system already. If not
@@ -15,15 +15,17 @@ GTK+ requires the following packages:
     http://www.libpng.org/
     http://www.ijg.org/
 
+    libtiff must be version 3.6.0 or higher.
+
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-2.6.1.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.6.1			   # change to the toplevel directory
+  % gzip -cd gtk+-2.12.9.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.12.9			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
-  % make				   # build GTK
+  % make				   # build GTK+
   [ Become root if necessary ]
-  % make install			   # install GTK
+  % make install			   # install GTK+
 
 The Details
 ===========

INSTALL.in

@@ -3,9 +3,9 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLib, Pango, and Atk libraries, available at the same location as GTK+
-   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
-   Pango-1.2 is recommended.)
+ - The GLib, Pango, ATK and cairo libraries, available at the same 
+   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.12, 
+   Pango 1.13, ATK 1.9 and cairo 1.2.
 
  - The TIFF, PNG, and JPEG image loading libraries. You most
    likely have these installed on your system already. If not
@@ -15,15 +15,17 @@ GTK+ requires the following packages:
     http://www.libpng.org/
     http://www.ijg.org/
 
+    libtiff must be version 3.6.0 or higher.
+
 Simple install procedure
 ========================
 
   % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
   % cd gtk+-@GTK_VERSION@			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
-  % make				   # build GTK
+  % make				   # build GTK+
   [ Become root if necessary ]
-  % make install			   # install GTK
+  % make install			   # install GTK+
 
 The Details
 ===========

MAINTAINERS

@@ -0,0 +1,12 @@
+Matthias Clasen
+E-mail: mclasen@redhat.com
+Userid: matthiasc
+
+Tim Janik
+E-mail: timj@gtk.org
+Userid: timj
+
+Note that a lot of people are contributing to GTK+, and some parts of it 
+are technically maintained by other people. The people listed above are
+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

@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.7
@@ -16,7 +16,11 @@ EXTRA_DIST =			\
 	ChangeLog.pre-2-2	\
 	ChangeLog.pre-2-4	\
 	ChangeLog.pre-2-6	\
-	README.cvs-commits	\
+	ChangeLog.pre-2-8	\
+	ChangeLog.pre-2-10	\
+	ChangeLog.gtk-async-file-chooser	\
+	ChangeLog.gtk-printing	\
+	README.commits	\
 	README.win32		\
 	config.h.win32		\
 	makefile.msc	\
@@ -133,7 +137,12 @@ gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
 
+if OS_UNIX
+pkgconfig_DATA += gtk+-unix-print-2.0.pc
+endif
+
 DISTCLEANFILES =				\
+	gtk+-unix-print-2.0.pc			\
 	gtk+-$(GDKTARGET)-2.0.pc		\
 	gdk-$(GDKTARGET)-2.0.pc			\
 	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
@@ -187,5 +196,4 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds

README

@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.6.1. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.12.9. GTK+ is a multi-platform toolkit for
 creating graphical user interfaces. Offering a complete set of widgets,
 GTK+ is suitable for projects ranging from small one-off projects to
 complete application suites.
@@ -20,13 +20,222 @@ The official web site is:
 Information about mailing lists can be found at
   http://www.gtk.org/mailinglists.html
 
+
 Installation
 ============
 
 See the file 'INSTALL'
 
-Release notes
-=============
+
+Release notes for 2.12
+======================
+
+* gtk_about_dialog_get/set_name() were deprecated in favour of
+  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
+  "program-name" property instead of the conflicting "name" property.
+
+* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
+
+* Support for Windows 9x/ME has officially been removed. It hasn't worked
+  since 2.6 anyway.
+
+* The GtkTextBufferTargetInfo enumeration values have been changed from
+  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
+  ANSI C limits.
+
+* A change in the handling of _NET_WM_USER_TIME properties on toplevel
+  windows can cause deadlock problems with window managers that are using
+  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
+  by this. The problem has been fixed in metacity 2.18.1.
+
+* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
+  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
+  and gtk_text_layout_cursors_changed(), which should be used in place of
+  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
+  is due to marks moved or changed selection; new GtkTextLineDisplay structure
+  member. Source compatibility is preserved; binary compatibility may break
+  only if GtkTextLineDisplay structure was created on stack or as a part
+  of another structure (in particular GnomeCanvas and its clones do not need
+  recompiling).
+
+* Another new signal has been added to GtkNotebook. The new signal
+  is called create-window, so this name can no longer be used for signals
+  in objects derived from GtkNotebook.
+
+* The gtk_notebook_set/get_group_id() functions were found to be insufficient
+  and have been deprecated in favour of gtk_notebook_set/get_group().
+
+* The move-focus signal has been moved to GtkWidget, to unify the 
+  various implementations of this signal in specific widgets. Great care 
+  has been taken to make sure that all code using this signal continues
+  to work.
+
+* An unused and hardly visible GtkFrame has been removed from the menu 
+  widget hierarchy when GtkComboBox::appears-as-list style property is 
+  set. Any RC file applying a different style to any widget below the 
+  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
+  account that the frame no longer exists.
+
+* The external print preview application used by GtkPrintOperationPreview 
+  is now passed the print settings on the command line with the 
+  --print-settings parameter pointing to a temp file containing the 
+  settings. The preview application assumes ownership of the file and 
+  should delete it once it does not need it anymore. The --print-settings 
+  commandline option is understood by Evince 0.9.0 and newer. To use a 
+  different print preview application, change the gtk-print-preview-command 
+  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
+
+* GtkMenuShell is now defined as an abstract type. It was already 
+  documented as an abstract class, and there is little reason to 
+  instantiate it.
+
+* The GtkTooltips struct (this is the old tooltips API) is now considered
+  private. Code that used to access this struct, in particular the
+  tips_data_list field, will need to change. All of the old tooltips
+  API has been deprecated in favour of a new implementation and
+  API. This affects all of the gtk_tooltips_ functions, and functions 
+  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
+  and gtk_menu_tool_button_set_arrow_tooltip().
+  
+* The memory management of the GtkRecentManager object has been changed,
+  as using the screen didn't guarantee that the singleton instance was
+  correctly destroyed. The screen-related functions have been deprecated,
+  and should not be used anymore; the GtkRecentManager instance returned by
+  the gtk_recent_manager_get_default() function is guaranteed to be valid
+  for the entire lifetime of an application.
+
+* A number of interfaces that have been superseded by newer interfaces for 
+  a long time have finally been deprecated. This includes 
+  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
+
+* The various coordinate systems in use in GtkTreeView widgets have
+  been clarified in the documentation, and in the cause of doing so, 
+  the functions gtk_tree_view_widget_to_tree_coords() and
+  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
+  favour of a new family of gtk_tree_view_convert_ functions.
+
+* gtk_menu_item_remove_submenu() has been deprecated in favour of
+  gtk_menu_item_set_submenu (..., NULL).
+
+* gtk_default_draw_check() has been fixed to really decrease the
+  indicator size by one pixel to ensure an odd size instead of
+  accidentially increasing it.
+  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
+  not subtract 1 from the size passed to gtk_paint_option(), which
+  was just a workaround for above off-by-two for even sizes (theme
+  engines now get the real indicator size passed).
+  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
+  has been changed to 13 to be consistent with GtkCheckButton.
+  The only visible change with default settings is that the indicator in
+  GtkCellRendererToggle has changed its size from 11 to 13 and is now
+  consistent with menus and toggle buttons.
+
+* GTK+ has always required that gtk_init() (or a variant thereof) is
+  called before any other GTK+ function. Some applications call functions
+  like gtk_clipboard_get() to check if they need to call gtk_init(),
+  anyway. A change in GLib 2.14 has recently broken this unsupported
+  practise. It is worth pointing out that calling gtk_init() twice
+  does no harm.
+
+
+Release notes for 2.10
+======================
+
+* The hexadecimal Unicode input feature has been reworked. It no longer
+  blocks the use of the sixteen Ctrl-Shift-<hex digit> key sequences. Now
+  it only uses Ctrl-Shift-u.
+
+* A memory leak in GtkStyle handling has been fixed. This may expose bugs
+  in third-party widgets which forget to call gtk_style_attach() in their
+  realize functions.
+
+* Range widgets like GtkScrollbar now render their arrows insensitive
+  when the slider is at the end. Applications which react to arrow
+  clicks even if the slider is at the end may want to use the new
+  gtk_range_set_[upper/lower]_stepper_sensitivity() functions to
+  prevent the arrows from being rendered insensitive.
+
+* GtkObject now uses the "floating reference" support in GObject. 
+  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
+  of the GTK_FLOATING flag will no longer detect the floating 
+  reference. Details about floating references can be found in the docs:
+  http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#floating-ref
+
+* Accelerators like (_F) are now stripped from labels when they are 
+  displayed in toolbars. If this is not wanted, the feature can be 
+  suppressed by inserting a Unicode control character, e.g ZWNJ.
+
+* The pixbuf theme engine can now customize expanders (in GtkTreeView
+  and GtkExpander) and resize grips, using the new EXPANDER and
+  RESIZE_GRIP function values.
+
+* Dialogs created by gtk_about_dialog_new() no longer hide automatically
+  when the user clicks close. It is the applications responsibility to
+  hide or destroy the dialog.
+
+* Several new signals have been added to GtkNotebook. Care has been taken
+  to choose signal names which do not collide with signals added by well-known
+  derived classes. The names which can no longer be used for signals in 
+  objects derived from GtkNotebook are page-reordered, page-removed and
+  page-added.
+
+* Due to the interface changes in the file chooser backend interface, 
+  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
+  backends have to be ported to the new interface, other modules, such as 
+  theme engines, input method modules or pixbuf loaders have to be rebuilt 
+  so that they are installed in the right place for GTK+ to find them.
+
+
+Release notes for 2.8
+=====================
+
+* GTK+ 2.8 and Pango 1.10 require the cairo library.
+
+* The default theme has been renamed to "Raleigh". Existing configurations
+  specifying the "Default" theme name should still work.
+
+* The GtkTreeView::enable-search property has been changed to control
+  only typeahead search, not the C-f keybinding to start an interactive
+  search. To turn off interactive searching completely, you have to
+  set GtkTreeView::search-column to -1.
+
+* The restriction on using the same cell renderer in multiple columns
+  of a GtkTreeView is now more strictly enforced.
+
+* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
+  the first day of the week. Thus, it is possible to select the first day
+  of the week independently from the language, by setting LC_TIME.
+
+* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
+  in the icon caches, which will make the icon cache files larger than
+  the one produced by GTK+ 2.6. This change will reduce the memory
+  overhead of icon themes at runtime, since all GTK+ applications can
+  share the image data in memory.
+
+* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
+  grab is broken. On X11, this can happen if the same application grabs
+  again, or if the window used for the grab becomes unviewable. It happens
+  more often on Win32. Applications which use grabs should pay attention
+  to these events and do the necessary cleanups when the grab is lost.
+* The GIOChannel code for sockets on win32 has been rewritten.
+  Applications who make non-trivial use of GIOChannels on win32 should
+  be watched for possible problems.
+
+* GLib 2.8 uses atomic operations to implement reference counting, thus
+  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
+  can be used without locking in multithreaded applications. Note that
+  other modifications, like concurrent setting of properties still require
+  locking.
+
+* g_convert() and related character set conversion functions have been
+  fixed to emit pending shift states and to not cache iconv descriptors
+  across multiple calls, since that is problematic for some encodings.
+  Note that these functions are not suitable for streaming conversions;
+  use g_iconv() to do streaming conversion.
+
+
+Release notes for 2.6
+=====================
 
 * GTK+ 2.6 supports clipboard persistency. To make use of this feature,
   a clipboard manager following the specification at
@@ -108,6 +317,7 @@ Release notes
   consideration, and use the gstdio wrappers to access files whose 
   names have been constructed from strings returned from GTK+ or GLib.
 
+
 How to report bugs
 ==================
 
@@ -141,6 +351,7 @@ In the bug report please include:
   it will be more useful if the stacktrace is produced running the test
   program with the --sync command line option.
 
+
 Patches
 =======
 

README.commits

@@ -1,4 +1,4 @@
-GTK+ is part of the GNOME CVS repository. At the current time, any
+GTK+ is part of the GNOME Subversion repository. At the current time, any
 person with write access to the GNOME repository, can make changes to
 GTK+. This is a good thing, in that it encourages many people to work
 on GTK+, and progress can be made quickly. However, GTK+ is a fairly
@@ -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 with out ChangeLog entries
+   ChangeLog entries are mandatory.) Changes without 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 preferrably match in date format
+* The ChangeLog entries should preferably match in date format
   with the existing entries. You can set how emacs does this
   by using customize mode:
 

README.in

@@ -20,13 +20,222 @@ The official web site is:
 Information about mailing lists can be found at
   http://www.gtk.org/mailinglists.html
 
+
 Installation
 ============
 
 See the file 'INSTALL'
 
-Release notes
-=============
+
+Release notes for 2.12
+======================
+
+* gtk_about_dialog_get/set_name() were deprecated in favour of
+  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
+  "program-name" property instead of the conflicting "name" property.
+
+* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
+
+* Support for Windows 9x/ME has officially been removed. It hasn't worked
+  since 2.6 anyway.
+
+* The GtkTextBufferTargetInfo enumeration values have been changed from
+  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
+  ANSI C limits.
+
+* A change in the handling of _NET_WM_USER_TIME properties on toplevel
+  windows can cause deadlock problems with window managers that are using
+  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
+  by this. The problem has been fixed in metacity 2.18.1.
+
+* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
+  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
+  and gtk_text_layout_cursors_changed(), which should be used in place of
+  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
+  is due to marks moved or changed selection; new GtkTextLineDisplay structure
+  member. Source compatibility is preserved; binary compatibility may break
+  only if GtkTextLineDisplay structure was created on stack or as a part
+  of another structure (in particular GnomeCanvas and its clones do not need
+  recompiling).
+
+* Another new signal has been added to GtkNotebook. The new signal
+  is called create-window, so this name can no longer be used for signals
+  in objects derived from GtkNotebook.
+
+* The gtk_notebook_set/get_group_id() functions were found to be insufficient
+  and have been deprecated in favour of gtk_notebook_set/get_group().
+
+* The move-focus signal has been moved to GtkWidget, to unify the 
+  various implementations of this signal in specific widgets. Great care 
+  has been taken to make sure that all code using this signal continues
+  to work.
+
+* An unused and hardly visible GtkFrame has been removed from the menu 
+  widget hierarchy when GtkComboBox::appears-as-list style property is 
+  set. Any RC file applying a different style to any widget below the 
+  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
+  account that the frame no longer exists.
+
+* The external print preview application used by GtkPrintOperationPreview 
+  is now passed the print settings on the command line with the 
+  --print-settings parameter pointing to a temp file containing the 
+  settings. The preview application assumes ownership of the file and 
+  should delete it once it does not need it anymore. The --print-settings 
+  commandline option is understood by Evince 0.9.0 and newer. To use a 
+  different print preview application, change the gtk-print-preview-command 
+  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
+
+* GtkMenuShell is now defined as an abstract type. It was already 
+  documented as an abstract class, and there is little reason to 
+  instantiate it.
+
+* The GtkTooltips struct (this is the old tooltips API) is now considered
+  private. Code that used to access this struct, in particular the
+  tips_data_list field, will need to change. All of the old tooltips
+  API has been deprecated in favour of a new implementation and
+  API. This affects all of the gtk_tooltips_ functions, and functions 
+  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
+  and gtk_menu_tool_button_set_arrow_tooltip().
+  
+* The memory management of the GtkRecentManager object has been changed,
+  as using the screen didn't guarantee that the singleton instance was
+  correctly destroyed. The screen-related functions have been deprecated,
+  and should not be used anymore; the GtkRecentManager instance returned by
+  the gtk_recent_manager_get_default() function is guaranteed to be valid
+  for the entire lifetime of an application.
+
+* A number of interfaces that have been superseded by newer interfaces for 
+  a long time have finally been deprecated. This includes 
+  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
+
+* The various coordinate systems in use in GtkTreeView widgets have
+  been clarified in the documentation, and in the cause of doing so, 
+  the functions gtk_tree_view_widget_to_tree_coords() and
+  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
+  favour of a new family of gtk_tree_view_convert_ functions.
+
+* gtk_menu_item_remove_submenu() has been deprecated in favour of
+  gtk_menu_item_set_submenu (..., NULL).
+
+* gtk_default_draw_check() has been fixed to really decrease the
+  indicator size by one pixel to ensure an odd size instead of
+  accidentially increasing it.
+  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
+  not subtract 1 from the size passed to gtk_paint_option(), which
+  was just a workaround for above off-by-two for even sizes (theme
+  engines now get the real indicator size passed).
+  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
+  has been changed to 13 to be consistent with GtkCheckButton.
+  The only visible change with default settings is that the indicator in
+  GtkCellRendererToggle has changed its size from 11 to 13 and is now
+  consistent with menus and toggle buttons.
+
+* GTK+ has always required that gtk_init() (or a variant thereof) is
+  called before any other GTK+ function. Some applications call functions
+  like gtk_clipboard_get() to check if they need to call gtk_init(),
+  anyway. A change in GLib 2.14 has recently broken this unsupported
+  practise. It is worth pointing out that calling gtk_init() twice
+  does no harm.
+
+
+Release notes for 2.10
+======================
+
+* The hexadecimal Unicode input feature has been reworked. It no longer
+  blocks the use of the sixteen Ctrl-Shift-<hex digit> key sequences. Now
+  it only uses Ctrl-Shift-u.
+
+* A memory leak in GtkStyle handling has been fixed. This may expose bugs
+  in third-party widgets which forget to call gtk_style_attach() in their
+  realize functions.
+
+* Range widgets like GtkScrollbar now render their arrows insensitive
+  when the slider is at the end. Applications which react to arrow
+  clicks even if the slider is at the end may want to use the new
+  gtk_range_set_[upper/lower]_stepper_sensitivity() functions to
+  prevent the arrows from being rendered insensitive.
+
+* GtkObject now uses the "floating reference" support in GObject. 
+  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
+  of the GTK_FLOATING flag will no longer detect the floating 
+  reference. Details about floating references can be found in the docs:
+  http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#floating-ref
+
+* Accelerators like (_F) are now stripped from labels when they are 
+  displayed in toolbars. If this is not wanted, the feature can be 
+  suppressed by inserting a Unicode control character, e.g ZWNJ.
+
+* The pixbuf theme engine can now customize expanders (in GtkTreeView
+  and GtkExpander) and resize grips, using the new EXPANDER and
+  RESIZE_GRIP function values.
+
+* Dialogs created by gtk_about_dialog_new() no longer hide automatically
+  when the user clicks close. It is the applications responsibility to
+  hide or destroy the dialog.
+
+* Several new signals have been added to GtkNotebook. Care has been taken
+  to choose signal names which do not collide with signals added by well-known
+  derived classes. The names which can no longer be used for signals in 
+  objects derived from GtkNotebook are page-reordered, page-removed and
+  page-added.
+
+* Due to the interface changes in the file chooser backend interface, 
+  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
+  backends have to be ported to the new interface, other modules, such as 
+  theme engines, input method modules or pixbuf loaders have to be rebuilt 
+  so that they are installed in the right place for GTK+ to find them.
+
+
+Release notes for 2.8
+=====================
+
+* GTK+ 2.8 and Pango 1.10 require the cairo library.
+
+* The default theme has been renamed to "Raleigh". Existing configurations
+  specifying the "Default" theme name should still work.
+
+* The GtkTreeView::enable-search property has been changed to control
+  only typeahead search, not the C-f keybinding to start an interactive
+  search. To turn off interactive searching completely, you have to
+  set GtkTreeView::search-column to -1.
+
+* The restriction on using the same cell renderer in multiple columns
+  of a GtkTreeView is now more strictly enforced.
+
+* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
+  the first day of the week. Thus, it is possible to select the first day
+  of the week independently from the language, by setting LC_TIME.
+
+* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
+  in the icon caches, which will make the icon cache files larger than
+  the one produced by GTK+ 2.6. This change will reduce the memory
+  overhead of icon themes at runtime, since all GTK+ applications can
+  share the image data in memory.
+
+* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
+  grab is broken. On X11, this can happen if the same application grabs
+  again, or if the window used for the grab becomes unviewable. It happens
+  more often on Win32. Applications which use grabs should pay attention
+  to these events and do the necessary cleanups when the grab is lost.
+* The GIOChannel code for sockets on win32 has been rewritten.
+  Applications who make non-trivial use of GIOChannels on win32 should
+  be watched for possible problems.
+
+* GLib 2.8 uses atomic operations to implement reference counting, thus
+  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
+  can be used without locking in multithreaded applications. Note that
+  other modifications, like concurrent setting of properties still require
+  locking.
+
+* g_convert() and related character set conversion functions have been
+  fixed to emit pending shift states and to not cache iconv descriptors
+  across multiple calls, since that is problematic for some encodings.
+  Note that these functions are not suitable for streaming conversions;
+  use g_iconv() to do streaming conversion.
+
+
+Release notes for 2.6
+=====================
 
 * GTK+ 2.6 supports clipboard persistency. To make use of this feature,
   a clipboard manager following the specification at
@@ -108,6 +317,7 @@ Release notes
   consideration, and use the gstdio wrappers to access files whose 
   names have been constructed from strings returned from GTK+ or GLib.
 
+
 How to report bugs
 ==================
 
@@ -141,6 +351,7 @@ In the bug report please include:
   it will be more useful if the stacktrace is produced running the test
   program with the --sync command line option.
 
+
 Patches
 =======
 

README.win32

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

acconfig.h

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

autogen.sh

@@ -93,6 +93,11 @@ fi
 
 rm -rf autom4te.cache
 
+# README and INSTALL are required by automake, but may be deleted by clean
+# up rules. to get automake to work, simply touch these here, they will be
+# regenerated from their corresponding *.in files by ./configure anyway.
+touch README INSTALL
+
 $ACLOCAL $ACLOCAL_FLAGS || exit $?
 
 libtoolize --force || exit $?

config.h.win32.in

@@ -31,14 +31,15 @@
 /* #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 */
-#define HAVE_WINSOCK_H 1
-#define HAVE_WINTAB 1
+/* #undef HAVE_XFREE_XINERAMA */
+/* #undef HAVE_XINERAMA */
 /* #undef HAVE_XCONVERTCASE */
 /* #undef HAVE_XFT */
 
@@ -53,9 +54,6 @@
 #define USE_MMX 1
 #endif
 
-/* Define to use X11R6 additions to XIM */
-/* #undef USE_X11R6_XIM */
-
 /* Define to use XKB extension */
 /* #undef HAVE_XKB */
 
@@ -86,204 +84,184 @@
    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 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
+/* Define the location where the catalogs will be installed */
+#define GTK_LOCALEDIR "UNUSED/share/locale"
 
-/* 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 */
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
 
 /* Is the wctype implementation broken */
 /* #undef HAVE_BROKEN_WCTYPE */
 
-/* Define if you have the `dcgettext' function. */
+/* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1
 
-/* Define if you have the <dlfcn.h> header file. */
+/* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
-/* Define if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
+/* Define to 1 if you have the `flockfile' function. */
+/* #undef HAVE_FLOCKFILE */
 
-/* Define if you have the `getpagesize' function. */
+/* Define to 1 if you have the `getpagesize' function. */
 #ifndef _MSC_VER
 #define HAVE_GETPAGESIZE 1
 #else /* _MSC_VER */
 /* #undef HAVE_GETPAGESIZE */
 #endif /* _MSC_VER */
 
-/* Define if you have the `getresuid' function. */
+/* Define to 1 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 if you have the <inttypes.h> header file. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_INTTYPES_H 1
+#else /* _MSC_VER */
 /* #undef HAVE_INTTYPES_H */
+#endif /* _MSC_VER */
 
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
 
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <locale.h> header file. */
+/* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
-/* Define if you have the `lstat' function. */
+/* Define to 1 if you have the `lstat' function. */
 /* #undef HAVE_LSTAT */
 
-/* Define if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
+/* Define to 1 if you have the `mallinfo' function. */
+/* #undef HAVE_MALLINFO */
 
-/* Define if you have the <memory.h> header file. */
+/* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
-/* Define if you have the `mkstemp' function. */
+/* Define to 1 if you have the `mkstemp' function. */
 /* #undef HAVE_MKSTEMP */
 
-/* Define if you have a working `mmap' system call. */
+/* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
-/* 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. */
+/* Define to 1 if you have the <pwd.h> header file. */
 /* #undef HAVE_PWD_H */
 
-/* Define if you have the `setenv' function. */
-/* #undef HAVE_SETENV */
+/* Have the Xrandr extension library */
+/* #undef HAVE_RANDR */
 
-/* Define if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the <stdint.h> header file. */
+/* Define to 1 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 if you have the <stdlib.h> header file. */
+/* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
-/* 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. */
+/* Define to 1 if you have the <strings.h> header file. */
 /* #undef HAVE_STRINGS_H */
 
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* 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 to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
-/* Define if you have the <sys/time.h> header file. */
+/* Define to 1 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 if you have the <sys/types.h> header file. */
+/* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 /* #undef HAVE_SYS_WAIT_H */
 
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 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 you have the <winsock.h> header file. */
-#define HAVE_WINSOCK_H 1
+/* Define if we have X11R6 */
+/* #undef HAVE_X11R6 */
 
-/* Define if you have the `__argz_count' function. */
-/* #undef HAVE___ARGZ_COUNT */
+/* Define to 1 if you have the `XConvertCase' function. */
+/* #undef HAVE_XCONVERTCASE */
 
-/* Define if you have the `__argz_next' function. */
-/* #undef HAVE___ARGZ_NEXT */
+/* Have the Xcursor library */
+/* #undef HAVE_XCURSOR */
 
-/* Define if you have the `__argz_stringify' function. */
-/* #undef HAVE___ARGZ_STRINGIFY */
+/* 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 as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
-/* 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 to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* Define if the X Window System is missing or not being used. */
+/* 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. */
 /* #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

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,3 +1,153 @@
+2008-03-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.9 ===
+
+2008-02-12  Matthias Clasen  <mclasne@redhat.com>
+
+	* === Released 2.12.8 ===
+
+2008-01-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.7 ===
+
+2008-01-28  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.12.6 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.4 ===
+
+2007-12-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.3 ===
+
+2007-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.2 ===
+
+2007-10-16  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.12.1 ===
+
+2007-09-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.0 ===
+
+2007-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.6 ===
+
+2007-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.5 ===
+
+2007-06-19  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.11.4 ===
+
+2007-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.3 ===
+
+2007-06-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.2 ===
+
+2007-06-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.1 ===
+
+2007-05-24   Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.0 ===
+
+2006-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-xlib.c: Apply a cleanup patch by
+	Kjartan	Maraas  (#341812)
+
+2006-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.2 ===
+
+2006-07-23  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.1 ===
+
+2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.0 ===
+
+2006-06-21  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.9.4 ===
+
+2006-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.3 ===
+
+2006-06-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.2 ===
+
+2006-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.1 ====
+
+2006-05-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.0 ===
+
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-xlib-drawable.c: 
+	* gdk-pixbuf-xlibrgb.c: const correctness fixes
+	found by Arjan van de Ven and gcc.
+
+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-08-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.2 ===
+
+	* === Released 2.8.1 ===
+
+2005-08-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.0 ===
+
+2005-08-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.5 ===
+
+2005-07-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.4 === 
+
+2005-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.3 ===
+	
+2005-07-08  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.7.2 ===
+
+2005-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.1 ===
+	
+2005-06-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.0 ===
+
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.6.1 ===

contrib/gdk-pixbuf-xlib/Makefile.am

@@ -1,15 +1,19 @@
+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 = \

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: GdkPixbuf Xlib
 Description: GdkPixbuf rendering for Xlib
 Version: @VERSION@
-Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0
+Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-2.0
 Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
 Cflags: -I${includedir}

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

@@ -41,7 +41,7 @@
 
 
 
-static guint32 mask_table[] = {
+static const guint32 mask_table[] = {
 	0x00000000, 0x00000001, 0x00000003, 0x00000007,
 	0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f,
 	0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff,
@@ -152,7 +152,6 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int xx, yy;
 	int width, height;
 	int bpl;
-	guint8 *s;
 	register guint8 data;
 	guint8 *o;
 	guint8 *srow = image->data, *orow = pixels;
@@ -167,7 +166,6 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	bpl = image->bytes_per_line;
 
 	for (yy = 0; yy < height; yy++) {
-		s = srow;
 		o = orow;
 
 		for (xx = 0; xx < width; xx ++) {
@@ -191,7 +189,6 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int xx, yy;
 	int width, height;
 	int bpl;
-	guint8 *s;
 	register guint8 data;
 	guint8 *o;
 	guint8 *srow = image->data, *orow = pixels;
@@ -221,7 +218,6 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	}
 
 	for (yy = 0; yy < height; yy++) {
-		s = srow;
 		o = orow;
 
 		for (xx = 0; xx < width; xx ++) {
@@ -988,7 +984,6 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 	int width, height;
 	int bpl;
 	guint8 *srow = image->data, *orow = pixels;
-	guint8 *s;
 	guint8 *o;
 	guint32 pixel;
 	Visual *v;
@@ -1011,7 +1006,6 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 		 red_prec, green_prec, blue_prec));
 
 	for (yy = 0; yy < height; yy++) {
-		s = srow;
 		o = orow;
 		for (xx = 0; xx < width; xx++) {
 			pixel = XGetPixel (image, xx, yy);
@@ -1058,7 +1052,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 
 typedef void (* cfunc) (XImage *image, guchar *pixels, int rowstride, xlib_colormap *cmap);
 
-static cfunc convert_map[] = {
+static const cfunc convert_map[] = {
 	rgb1,rgb1,rgb1a,rgb1a,
 	rgb8,rgb8,rgb8a,rgb8a,
 	rgb555lsb,rgb555msb,rgb555alsb,rgb555amsb,

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

@@ -516,7 +516,7 @@ static guint32
 xlib_rgb_score_visual (XVisualInfo *visual)
 {
   guint32 quality, speed, pseudo, sys;
-  static const char* visual_names[] =
+  static const char * const visual_names[] =
   {
     "static gray",
     "grayscale",

demos/Makefile.am

@@ -5,7 +5,6 @@ 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,10 +6,13 @@ democodedir=$(datadir)/gtk-2.0/demo
 ## demo app, which means alphabetized by demo title, not filename
 demos =						\
 	appwindow.c				\
+	assistant.c				\
+	builder.c				\
 	button_box.c				\
 	changedisplay.c				\
 	clipboard.c				\
 	colorsel.c				\
+	combobox.c				\
 	dialog.c				\
 	drawingarea.c				\
 	editable_cells.c			\
@@ -17,15 +20,19 @@ demos =						\
 	expander.c  				\
 	hypertext.c				\
 	iconview.c				\
+	iconview_edit.c				\
 	images.c				\
 	list_store.c				\
 	menus.c					\
 	panes.c					\
+	pickers.c				\
 	pixbufs.c				\
+	printing.c				\
 	rotated_text.c				\
 	sizegroup.c				\
 	stock_browser.c				\
 	textview.c				\
+	textscroll.c				\
 	tree_store.c				\
 	ui_manager.c
 
@@ -33,7 +40,6 @@ INCLUDES = \
 	-DDEMOCODEDIR="\"$(democodedir)\""		\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gdk				\
-	-DG_DISABLE_DEPRECATED	 			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED 			\
@@ -55,7 +61,8 @@ bin_PROGRAMS = gtk-demo
 BUILT_SOURCES = demos.h
 
 EXTRA_DIST = 		\
-	$(IMAGEFILES)
+	$(IMAGEFILES)	\
+	demo.ui
 
 demos.h: @REBUILD@ $(demos) geninclude.pl
 	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
@@ -68,6 +75,7 @@ gtk_demo_SOURCES = 		\
 
 gtk_demo_DEPENDENCIES = $(DEPS)
 gtk_demo_LDADD = $(LDADDS)
+gtk_demo_LDFLAGS = -export-dynamic
 
 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -84,6 +92,6 @@ IMAGEFILES=	alphatest.png		\
 		gnu-keys.png		\
 		gtk-logo-rgb.gif		
 
-democode_DATA = $(demos) $(IMAGEFILES)
+democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 
 DISTCLEANFILES = demos.h

demos/gtk-demo/appwindow.c

@@ -1,9 +1,10 @@
 /* Application main window
  *
- * Demonstrates a typical application window, with menubar, toolbar, statusbar.
+ * Demonstrates a typical application window with menubar, toolbar, statusbar.
  */
 
 #include <gtk/gtk.h>
+#include "config.h"
 #include "demo-common.h"
 
 static GtkWidget *window = NULL;
@@ -48,7 +49,8 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)
 				       GTK_DIALOG_DESTROY_WITH_PARENT,
 				       GTK_MESSAGE_INFO,
 				       GTK_BUTTONS_CLOSE,
-				       "You activated radio action: \"%s\" of type \"%s\".\nCurrent value: %d",
+				       "You activated radio action: \"%s\" of type \"%s\".\n"
+				       "Current value: %d",
 				       name, typename, value);
 
       /* Close dialog on user response */
@@ -131,22 +133,46 @@ about_cb (GtkAction *action,
   gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
   gtk_show_about_dialog (GTK_WINDOW (window),
 			 "name", "GTK+ Code Demos",
-			 "version", "2.4.3",
-			 "copyright", "(C) 1997-2004 The GTK+ Team",
+			 "version", PACKAGE_VERSION,
+			 "copyright", "(C) 1997-2005 The GTK+ Team",
 			 "license", license,
 			 "website", "http://www.gtk.org",
 			 "comments", "Program to demonstrate GTK+ functions.",
 			 "authors", authors,
 			 "documenters", documentors,
 			 "logo", transparent,
+                         "title", "About GTK+ Code Demos",
 			 NULL);
 
   g_object_unref (transparent);
 }
 
+typedef struct 
+{
+  GtkAction action;
+} ToolMenuAction;
+
+typedef struct 
+{
+  GtkActionClass parent_class;
+} ToolMenuActionClass;
+
+G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION)
+
+static void
+tool_menu_action_class_init (ToolMenuActionClass *class)
+{
+  GTK_ACTION_CLASS (class)->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
+}
+
+static void
+tool_menu_action_init (ToolMenuAction *action)
+{
+}
 
 static GtkActionEntry entries[] = {
   { "FileMenu", NULL, "_File" },               /* name, stock id, label */
+  { "OpenMenu", NULL, "_Open" },               /* name, stock id, label */
   { "PreferencesMenu", NULL, "_Preferences" }, /* name, stock id, label */
   { "ColorMenu", NULL, "_Color"  },            /* name, stock id, label */
   { "ShapeMenu", NULL, "_Shape" },             /* name, stock id, label */
@@ -155,9 +181,9 @@ static GtkActionEntry entries[] = {
     "_New", "<control>N",                      /* label, accelerator */
     "Create a new file",                       /* tooltip */ 
     G_CALLBACK (activate_action) },      
-  { "Open", GTK_STOCK_OPEN,                    /* name, stock id */
-    "_Open","<control>O",                      /* label, accelerator */     
-    "Open a file",                             /* tooltip */
+  { "File1", NULL,                             /* name, stock id */
+    "File1", NULL,                             /* label, accelerator */     
+    "Open first file",                         /* tooltip */
     G_CALLBACK (activate_action) }, 
   { "Save", GTK_STOCK_SAVE,                    /* name, stock id */
     "_Save","<control>S",                      /* label, accelerator */     
@@ -258,8 +284,12 @@ static const gchar *ui_info =
 "      <menuitem action='About'/>"
 "    </menu>"
 "  </menubar>"
-"  <toolbar  name='ToolBar'>"
-"    <toolitem action='Open'/>"
+"  <toolbar name='ToolBar'>"
+"    <toolitem action='Open'>"
+"      <menu action='OpenMenu'>"
+"        <menuitem action='File1'/>"
+"      </menu>"  
+"    </toolitem>"
 "    <toolitem action='Quit'/>"
 "    <separator action='Sep1'/>"
 "    <toolitem action='Logo'/>"
@@ -300,7 +330,7 @@ register_stock_icons (void)
       factory = gtk_icon_factory_new ();
       gtk_icon_factory_add_default (factory);
 
-      /* demo_find_file() looks in the the current directory first,
+      /* demo_find_file() looks in the current directory first,
        * so you can run gtk-demo without installing GTK, then looks
        * in the location where the file is installed.
        */
@@ -344,7 +374,9 @@ update_statusbar (GtkTextBuffer *buffer,
   gint count;
   GtkTextIter iter;
   
-  gtk_statusbar_pop (statusbar, 0); /* clear any previous message, underflow is allowed */
+  gtk_statusbar_pop (statusbar, 0); /* clear any previous message, 
+				     * underflow is allowed 
+				     */
 
   count = gtk_text_buffer_get_char_count (buffer);
 
@@ -377,8 +409,15 @@ update_resize_grip (GtkWidget           *widget,
 		    GdkEventWindowState *event,
 		    GtkStatusbar        *statusbar)
 {
-  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))
-    gtk_statusbar_set_has_resize_grip (statusbar, !(event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)));
+  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED | 
+			     GDK_WINDOW_STATE_FULLSCREEN))
+    {
+      gboolean maximized;
+
+      maximized = event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | 
+					     GDK_WINDOW_STATE_FULLSCREEN);
+      gtk_statusbar_set_has_resize_grip (statusbar, !maximized);
+    }
 }
 		    
 
@@ -394,6 +433,7 @@ do_appwindow (GtkWidget *do_widget)
       GtkWidget *bar;
       GtkTextBuffer *buffer;
       GtkActionGroup *action_group;
+      GtkAction *open_action;
       GtkUIManager *merge;
       GError *error = NULL;
 
@@ -406,6 +446,7 @@ do_appwindow (GtkWidget *do_widget)
       gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Application Window");
+      gtk_window_set_icon_name (GTK_WINDOW (window), "gtk-open");
 
       /* NULL window variable when window is closed */
       g_signal_connect (window, "destroy",
@@ -420,6 +461,14 @@ do_appwindow (GtkWidget *do_widget)
        */
       
       action_group = gtk_action_group_new ("AppWindowActions");
+      open_action = g_object_new (tool_menu_action_get_type (), 
+				  "name", "Open",
+				  "label", "_Open",
+				  "tooltip", "Open a file",
+				  "stock-id", GTK_STOCK_OPEN,
+				  NULL);
+      gtk_action_group_add_action (action_group, open_action);
+      g_object_unref (open_action);
       gtk_action_group_add_actions (action_group, 
 				    entries, n_entries, 
 				    window);
@@ -438,7 +487,8 @@ do_appwindow (GtkWidget *do_widget)
 					  NULL);
 
       merge = gtk_ui_manager_new ();
-      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge, g_object_unref);
+      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge, 
+			      g_object_unref);
       gtk_ui_manager_insert_action_group (merge, action_group, 0);
       gtk_window_add_accel_group (GTK_WINDOW (window), 
 				  gtk_ui_manager_get_accel_group (merge));

demos/gtk-demo/assistant.c

@@ -0,0 +1,165 @@
+/* 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/builder.c

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

demos/gtk-demo/changedisplay.c

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

demos/gtk-demo/clipboard.c

@@ -1,7 +1,12 @@
 /* Clipboard
  *
  * GtkClipboard is used for clipboard handling. This demo shows how to
- * copy and paste text to and from the clipboard.
+ * copy and paste text to and from the clipboard. 
+ *
+ * It also shows how to transfer images via the clipboard or via 
+ * drag-and-drop, and how to make clipboard contents persist after
+ * the application exits. Clipboard persistence requires a clipboard
+ * manager to run.
  */
 
 #include <gtk/gtk.h>
@@ -11,7 +16,7 @@ static GtkWidget *window = NULL;
 
 void
 copy_button_clicked (GtkWidget *button,
-		     gpointer   user_data)
+                     gpointer   user_data)
 {
   GtkWidget *entry;
   GtkClipboard *clipboard;
@@ -20,7 +25,7 @@ copy_button_clicked (GtkWidget *button,
   
   /* Get the clipboard object */
   clipboard = gtk_widget_get_clipboard (entry,
-					GDK_SELECTION_CLIPBOARD);
+                                        GDK_SELECTION_CLIPBOARD);
 
   /* Set clipboard text */
   gtk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)), -1);
@@ -28,20 +33,21 @@ copy_button_clicked (GtkWidget *button,
 
 void
 paste_received (GtkClipboard *clipboard,
-		const gchar  *text,
-		gpointer      user_data)
+                const gchar  *text,
+                gpointer      user_data)
 {
   GtkWidget *entry;
 
   entry = GTK_WIDGET (user_data);
   
   /* Set the entry text */
-  gtk_entry_set_text (GTK_ENTRY (entry), text);
+  if(text)
+    gtk_entry_set_text (GTK_ENTRY (entry), text);
 }
 
 void
 paste_button_clicked (GtkWidget *button,
-		     gpointer   user_data)
+                     gpointer   user_data)
 {
   GtkWidget *entry;
   GtkClipboard *clipboard;
@@ -50,13 +56,139 @@ paste_button_clicked (GtkWidget *button,
   
   /* Get the clipboard object */
   clipboard = gtk_widget_get_clipboard (entry,
-					GDK_SELECTION_CLIPBOARD);
+                                        GDK_SELECTION_CLIPBOARD);
 
   /* Request the contents of the clipboard, contents_received will be
      called when we do get the contents.
    */
   gtk_clipboard_request_text (clipboard,
-			      paste_received, entry);
+                              paste_received, entry);
+}
+
+static GdkPixbuf *
+get_image_pixbuf (GtkImage *image)
+{
+  gchar *stock_id;
+  GtkIconSize size;
+
+  switch (gtk_image_get_storage_type (image))
+    {
+    case GTK_IMAGE_PIXBUF:
+      return g_object_ref (gtk_image_get_pixbuf (image));
+    case GTK_IMAGE_STOCK:
+      gtk_image_get_stock (image, &stock_id, &size);
+      return gtk_widget_render_icon (GTK_WIDGET (image),
+                                     stock_id, size, NULL);
+    default:
+      g_warning ("Image storage type %d not handled", 
+                 gtk_image_get_storage_type (image));
+      return NULL;
+    }
+}
+
+static void
+drag_begin (GtkWidget      *widget,
+            GdkDragContext *context,
+            gpointer        data)
+{
+  GdkPixbuf *pixbuf;
+
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+  gtk_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
+  g_object_unref (pixbuf);
+}
+
+void  
+drag_data_get  (GtkWidget        *widget,
+                GdkDragContext   *context,
+                GtkSelectionData *selection_data,
+                guint             info,
+                guint             time,
+                gpointer          data)
+{
+  GdkPixbuf *pixbuf;
+
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+  gtk_selection_data_set_pixbuf (selection_data, pixbuf);
+  g_object_unref (pixbuf);
+}
+
+static void
+drag_data_received (GtkWidget        *widget,
+                    GdkDragContext   *context,
+                    gint              x,
+                    gint              y,
+                    GtkSelectionData *selection_data,
+                    guint             info,
+                    guint32           time,
+                    gpointer          data)
+{
+  GdkPixbuf *pixbuf;
+
+  if (selection_data->length > 0)
+    {
+      pixbuf = gtk_selection_data_get_pixbuf (selection_data);
+      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
+      g_object_unref (pixbuf);
+    }
+}
+
+static void
+copy_image (GtkMenuItem *item,
+            gpointer     data)
+{
+  GtkClipboard *clipboard;
+  GdkPixbuf *pixbuf;
+
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+
+  gtk_clipboard_set_image (clipboard, pixbuf);
+  g_object_unref (pixbuf);
+}
+
+static void
+paste_image (GtkMenuItem *item,
+             gpointer     data)
+{
+  GtkClipboard *clipboard;
+  GdkPixbuf *pixbuf;
+
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  pixbuf = gtk_clipboard_wait_for_image (clipboard);
+
+  if (pixbuf)
+    {
+      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
+      g_object_unref (pixbuf);
+    }
+}
+
+static gboolean
+button_press (GtkWidget      *widget,
+              GdkEventButton *button,
+              gpointer        data)
+{
+  GtkWidget *menu;
+  GtkWidget *item;
+  
+  if (button->button != 3)
+    return FALSE;
+
+  menu = gtk_menu_new ();
+  
+  item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
+  g_signal_connect (item, "activate", G_CALLBACK (copy_image), data);
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PASTE, NULL);
+  g_signal_connect (item, "activate", G_CALLBACK (paste_image), data);
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3, button->time);
+  return TRUE;
 }
 
 GtkWidget *
@@ -67,8 +199,13 @@ do_clipboard (GtkWidget *do_widget)
       GtkWidget *vbox, *hbox;
       GtkWidget *label;
       GtkWidget *entry, *button;
+      GtkWidget *ebox, *image;
+      GtkClipboard *clipboard;
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
       vbox = gtk_vbox_new (FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       
@@ -90,7 +227,7 @@ do_clipboard (GtkWidget *do_widget)
       button = gtk_button_new_from_stock (GTK_STOCK_COPY);
       gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
       g_signal_connect (button, "clicked",
-			G_CALLBACK (copy_button_clicked), entry);
+                        G_CALLBACK (copy_button_clicked), entry);
 
       label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
@@ -107,8 +244,70 @@ do_clipboard (GtkWidget *do_widget)
       button = gtk_button_new_from_stock (GTK_STOCK_PASTE);
       gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
       g_signal_connect (button, "clicked",
-			G_CALLBACK (paste_button_clicked), entry);
+                        G_CALLBACK (paste_button_clicked), entry);
       
+      label = gtk_label_new ("Images can be transferred via the clipboard, too");
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      hbox = gtk_hbox_new (FALSE, 4);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+      /* Create the first image */
+      image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, 
+                                        GTK_ICON_SIZE_BUTTON);
+      ebox = gtk_event_box_new ();
+      gtk_container_add (GTK_CONTAINER (ebox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), ebox);
+
+      /* make ebox a drag source */
+      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag_begin", 
+                        G_CALLBACK (drag_begin), image);
+      g_signal_connect (ebox, "drag_data_get", 
+                        G_CALLBACK (drag_data_get), image);
+      
+      /* accept drops on ebox */
+      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL, 
+                         NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag_data_received", 
+                        G_CALLBACK (drag_data_received), image);
+      
+      /* context menu on ebox */
+      g_signal_connect (ebox, "button_press_event", 
+                        G_CALLBACK (button_press), image);
+
+      /* Create the second image */
+      image = gtk_image_new_from_stock (GTK_STOCK_STOP, 
+                                        GTK_ICON_SIZE_BUTTON);
+      ebox = gtk_event_box_new ();
+      gtk_container_add (GTK_CONTAINER (ebox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), ebox);
+
+      /* make ebox a drag source */
+      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag_begin", 
+                        G_CALLBACK (drag_begin), image);
+      g_signal_connect (ebox, "drag_data_get", 
+                        G_CALLBACK (drag_data_get), image);
+      
+      /* accept drops on ebox */
+      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL, 
+                         NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag_data_received", 
+                        G_CALLBACK (drag_data_received), image);
+      
+      /* context menu on ebox */
+      g_signal_connect (ebox, "button_press_event", 
+                        G_CALLBACK (button_press), image);
+      
+      /* tell the clipboard manager to make the data persistent */
+      clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+      gtk_clipboard_set_can_store (clipboard, NULL, 0);
     }
 
   if (!GTK_WIDGET_VISIBLE (window))

demos/gtk-demo/colorsel.c

@@ -15,7 +15,9 @@ 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/combobox.c

@@ -0,0 +1,454 @@
+/* Combo boxes 
+ *
+ * The ComboBox widget allows to select one option out of a list.
+ * The ComboBoxEntry additionally allows the user to enter a value
+ * that is not in the list of options. 
+ *
+ * How the options are displayed is controlled by cell renderers.
+ */
+
+#include <gtk/gtk.h>
+
+enum 
+{
+  PIXBUF_COL,
+  TEXT_COL
+};
+
+static gchar *
+strip_underscore (const gchar *text)
+{
+  gchar *p, *q;
+  gchar *result;
+  
+  result = g_strdup (text);
+  p = q = result;
+  while (*p) 
+    {
+      if (*p != '_')
+	{
+	  *q = *p;
+	  q++;
+	}
+      p++;
+    }
+  *q = '\0';
+
+  return result;
+}
+
+static GtkTreeModel *
+create_stock_icon_store (void)
+{
+  gchar *stock_id[6] = {
+    GTK_STOCK_DIALOG_WARNING,
+    GTK_STOCK_STOP,
+    GTK_STOCK_NEW,
+    GTK_STOCK_CLEAR,
+    NULL,
+    GTK_STOCK_OPEN    
+  };
+
+  GtkStockItem item;
+  GdkPixbuf *pixbuf;
+  GtkWidget *cellview;
+  GtkTreeIter iter;
+  GtkListStore *store;
+  gchar *label;
+  gint i;
+
+  cellview = gtk_cell_view_new ();
+  
+  store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+
+  for (i = 0; i < G_N_ELEMENTS (stock_id); i++)
+    {
+      if (stock_id[i])
+	{
+	  pixbuf = gtk_widget_render_icon (cellview, stock_id[i],
+					   GTK_ICON_SIZE_BUTTON, NULL);
+	  gtk_stock_lookup (stock_id[i], &item);
+	  label = strip_underscore (item.label);
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      PIXBUF_COL, pixbuf,
+			      TEXT_COL, label,
+			      -1);
+	  g_object_unref (pixbuf);
+	  g_free (label);
+	}
+      else
+	{
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      PIXBUF_COL, NULL,
+			      TEXT_COL, "separator",
+			      -1);
+	}
+    }
+
+  gtk_widget_destroy (cellview);
+  
+  return GTK_TREE_MODEL (store);
+}
+
+/* A GtkCellLayoutDataFunc that demonstrates how one can control
+ * sensitivity of rows. This particular function does nothing 
+ * useful and just makes the second row insensitive.
+ */
+static void
+set_sensitive (GtkCellLayout   *cell_layout,
+	       GtkCellRenderer *cell,
+	       GtkTreeModel    *tree_model,
+	       GtkTreeIter     *iter,
+	       gpointer         data)
+{
+  GtkTreePath *path;
+  gint *indices;
+  gboolean sensitive;
+
+  path = gtk_tree_model_get_path (tree_model, iter);
+  indices = gtk_tree_path_get_indices (path);
+  sensitive = indices[0] != 1;
+  gtk_tree_path_free (path);
+
+  g_object_set (cell, "sensitive", sensitive, NULL);
+}
+
+/* A GtkTreeViewRowSeparatorFunc that demonstrates how rows can be
+ * rendered as separators. This particular function does nothing 
+ * useful and just turns the fourth row into a separator.
+ */
+static gboolean
+is_separator (GtkTreeModel *model,
+	      GtkTreeIter  *iter,
+	      gpointer      data)
+{
+  GtkTreePath *path;
+  gboolean result;
+
+  path = gtk_tree_model_get_path (model, iter);
+  result = gtk_tree_path_get_indices (path)[0] == 4;
+  gtk_tree_path_free (path);
+
+  return result;
+}
+
+static GtkTreeModel *
+create_capital_store (void)
+{
+  struct {
+    gchar *group;
+    gchar *capital;
+  } capitals[] = {
+    { "A - B", NULL }, 
+    { NULL, "Albany" },
+    { NULL, "Annapolis" },
+    { NULL, "Atlanta" },
+    { NULL, "Augusta" }, 
+    { NULL, "Austin" },
+    { NULL, "Baton Rouge" },
+    { NULL, "Bismarck" },
+    { NULL, "Boise" },
+    { NULL, "Boston" },
+    { "C - D", NULL },
+    { NULL, "Carson City" },
+    { NULL, "Charleston" },
+    { NULL, "Cheyenne" },
+    { NULL, "Columbia" },
+    { NULL, "Columbus" },
+    { NULL, "Concord" },
+    { NULL, "Denver" },
+    { NULL, "Des Moines" },
+    { NULL, "Dover" },
+    { "E - J", NULL },
+    { NULL, "Frankfort" },
+    { NULL, "Harrisburg" },
+    { NULL, "Hartford" },
+    { NULL, "Helena" },
+    { NULL, "Honolulu" },
+    { NULL, "Indianapolis" },
+    { NULL, "Jackson" },
+    { NULL, "Jefferson City" },
+    { NULL, "Juneau" },
+    { "K - O" },
+    { NULL, "Lansing" },
+    { NULL, "Lincoln" },
+    { NULL, "Little Rock" },
+    { NULL, "Madison" },
+    { NULL, "Montgomery" },
+    { NULL, "Montpelier" },
+    { NULL, "Nashville" },
+    { NULL, "Oklahoma City" },
+    { NULL, "Olympia" },
+    { NULL, "P - S" },
+    { NULL, "Phoenix" },
+    { NULL, "Pierre" },
+    { NULL, "Providence" },
+    { NULL, "Raleigh" },
+    { NULL, "Richmond" },
+    { NULL, "Sacramento" },
+    { NULL, "Salem" },
+    { NULL, "Salt Lake City" },
+    { NULL, "Santa Fe" },
+    { NULL, "Springfield" },
+    { NULL, "St. Paul" },
+    { "T - Z", NULL },
+    { NULL, "Tallahassee" },
+    { NULL, "Topeka" },
+    { NULL, "Trenton" },
+    { NULL, NULL }
+  };
+  
+  GtkTreeIter iter, iter2;
+  GtkTreeStore *store;
+  gint i;
+
+  store = gtk_tree_store_new (1, G_TYPE_STRING);
+  
+  for (i = 0; capitals[i].group || capitals[i].capital; i++)
+    {
+      if (capitals[i].group)
+	{
+	  gtk_tree_store_append (store, &iter, NULL);
+	  gtk_tree_store_set (store, &iter, 0, capitals[i].group, -1);
+	}
+      else if (capitals[i].capital)
+	{
+	  gtk_tree_store_append (store, &iter2, &iter);
+	  gtk_tree_store_set (store, &iter2, 0, capitals[i].capital, -1);
+	}
+    }
+  
+  return GTK_TREE_MODEL (store);
+}
+
+static void
+is_capital_sensitive (GtkCellLayout   *cell_layout,
+		      GtkCellRenderer *cell,
+		      GtkTreeModel    *tree_model,
+		      GtkTreeIter     *iter,
+		      gpointer         data)
+{
+  gboolean sensitive;
+
+  sensitive = !gtk_tree_model_iter_has_child (tree_model, iter);
+
+  g_object_set (cell, "sensitive", sensitive, NULL);
+}
+
+static void
+fill_combo_entry (GtkWidget *entry)
+{
+  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "One");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Two");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "2\302\275");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Three");
+}
+
+
+/* A simple validating entry */
+
+#define TYPE_MASK_ENTRY             (mask_entry_get_type ())
+#define MASK_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MASK_ENTRY, MaskEntry))
+#define MASK_ENTRY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TYPE_MASK_ENTRY, MaskEntryClass))
+#define IS_MASK_ENTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MASK_ENTRY))
+#define IS_MASK_ENTRY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TYPE_MASK_ENTRY))
+#define MASK_ENTRY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TYPE_MASK_ENTRY, MaskEntryClass))
+
+
+typedef struct _MaskEntry MaskEntry;
+struct _MaskEntry
+{
+  GtkEntry entry;
+  gchar *mask;
+};
+
+typedef struct _MaskEntryClass MaskEntryClass;
+struct _MaskEntryClass
+{
+  GtkEntryClass parent_class;
+};
+
+
+static void mask_entry_editable_init (GtkEditableClass *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
+			 G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+						mask_entry_editable_init));
+
+
+static void
+mask_entry_set_background (MaskEntry *entry)
+{
+  static const GdkColor error_color = { 0, 65535, 60000, 60000 };
+
+  if (entry->mask)
+    {
+      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
+	{
+	  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &error_color);
+	  return;
+	}
+    }
+
+  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+}
+
+
+static void
+mask_entry_changed (GtkEditable *editable)
+{
+  mask_entry_set_background (MASK_ENTRY (editable));
+}
+
+
+static void
+mask_entry_init (MaskEntry *entry)
+{
+  entry->mask = NULL;
+}
+
+
+static void
+mask_entry_class_init (MaskEntryClass *klass)
+{ }
+
+
+static void
+mask_entry_editable_init (GtkEditableClass *iface)
+{
+  iface->changed = mask_entry_changed;
+}
+
+
+GtkWidget *
+do_combobox (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *vbox, *frame, *box, *combo, *entry;
+  GtkTreeModel *model;
+  GtkCellRenderer *renderer;
+  GtkTreePath *path;
+  GtkTreeIter iter;
+
+  if (!window)
+  {
+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
+    gtk_window_set_title (GTK_WINDOW (window), "Combo boxes");
+   
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed),
+                      &window);
+    
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+
+    vbox = gtk_vbox_new (FALSE, 2);
+    gtk_container_add (GTK_CONTAINER (window), vbox);
+
+    /* A combobox demonstrating cell renderers, separators and
+     *  insensitive rows 
+     */
+    frame = gtk_frame_new ("Some stock icons");
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+    
+    box = gtk_vbox_new (FALSE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_add (GTK_CONTAINER (frame), box);
+    
+    model = create_stock_icon_store ();
+    combo = gtk_combo_box_new_with_model (model);
+    g_object_unref (model);
+    gtk_container_add (GTK_CONTAINER (box), combo);
+    
+    renderer = gtk_cell_renderer_pixbuf_new ();
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
+    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+				    "pixbuf", PIXBUF_COL, 
+				    NULL);
+
+    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
+					renderer,
+					set_sensitive,
+					NULL, NULL);
+    
+    renderer = gtk_cell_renderer_text_new ();
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+				    "text", TEXT_COL,
+				    NULL);
+
+    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
+					renderer,
+					set_sensitive,
+					NULL, NULL);
+
+    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), 
+					  is_separator, NULL, NULL);
+    
+    gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
+    
+    /* A combobox demonstrating trees.
+     */
+    frame = gtk_frame_new ("Where are we ?");
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+
+    box = gtk_vbox_new (FALSE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_add (GTK_CONTAINER (frame), box);
+    
+    model = create_capital_store ();
+    combo = gtk_combo_box_new_with_model (model);
+    g_object_unref (model);
+    gtk_container_add (GTK_CONTAINER (box), combo);
+
+    renderer = gtk_cell_renderer_text_new ();
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+				    "text", 0,
+				    NULL);
+    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
+					renderer,
+					is_capital_sensitive,
+					NULL, NULL);
+
+    path = gtk_tree_path_new_from_indices (0, 8, -1);
+    gtk_tree_model_get_iter (model, &iter, path);
+    gtk_tree_path_free (path);
+    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
+
+    /* A GtkComboBoxEntry with validation.
+     */
+    frame = gtk_frame_new ("Editable");
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+    
+    box = gtk_vbox_new (FALSE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_add (GTK_CONTAINER (frame), box);
+    
+    combo = gtk_combo_box_entry_new_text ();
+    fill_combo_entry (combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);
+    
+    entry = g_object_new (TYPE_MASK_ENTRY, NULL);
+    MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
+     
+    gtk_container_remove (GTK_CONTAINER (combo), GTK_BIN (combo)->child);
+    gtk_container_add (GTK_CONTAINER (combo), entry);
+  
+  }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show_all (window);
+    }
+  else
+    {    
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/demo.ui

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

demos/gtk-demo/drawingarea.c

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

demos/gtk-demo/editable_cells.c

@@ -2,8 +2,12 @@
  *
  * This demo demonstrates the use of editable cells in a GtkTreeView. If
  * you're new to the GtkTreeView widgets and associates, look into
- * the GtkListStore example first.
+ * the GtkListStore example first. It also shows how to use the
+ * GtkCellRenderer::editing-started signal to do custom setup of the
+ * editable widget.
  *
+ * The cell renderers used in this demo are GtkCellRendererText, 
+ * GtkCellRendererCombo and GtkCellRendererProgress.
  */
 
 #include <gtk/gtk.h>
@@ -14,18 +18,24 @@ static GtkWidget *window = NULL;
 
 typedef struct
 {
-  gint     number;
-  gchar   *product;
-  gboolean editable;
+  gint   number;
+  gchar *product;
+  gint   yummy;
 }
 Item;
 
 enum
 {
-  COLUMN_NUMBER,
-  COLUMN_PRODUCT,
-  COLUMN_EDITABLE,
-  NUM_COLUMNS
+  COLUMN_ITEM_NUMBER,
+  COLUMN_ITEM_PRODUCT,
+  COLUMN_ITEM_YUMMY,
+  NUM_ITEM_COLUMNS
+};
+
+enum
+{
+  COLUMN_NUMBER_TEXT,
+  NUM_NUMBER_COLUMNS
 };
 
 static GArray *articles = NULL;
@@ -39,32 +49,32 @@ add_items (void)
 
   foo.number = 3;
   foo.product = g_strdup ("bottles of coke");
-  foo.editable = TRUE;
+  foo.yummy = 20;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 5;
   foo.product = g_strdup ("packages of noodles");
-  foo.editable = TRUE;
+  foo.yummy = 50;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 2;
   foo.product = g_strdup ("packages of chocolate chip cookies");
-  foo.editable = TRUE;
+  foo.yummy = 90;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 1;
   foo.product = g_strdup ("can vanilla ice cream");
-  foo.editable = TRUE;
+  foo.yummy = 60;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 6;
   foo.product = g_strdup ("eggs");
-  foo.editable = TRUE;
+  foo.yummy = 10;
   g_array_append_vals (articles, &foo, 1);
 }
 
 static GtkTreeModel *
-create_model (void)
+create_items_model (void)
 {
   gint i = 0;
   GtkListStore *model;
@@ -76,8 +86,8 @@ create_model (void)
   add_items ();
 
   /* create list store */
-  model = gtk_list_store_new (NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING,
-			      G_TYPE_BOOLEAN);
+  model = gtk_list_store_new (NUM_ITEM_COLUMNS, G_TYPE_INT, G_TYPE_STRING,
+                              G_TYPE_INT, G_TYPE_BOOLEAN);
 
   /* add items */
   for (i = 0; i < articles->len; i++)
@@ -85,18 +95,49 @@ create_model (void)
       gtk_list_store_append (model, &iter);
 
       gtk_list_store_set (model, &iter,
-			  COLUMN_NUMBER,
-			  g_array_index (articles, Item, i).number,
-			  COLUMN_PRODUCT,
-			  g_array_index (articles, Item, i).product,
-			  COLUMN_EDITABLE,
-			  g_array_index (articles, Item, i).editable,
-			  -1);
+                          COLUMN_ITEM_NUMBER,
+                          g_array_index (articles, Item, i).number,
+                          COLUMN_ITEM_PRODUCT,
+                          g_array_index (articles, Item, i).product,
+                          COLUMN_ITEM_YUMMY,
+                          g_array_index (articles, Item, i).yummy,
+                          -1);
     }
 
   return GTK_TREE_MODEL (model);
 }
 
+static GtkTreeModel *
+create_numbers_model (void)
+{
+#define N_NUMBERS 10
+  gint i = 0;
+  GtkListStore *model;
+  GtkTreeIter iter;
+
+  /* create list store */
+  model = gtk_list_store_new (NUM_NUMBER_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
+
+  /* add numbers */
+  for (i = 0; i < N_NUMBERS; i++)
+    {
+      char str[2];
+
+      str[0] = '0' + i;
+      str[1] = '\0';
+
+      gtk_list_store_append (model, &iter);
+
+      gtk_list_store_set (model, &iter,
+                          COLUMN_NUMBER_TEXT, str,
+                          -1);
+    }
+
+  return GTK_TREE_MODEL (model);
+
+#undef N_NUMBERS
+}
+
 static void
 add_item (GtkWidget *button, gpointer data)
 {
@@ -108,15 +149,15 @@ add_item (GtkWidget *button, gpointer data)
 
   foo.number = 0;
   foo.product = g_strdup ("Description here");
-  foo.editable = TRUE;
+  foo.yummy = 50;
   g_array_append_vals (articles, &foo, 1);
 
   gtk_list_store_append (GTK_LIST_STORE (model), &iter);
   gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-		      COLUMN_NUMBER, foo.number,
-		      COLUMN_PRODUCT, foo.product,
-		      COLUMN_EDITABLE, foo.editable,
-		      -1);
+                      COLUMN_ITEM_NUMBER, foo.number,
+                      COLUMN_ITEM_PRODUCT, foo.product,
+                      COLUMN_ITEM_YUMMY, foo.yummy,
+                      -1);
 }
 
 static void
@@ -142,11 +183,37 @@ remove_item (GtkWidget *widget, gpointer data)
     }
 }
 
+static gboolean
+separator_row (GtkTreeModel *model,
+               GtkTreeIter  *iter,
+               gpointer      data)
+{
+  GtkTreePath *path;
+  gint idx;
+
+  path = gtk_tree_model_get_path (model, iter);
+  idx = gtk_tree_path_get_indices (path)[0];
+
+  gtk_tree_path_free (path);
+
+  return idx == 5;
+}
+
+static void
+editing_started (GtkCellRenderer *cell,
+                 GtkCellEditable *editable,
+                 const gchar     *path,
+                 gpointer         data)
+{
+  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (editable), 
+                                        separator_row, NULL, NULL);
+}
+
 static void
 cell_edited (GtkCellRendererText *cell,
-	     const gchar         *path_string,
-	     const gchar         *new_text,
-	     gpointer             data)
+             const gchar         *path_string,
+             const gchar         *new_text,
+             gpointer             data)
 {
   GtkTreeModel *model = (GtkTreeModel *)data;
   GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
@@ -158,31 +225,31 @@ cell_edited (GtkCellRendererText *cell,
 
   switch (column)
     {
-    case COLUMN_NUMBER:
+    case COLUMN_ITEM_NUMBER:
       {
-	gint i;
+        gint i;
 
-	i = gtk_tree_path_get_indices (path)[0];
-	g_array_index (articles, Item, i).number = atoi (new_text);
+        i = gtk_tree_path_get_indices (path)[0];
+        g_array_index (articles, Item, i).number = atoi (new_text);
 
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
-			    g_array_index (articles, Item, i).number, -1);
+        gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
+                            g_array_index (articles, Item, i).number, -1);
       }
       break;
 
-    case COLUMN_PRODUCT:
+    case COLUMN_ITEM_PRODUCT:
       {
-	gint i;
-	gchar *old_text;
+        gint i;
+        gchar *old_text;
 
         gtk_tree_model_get (model, &iter, column, &old_text, -1);
-	g_free (old_text);
+        g_free (old_text);
 
-	i = gtk_tree_path_get_indices (path)[0];
-	g_free (g_array_index (articles, Item, i).product);
-	g_array_index (articles, Item, i).product = g_strdup (new_text);
+        i = gtk_tree_path_get_indices (path)[0];
+        g_free (g_array_index (articles, Item, i).product);
+        g_array_index (articles, Item, i).product = g_strdup (new_text);
 
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
+        gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
                             g_array_index (articles, Item, i).product, -1);
       }
       break;
@@ -192,34 +259,55 @@ cell_edited (GtkCellRendererText *cell,
 }
 
 static void
-add_columns (GtkTreeView *treeview)
+add_columns (GtkTreeView  *treeview, 
+             GtkTreeModel *items_model,
+             GtkTreeModel *numbers_model)
 {
   GtkCellRenderer *renderer;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
 
   /* number column */
-  renderer = gtk_cell_renderer_text_new ();
+  renderer = gtk_cell_renderer_combo_new ();
+  g_object_set (renderer,
+                "model", numbers_model,
+                "text-column", COLUMN_NUMBER_TEXT,
+                "has-entry", FALSE,
+                "editable", TRUE,
+                NULL);
   g_signal_connect (renderer, "edited",
-		    G_CALLBACK (cell_edited), model);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_NUMBER);
+                    G_CALLBACK (cell_edited), items_model);
+  g_signal_connect (renderer, "editing-started",
+                    G_CALLBACK (editing_started), NULL);
+  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (COLUMN_ITEM_NUMBER));
 
   gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-					       -1, "Number", renderer,
-					       "text", COLUMN_NUMBER,
-					       "editable", COLUMN_EDITABLE,
-					       NULL);
+                                               -1, "Number", renderer,
+                                               "text", COLUMN_ITEM_NUMBER,
+                                               NULL);
 
   /* product column */
   renderer = gtk_cell_renderer_text_new ();
+  g_object_set (renderer,
+                "editable", TRUE,
+                NULL);
   g_signal_connect (renderer, "edited",
-		    G_CALLBACK (cell_edited), model);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_PRODUCT);
+                    G_CALLBACK (cell_edited), items_model);
+  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (COLUMN_ITEM_PRODUCT));
 
   gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-					       -1, "Product", renderer,
-					       "text", COLUMN_PRODUCT,
-					       "editable", COLUMN_EDITABLE,
-					       NULL);
+                                               -1, "Product", renderer,
+                                               "text", COLUMN_ITEM_PRODUCT,
+                                               NULL);
+
+  /* yummy column */
+  renderer = gtk_cell_renderer_progress_new ();
+  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (COLUMN_ITEM_YUMMY));
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
+                                               -1, "Yummy", renderer,
+                                               "value", COLUMN_ITEM_YUMMY,
+                                               NULL);
+  
+
 }
 
 GtkWidget *
@@ -232,43 +320,47 @@ do_editable_cells (GtkWidget *do_widget)
       GtkWidget *sw;
       GtkWidget *treeview;
       GtkWidget *button;
-      GtkTreeModel *model;
+      GtkTreeModel *items_model;
+      GtkTreeModel *numbers_model;
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
       gtk_container_set_border_width (GTK_CONTAINER (window), 5);
       g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_vbox_new (FALSE, 5);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),
-			  gtk_label_new ("Shopping list (you can edit the cells!)"),
-			  FALSE, FALSE, 0);
+                          gtk_label_new ("Shopping list (you can edit the cells!)"),
+                          FALSE, FALSE, 0);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-					   GTK_SHADOW_ETCHED_IN);
+                                           GTK_SHADOW_ETCHED_IN);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
       gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
 
-      /* create model */
-      model = create_model ();
+      /* create models */
+      items_model = create_items_model ();
+      numbers_model = create_numbers_model ();
 
       /* create tree view */
-      treeview = gtk_tree_view_new_with_model (model);
-      g_object_unref (model);
+      treeview = gtk_tree_view_new_with_model (items_model);
       gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
-				   GTK_SELECTION_SINGLE);
+                                   GTK_SELECTION_SINGLE);
 
-      add_columns (GTK_TREE_VIEW (treeview));
+      add_columns (GTK_TREE_VIEW (treeview), items_model, numbers_model);
+
+      g_object_unref (numbers_model);
+      g_object_unref (items_model);
 
       gtk_container_add (GTK_CONTAINER (sw), treeview);
 
@@ -278,12 +370,12 @@ do_editable_cells (GtkWidget *do_widget)
 
       button = gtk_button_new_with_label ("Add item");
       g_signal_connect (button, "clicked",
-			G_CALLBACK (add_item), model);
+                        G_CALLBACK (add_item), items_model);
       gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
 
       button = gtk_button_new_with_label ("Remove item");
       g_signal_connect (button, "clicked",
-			G_CALLBACK (remove_item), treeview);
+                        G_CALLBACK (remove_item), treeview);
       gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
 
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);

demos/gtk-demo/geninclude.pl.in

@@ -35,7 +35,7 @@ for $file (@ARGV) {
 
 # generate a list of 'parent names'
 foreach $href (@demos) {
-    if ($href->{"title"} =~ m|^([\w\s]+)/[\w\s]+$|) {
+    if ($href->{"title"} =~ m|^([-\w\s]+)/[-\w\s]+$|) {
 	my $parent_name = $1;
 	my $do_next = 0;
 
@@ -77,7 +77,7 @@ if (defined @parents) {
 		next;
 	    }
 	    
-	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([\w\s]+)$|) {
+	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([-\w\s]+)$|) {
 		if ($first) {
 		    $first = 0;
 		} else {

demos/gtk-demo/hypertext.c

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

demos/gtk-demo/iconview.c

@@ -1,8 +1,8 @@
-/* Icon View
+/* Icon View/Icon View Basics
  *
- * The GtkIconView widget is used to display and manipulate icons.  It
- * uses a GtkTreeModel for data storage, so the list store example
- * might be helpful.
+ * The GtkIconView widget is used to display and manipulate icons.  
+ * It uses a GtkTreeModel for data storage, so the list store 
+ * example might be helpful.
  */
 
 #include <gtk/gtk.h>
@@ -37,7 +37,7 @@ load_pixbufs (GError **error)
   if (file_pixbuf)
     return TRUE; /* already loaded earlier */
 
-  /* demo_find_file() looks in the the current directory first,
+  /* demo_find_file() looks in the current directory first,
    * so you can run gtk-demo without installing GTK, then looks
    * in the location where the file is installed.
    */
@@ -147,7 +147,7 @@ sort_func (GtkTreeModel *model,
   return ret;
 }
 
-GtkListStore *
+static GtkListStore *
 create_store (void)
 {
   GtkListStore *store;
@@ -243,6 +243,18 @@ home_clicked (GtkToolItem *item,
 			    TRUE);
 }
 
+static void close_window(void)
+{
+  gtk_widget_destroy (window);
+  window = NULL;
+
+  g_object_unref (file_pixbuf);
+  file_pixbuf = NULL;
+
+  g_object_unref (folder_pixbuf);
+  folder_pixbuf = NULL;
+}
+
 GtkWidget *
 do_iconview (GtkWidget *do_widget)
 {
@@ -258,7 +270,7 @@ do_iconview (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");
 
       g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (close_window), NULL);
 
       error = NULL;
       if (!load_pixbufs (&error))
@@ -331,7 +343,7 @@ do_iconview (GtkWidget *do_widget)
 	  g_signal_connect (home_button, "clicked",
 			    G_CALLBACK (home_clicked), store);
 	  
-	  /* We now set which model columns that correspont to the text
+	  /* We now set which model columns that correspond to the text
 	   * and pixbuf of each item
 	   */
 	  gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);

demos/gtk-demo/iconview_edit.c

@@ -0,0 +1,159 @@
+/* Icon View/Editing and Drag-and-Drop
+ *
+ * The GtkIconView widget supports Editing and Drag-and-Drop.
+ * This example also demonstrates using the generic GtkCellLayout
+ * interface to set up cell renderers in an icon view.
+ */
+
+#include <gtk/gtk.h>
+#include <string.h>
+#include "demo-common.h"
+
+static GtkWidget *window = NULL;
+
+enum
+{
+  COL_TEXT,
+  NUM_COLS
+};
+
+
+static void
+fill_store (GtkListStore *store)
+{
+  GtkTreeIter iter;
+  const gchar *text[] = { "Red", "Green", "Blue", "Yellow" };
+  gint i;
+
+  /* First clear the store */
+  gtk_list_store_clear (store);
+
+  for (i = 0; i < 4; i++)
+    {
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter, COL_TEXT, text[i], -1);
+    }
+}
+
+static GtkListStore *
+create_store (void)
+{
+  GtkListStore *store;
+
+  store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING);
+
+  return store;
+}
+
+static void
+set_cell_color (GtkCellLayout   *cell_layout,
+		GtkCellRenderer *cell,
+		GtkTreeModel    *tree_model,
+		GtkTreeIter     *iter,
+		gpointer         data)
+{
+  gchar *text;
+  GdkColor color;
+  guint32 pixel = 0;
+  GdkPixbuf *pixbuf;
+
+  gtk_tree_model_get (tree_model, iter, COL_TEXT, &text, -1);
+  if (gdk_color_parse (text, &color))
+    pixel =
+      (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);
+  gdk_pixbuf_fill (pixbuf, pixel);
+
+  g_object_set (cell, "pixbuf", pixbuf, NULL);
+
+  g_object_unref (pixbuf);
+}
+
+static void
+edited (GtkCellRendererText *cell,
+	gchar               *path_string,
+	gchar               *text,
+	gpointer             data)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  GtkTreePath *path;
+
+  model = gtk_icon_view_get_model (GTK_ICON_VIEW (data));
+  path = gtk_tree_path_new_from_string (path_string);
+
+  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+		      COL_TEXT, text, -1);
+
+  gtk_tree_path_free (path);
+}
+
+GtkWidget *
+do_iconview_edit (GtkWidget *do_widget)
+{
+  if (!window)
+    {
+      GtkWidget *icon_view;
+      GtkListStore *store;
+      GtkCellRenderer *renderer;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
+
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (gtk_widget_destroyed), &window);
+
+      store = create_store ();
+      fill_store (store);
+
+      icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
+      g_object_unref (store);
+
+      gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
+					GTK_SELECTION_SINGLE);
+      gtk_icon_view_set_orientation (GTK_ICON_VIEW (icon_view),
+				     GTK_ORIENTATION_HORIZONTAL);
+      gtk_icon_view_set_columns (GTK_ICON_VIEW (icon_view), 2);
+      gtk_icon_view_set_reorderable (GTK_ICON_VIEW (icon_view), TRUE);
+
+      renderer = gtk_cell_renderer_pixbuf_new ();
+      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view),
+				  renderer, TRUE);
+      gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (icon_view),
+					  renderer,
+					  set_cell_color,
+					  NULL, NULL);
+
+      renderer = gtk_cell_renderer_text_new ();
+      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view),
+				  renderer, TRUE);
+      g_object_set (renderer, "editable", TRUE, NULL);
+      g_signal_connect (renderer, "edited", G_CALLBACK (edited), icon_view);
+      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view),
+				      renderer,
+				      "text", COL_TEXT,
+				      NULL);
+
+      gtk_container_add (GTK_CONTAINER (window), icon_view);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
+

demos/gtk-demo/images.c

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

demos/gtk-demo/main.c

@@ -19,7 +19,7 @@ enum {
   TITLE_COLUMN,
   FILENAME_COLUMN,
   FUNC_COLUMN,
-  ITALIC_COLUMN,
+  STYLE_COLUMN,
   NUM_COLUMNS
 };
 
@@ -94,15 +94,15 @@ window_closed_cb (GtkWidget *window, gpointer data)
 {
   CallbackData *cbdata = data;
   GtkTreeIter iter;
-  gboolean italic;
+  PangoStyle style;
 
   gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
   gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
-		      ITALIC_COLUMN, &italic,
+		      STYLE_COLUMN, &style,
 		      -1);
-  if (italic)
+  if (style == PANGO_STYLE_ITALIC)
     gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
-			ITALIC_COLUMN, !italic,
+			STYLE_COLUMN, PANGO_STYLE_NORMAL,
 			-1);
 
   gtk_tree_path_free (cbdata->path);
@@ -575,6 +575,8 @@ load_file (const gchar *filename)
 	}
     }
 
+  fclose (file);
+  
   fontify ();
 
   g_string_free (buffer, TRUE);
@@ -586,7 +588,7 @@ row_activated_cb (GtkTreeView       *tree_view,
 		  GtkTreeViewColumn *column)
 {
   GtkTreeIter iter;
-  gboolean italic;
+  PangoStyle style;
   GDoDemoFunc func;
   GtkWidget *window;
   GtkTreeModel *model;
@@ -597,14 +599,14 @@ row_activated_cb (GtkTreeView       *tree_view,
   gtk_tree_model_get (GTK_TREE_MODEL (model),
 		      &iter,
 		      FUNC_COLUMN, &func,
-		      ITALIC_COLUMN, &italic,
+		      STYLE_COLUMN, &style,
 		      -1);
 
   if (func)
     {
       gtk_tree_store_set (GTK_TREE_STORE (model),
 			  &iter,
-			  ITALIC_COLUMN, !italic,
+			  STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
 			  -1);
       window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
       
@@ -696,10 +698,11 @@ create_tree (void)
   GtkTreeViewColumn *column;
   GtkTreeStore *model;
   GtkTreeIter iter;
+  GtkWidget *box, *label, *scrolled_window;
 
   Demo *d = testgtk_demos;
 
-  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
+  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
   tree_view = gtk_tree_view_new ();
   gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
@@ -722,7 +725,7 @@ create_tree (void)
 			  TITLE_COLUMN, d->title,
 			  FILENAME_COLUMN, d->filename,
 			  FUNC_COLUMN, d->func,
-			  ITALIC_COLUMN, FALSE,
+			  STYLE_COLUMN, PANGO_STYLE_NORMAL,
 			  -1);
 
       d++;
@@ -741,7 +744,7 @@ create_tree (void)
 			      TITLE_COLUMN, children->title,
 			      FILENAME_COLUMN, children->filename,
 			      FUNC_COLUMN, children->func,
-			      ITALIC_COLUMN, FALSE,
+			      STYLE_COLUMN, PANGO_STYLE_NORMAL,
 			      -1);
 	  
 	  children++;
@@ -750,24 +753,40 @@ create_tree (void)
 
   cell = gtk_cell_renderer_text_new ();
 
-  g_object_set (cell,
-                "style", PANGO_STYLE_ITALIC,
-                NULL);
-  
   column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)",
 						     cell,
 						     "text", TITLE_COLUMN,
-						     "style_set", ITALIC_COLUMN,
+						     "style", STYLE_COLUMN,
 						     NULL);
   
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
 			       GTK_TREE_VIEW_COLUMN (column));
 
+  gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
+  gtk_tree_selection_select_iter (GTK_TREE_SELECTION (selection), &iter);
+
   g_signal_connect (selection, "changed", G_CALLBACK (selection_cb), model);
   g_signal_connect (tree_view, "row_activated", G_CALLBACK (row_activated_cb), model);
 
-  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
-  return tree_view;
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
+  				    
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+				  GTK_POLICY_NEVER,
+				  GTK_POLICY_AUTOMATIC);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+
+  label = gtk_label_new ("Widget (double click for demo)");
+
+  box = gtk_notebook_new ();
+  gtk_notebook_append_page (GTK_NOTEBOOK (box), scrolled_window, label);
+
+  gtk_widget_grab_focus (tree_view);
+
+   g_object_unref (model);
+
+  return box;
 }
 
 static void
@@ -850,7 +869,7 @@ main (int argc, char **argv)
   
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
-  g_signal_connect (window, "destroy",
+  g_signal_connect_after (window, "destroy",
 		    G_CALLBACK (gtk_main_quit), NULL);
 
   hbox = gtk_hbox_new (FALSE, 0);
@@ -866,16 +885,18 @@ main (int argc, char **argv)
 			    create_text (&info_buffer, FALSE),
 			    gtk_label_new_with_mnemonic ("_Info"));
 
+  tag = gtk_text_buffer_create_tag (info_buffer, "title",
+                                    "font", "Sans 18",
+                                    NULL);
+   g_object_unref (info_buffer);
+
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 			    create_text (&source_buffer, TRUE),
 			    gtk_label_new_with_mnemonic ("_Source"));
 
-  tag = gtk_text_buffer_create_tag (info_buffer, "title",
-                                    "font", "Sans 18",
-                                    NULL);
 
   tag = gtk_text_buffer_create_tag (source_buffer, "comment",
-				    "foreground", "red",
+				    "foreground", "DodgerBlue",
                                     NULL);
   tag = gtk_text_buffer_create_tag (source_buffer, "type",
 				    "foreground", "ForestGreen",
@@ -895,6 +916,7 @@ main (int argc, char **argv)
 				    "weight", PANGO_WEIGHT_BOLD,
  				    "foreground", "DarkGoldenrod4",
                                     NULL);
+   g_object_unref (source_buffer);
   
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);

demos/gtk-demo/menus.c

@@ -1,12 +1,12 @@
 /* Menus
  *
  * There are several widgets involved in displaying menus. The
- * GtkMenuBar widget is a horizontal menu bar, which normally appears
- * at the top of an application. The GtkMenu widget is the actual menu
- * that pops up. Both GtkMenuBar and GtkMenu are subclasses of
- * GtkMenuShell; a GtkMenuShell contains menu items
- * (GtkMenuItem). Each menu item contains text and/or images and can
- * be selected by the user.
+ * GtkMenuBar widget is a menu bar, which normally appears horizontally
+ * at the top of an application, but can also be layed out vertically. 
+ * The GtkMenu widget is the actual menu that pops up. Both GtkMenuBar 
+ * and GtkMenu are subclasses of GtkMenuShell; a GtkMenuShell contains 
+ * menu items (GtkMenuItem). Each menu item contains text and/or images 
+ * and can be selected by the user.
  *
  * There are several kinds of menu item, including plain GtkMenuItem,
  * GtkCheckMenuItem which can be checked/unchecked, GtkRadioMenuItem
@@ -70,10 +70,59 @@ create_menu (gint     depth,
   return menu;
 }
 
+static void
+change_orientation (GtkWidget *button,
+                    GtkWidget *menubar)
+{
+  GtkWidget *parent;
+  GtkWidget *box = NULL;
+
+  parent = gtk_widget_get_parent (menubar);
+
+  if (GTK_IS_VBOX (parent))
+    {
+      box = gtk_widget_get_parent (parent);
+
+      g_object_ref (menubar);
+      gtk_container_remove (GTK_CONTAINER (parent), menubar);
+      gtk_container_add (GTK_CONTAINER (box), menubar);
+      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
+      g_object_unref (menubar);
+      g_object_set (menubar, 
+		    "pack-direction", GTK_PACK_DIRECTION_TTB,
+		    NULL);
+    }
+  else
+    {
+      GList *children, *l;
+
+      children = gtk_container_get_children (GTK_CONTAINER (parent));
+      for (l = children; l; l = l->next)
+	{
+	  if (GTK_IS_VBOX (l->data))
+	    {
+	      box = l->data;
+	      break;
+	    }
+	}
+      g_list_free (children);
+
+      g_object_ref (menubar);
+      gtk_container_remove (GTK_CONTAINER (parent), menubar);
+      gtk_container_add (GTK_CONTAINER (box), menubar);
+      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
+      g_object_unref (menubar);
+      g_object_set (menubar, 
+		    "pack-direction", GTK_PACK_DIRECTION_LTR,
+		    NULL);
+    }
+}
+
 GtkWidget *
 do_menus (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
+  GtkWidget *box;
   GtkWidget *box1;
   GtkWidget *box2;
   GtkWidget *button;
@@ -99,9 +148,13 @@ do_menus (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "menus");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
       
-      
+            
+      box = gtk_hbox_new (FALSE, 0);
+      gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_widget_show (box);
+
       box1 = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_container_add (GTK_CONTAINER (box), box1);
       gtk_widget_show (box1);
       
       menubar = gtk_menu_bar_new ();
@@ -131,7 +184,13 @@ do_menus (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
       gtk_widget_show (box2);
 
-      button = gtk_button_new_with_label ("close");
+      button = gtk_button_new_with_label ("Flip");
+      g_signal_connect (button, "clicked",
+			G_CALLBACK (change_orientation), menubar);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+      gtk_widget_show (button);
+
+      button = gtk_button_new_with_label ("Close");
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK(gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);

demos/gtk-demo/panes.c

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

demos/gtk-demo/pickers.c

@@ -0,0 +1,73 @@
+/* Pickers 
+ *
+ * These widgets are mainly intended for use in preference dialogs.
+ * They allow to select colors, fonts, files and directories.
+ */
+
+#include <gtk/gtk.h>
+
+GtkWidget *
+do_pickers (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *table, *label, *picker;
+
+  if (!window)
+  {
+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
+    gtk_window_set_title (GTK_WINDOW (window), "Pickers");
+   
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed),
+                      &window);
+    
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+
+    table = gtk_table_new (4, 2, FALSE);    
+    gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+    gtk_container_add (GTK_CONTAINER (window), table);
+
+    gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+
+    label = gtk_label_new ("Color:");
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    picker = gtk_color_button_new ();
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 0, 1);
+
+    label = gtk_label_new ("Font:");
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    picker = gtk_font_button_new ();
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 1, 2);
+
+    label = gtk_label_new ("File:");
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    picker = gtk_file_chooser_button_new ("Pick a File", 
+                                          GTK_FILE_CHOOSER_ACTION_OPEN);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 2, 3);
+
+    label = gtk_label_new ("Folder:");
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    picker = gtk_file_chooser_button_new ("Pick a Folder", 
+                                          GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
+  }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show_all (window);
+    }
+  else
+    {    
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/pixbufs.c

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

demos/gtk-demo/printing.c

@@ -0,0 +1,187 @@
+/* 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;
+  gint text_width, text_height;
+  gdouble width;
+  gint line, i;
+  PangoFontDescription *desc;
+  gchar *page_str;
+
+  cr = gtk_print_context_get_cairo_context (context);
+  width = gtk_print_context_get_width (context);
+
+  cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT);
+  
+  cairo_set_source_rgb (cr, 0.8, 0.8, 0.8);
+  cairo_fill_preserve (cr);
+  
+  cairo_set_source_rgb (cr, 0, 0, 0);
+  cairo_set_line_width (cr, 1);
+  cairo_stroke (cr);
+
+  layout = gtk_print_context_create_pango_layout (context);
+
+  desc = pango_font_description_from_string ("sans 14");
+  pango_layout_set_font_description (layout, desc);
+  pango_font_description_free (desc);
+
+  pango_layout_set_text (layout, data->filename, -1);
+  pango_layout_get_pixel_size (layout, &text_width, &text_height);
+
+  if (text_width > width)
+    {
+      pango_layout_set_width (layout, width);
+      pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_START);
+      pango_layout_get_pixel_size (layout, &text_width, &text_height);
+    }
+
+  cairo_move_to (cr, (width - text_width) / 2,  (HEADER_HEIGHT - text_height) / 2);
+  pango_cairo_show_layout (cr, layout);
+
+  page_str = g_strdup_printf ("%d/%d", page_nr + 1, data->num_pages);
+  pango_layout_set_text (layout, page_str, -1);
+  g_free (page_str);
+
+  pango_layout_set_width (layout, -1);
+  pango_layout_get_pixel_size (layout, &text_width, &text_height);
+  cairo_move_to (cr, width - text_width - 4, (HEADER_HEIGHT - text_height) / 2);
+  pango_cairo_show_layout (cr, layout);
+  
+  g_object_unref (layout);
+  
+  layout = gtk_print_context_create_pango_layout (context);
+  
+  desc = pango_font_description_from_string ("mono");
+  pango_font_description_set_size (desc, data->font_size * PANGO_SCALE);
+  pango_layout_set_font_description (layout, desc);
+  pango_font_description_free (desc);
+  
+  cairo_move_to (cr, 0, HEADER_HEIGHT + HEADER_GAP);
+  line = page_nr * data->lines_per_page;
+  for (i = 0; i < data->lines_per_page && line < data->num_lines; i++) 
+    {
+      pango_layout_set_text (layout, data->lines[line], -1);
+      pango_cairo_show_layout (cr, layout);
+      cairo_rel_move_to (cr, 0, data->font_size);
+      line++;
+    }
+
+  g_object_unref (layout);
+}
+
+static void
+end_print (GtkPrintOperation *operation, 
+	   GtkPrintContext   *context,
+	   gpointer           user_data)
+{
+  PrintData *data = (PrintData *)user_data;
+
+  g_free (data->filename);
+  g_strfreev (data->lines);
+  g_free (data);
+}
+
+
+GtkWidget *
+do_printing (GtkWidget *do_widget)
+{
+  GtkPrintOperation *operation;
+  PrintData *data;
+  GError *error = NULL;
+
+  operation = gtk_print_operation_new ();
+  data = g_new0 (PrintData, 1);
+  data->filename = demo_find_file ("printing.c", NULL);
+  data->font_size = 12.0;
+
+  g_signal_connect (G_OBJECT (operation), "begin-print", 
+		    G_CALLBACK (begin_print), data);
+  g_signal_connect (G_OBJECT (operation), "draw-page", 
+		    G_CALLBACK (draw_page), data);
+  g_signal_connect (G_OBJECT (operation), "end-print", 
+		    G_CALLBACK (end_print), data);
+
+  gtk_print_operation_run (operation, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (do_widget), &error);
+
+  g_object_unref (operation);
+
+  if (error)
+    {
+      GtkWidget *dialog;
+      
+      dialog = gtk_message_dialog_new (GTK_WINDOW (do_widget),
+				       GTK_DIALOG_DESTROY_WITH_PARENT,
+				       GTK_MESSAGE_ERROR,
+				       GTK_BUTTONS_CLOSE,
+				       "%s", error->message);
+      g_error_free (error);
+      
+      g_signal_connect (dialog, "response",
+			G_CALLBACK (gtk_widget_destroy), NULL);
+      
+      gtk_widget_show (dialog);      
+    }
+  
+
+  return NULL;
+}

demos/gtk-demo/textscroll.c

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

demos/gtk-demo/textview.c

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

demos/gtk-demo/ui_manager.c

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

demos/pixbuf-demo.c

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

demos/testanimation.c

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

demos/testpixbuf-drawable.c

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

demos/testpixbuf.c

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

docs/README.linux-fb

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

docs/developers.txt

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

docs/dnd_internals.txt

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

docs/faq/gtk-faq.sgml

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

docs/focus_tracking.txt

@@ -0,0 +1,161 @@
+Notational conventions
+======================
+
+We have a window W that we are tracking events on. Focus
+can be on the following classes of objects
+
+  None        : defined by X protocol
+  PointerRoot : defined by X protocol
+  W           : the window itself
+  Ancestor    : An ancestor of W, including W's root window
+  Descendant  : A descendant of W
+  Other:      : A window that is neither an ancestor or
+                descendant of W
+
+has_pointer(W): the pointer is in W or one of its descendants.
+
+NotifyPointer events
+====================
+
+X sends FocusIn or FocusOut events to W with a detail of NotifyPointer
+in the following transitions, when the pointer is inside W
+
+ Other => Ancestor: FocusIn
+ Ancestor => {Other,None}: FocusOut
+ Ancestor => PointerRoot: FocusOut, then FocusIn
+ {None,W,Descendant,Other} => PointerRoot: FocusIn
+ PointerRoot => Ancestor: FocusOut, then FocusIn
+ PointerRoot => {None,W,Descendant,Other} => FocusOut
+
+[ Ignoring keyboard grabs for the moment ]
+
+Basic focus tracking algorithm
+==============================
+
+Keystroke events are delivered within W if and only if one of two
+predicates hold:
+
+ has_focus_window(W): F==W || F==Descendant
+ has_pointer_focus(W): (F==Ancestor || F==PointerRoot) && has_pointer(W)
+
+These two conditions are mutually exclusive.
+
+has_focus_window(W) is easy to track.
+
+ FocusIn: detail != NotifyInferior: Set has_focus_iwndow
+ FocusOut: detail != NotifyInferior: Clear has_focus_iwndow
+
+has_pointer_focus(W) is harder to track.
+
+We can separate out the transitions from !has_pointer_focus(W) to
+has_pointer_focus(W) into four cases:
+
+ T1: [(F==W || F==Descendant) => F==Ancestor]; has_pointer(W)
+
+ T2: [(F==W || F==Descendant) => F==PointerRoot]; has_pointer(W)
+ 
+ T3: [(F==None || F==Other) => (F==PointerRoot || F==Ancestor)];
+   has_pointer(W)
+
+ T4: [!has_pointer(W) => has_pointer(W)]; (F==Ancestor || F==PointerRoot)
+
+All of these can be tracked by watching events on W.
+
+T1:, we get a FocusOut with a mode of Ancestor or Virtual
+  We need to separately track has_pointer(W) to distinguish
+  this from the case where we get these events and !has_pointer(W)
+
+T2, T3: together these are exactly the cases where we get 
+  FocusIn/NotifyPointer.
+
+For T4, we get an EnterNotify with the focus flag set. An
+  EnterNotify with a focus flag set will also be sent if 
+  F==W, so we have to to explicitly test for that case
+  using has_focus_window(W)
+
+
+The transitions from has_pointer_focus(W) to !has_pointer_focus(W)
+are exactly the opposite
+
+ F1: [(F==W || F==Descendant) <= F==Ancestor]; has_pointer(W)
+
+ F2: [(F==W || F==Descendant) <= F==PointerRoot]; has_pointer(W)
+ 
+ F3: [(F==None || F==Other) <= (F==PointerRoot || F==Ancestor)];
+   has_pointer(W)
+
+ F4: [!has_pointer(W) <= has_pointer(W)]; (F==Ancestor || F==PointerRoot)
+
+And can be tracked in the same ways:
+
+F1: we get a FocusIn with a mode of Ancestor or Virtual
+  We need to separately track has_pointer(W) to distinguish
+  this from the case we get these events and !has_pointer(W)
+
+F2, F3: together these are exactly the cases where we get 
+  FocusOut/NotifyPointer.
+
+F4: we get an LeaveNotify with the focus flag set. An
+  LeaveNotify with a focus flag set will also be sent if 
+  F==W, so we have to to explicitly test for that case
+  using has_focus_window(W).
+
+
+Modifications for keyboard grabs
+================================
+
+The above algorithm ignores keyboard grabs, which also 
+generate focus events, and needs to be modified somewhat
+to take keyboard grabs into effect. The basic idea 
+is that for has_pointer_focus(W)/has_window_focus(W) we track
+them ignoring grabs and ungrabs, and then supplement
+that with another predicate has_focus(W) which pays
+attention to grabs and ungrabs.
+
+Modification 1:
+   
+ When tracking has_pointer_focus(W), ignore all Focus
+ events with a mode of NotifyGrab or NotifyUngrab.
+
+ Note that this means that with grabs, we don't perfectly.
+ track the delivery of keyboard events ... since we think
+ we are getting events in the case where
+
+  has_pointer_focus(W) && !(G == None || G==W || G==descendant)
+
+ But the X protocol doesn't provide sufficient information
+ to do this right... example:
+
+   F=Ancestor, G=None   =>   F=Ancestor, G=Ancestor
+
+ We stop getting events, but receive no notification.
+	
+ The case of no window manager and keyboard grabs is pretty
+ rare in any case.
+
+Modification 2:
+   
+ When tracking has_focus_window(W), ignore all Focus
+ events with a mode of NotifyGrab or NotifyUngrab.
+
+Modification 3: instead of calculating focus as 
+  
+    has_focus_window(W) || has_pointer_focus(W)
+
+  Calculate it as 
+
+    has_focus(W) || has_pointer_focus(W)
+
+  where has_focus(W) is defined as:
+
+   has_focus(W): F==W || F==Descendant || G=W
+
+  Tracking has_focus(W) is done by 
+
+ FocusIn: detail != NotifyInferior, mode != NotifyWhileGrabbed: 
+    set has_focus
+ FocusOut: detail != NotifyInferior, mode != NotifyWhileGrabbed: 
+    clear has_focus
+
+ We still need to track has_focus_window(W) for the T4/F4 
+ transitions.

docs/generation.txt

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

docs/gtk-config.txt

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

docs/iconcache.txt

@@ -0,0 +1,163 @@
+Information about the icon theme cache format used by GTK+
+for more information, see the mailing list threads at 
+
+http://mail.gnome.org/archives/gtk-devel-list/2004-April/msg00065.html
+http://lists.freedesktop.org/archives/xdg/2004-October/005140.html
+
+
+Back in May, Owen Taylor proposed [1] caching scheme for icon theme
+information, to reduce the amount of stating and disk seeking at
+application startup, and to reduce the memory overhead if each app
+allocates all the icon theme data separately.
+
+The proposal is to keep the information about the icons in the 
+directory tree below each icon theme directory in an mmap()able 
+cache file (There is basically one cache file per index.theme file). 
+
+The cache doesn't try to hold all information from the index.theme files
+that you would need to do lookups; it turns out that with the icon theme
+specification, this isn't even sensible - you can install a 
+
+ $HOME/.local/share/icons/Bluecurve/index.theme
+
+That overrides
+
+ /usr/share/icons/Bluecurve/index.theme
+
+and chances how lookup happens for icons in /usr/share/icons/Bluecurve.
+
+We would like to propose the cache file format as an appendix to the
+icon theme specification. One thing which still needs to be investigated
+is caching of the actual image data; the file format is has an
+IMAGE_DATA_OFFSET member to allow adding that compatibly. An
+implementation of the caching scheme for GTK+ can be found at [2]. The
+cache generator which is included in the patch depends only on glib, and
+it may be a good idea to move it to freedesktop.org as well. 
+
+
+Regards, Matthias Clasen
+
+
+The cache file format:
+
+Header:
+2			CARD16		MAJOR_VERSION	1	
+2			CARD16		MINOR_VERSION	0	
+4			CARD32		HASH_OFFSET		
+4			CARD32		DIRECTORY_LIST_OFFSET
+
+DirectoryList:
+4			CARD32		N_DIRECTORIES		
+4*N_DIRECTORIES		CARD32		DIRECTORY_OFFSET	
+
+Hash:
+4			CARD32		N_BUCKETS		
+4*N_BUCKETS		CARD32		ICON_OFFSET	
+
+Icon:
+4			CARD32		CHAIN_OFFSET		
+4			CARD32		NAME_OFFSET		
+4			CARD32		IMAGE_LIST_OFFSET	
+
+ImageList:
+4			CARD32		N_IMAGES		
+8*N_IMAGES		Image		IMAGES			
+
+Image:
+2			CARD16		DIRECTORY_INDEX	
+2			ICON_FLAGS	FLAGS			
+4			CARD32		IMAGE_DATA_OFFSET	
+
+ICON_FLAGS
+HAS_SUFFIX_PNG	1
+HAS_SUFFIX_XPM	2
+HAS_SUFFIX_SVG	4
+HAS_ICON_FILE	8
+
+ImageData:
+4			CARD32		IMAGE_PIXEL_DATA_OFFSET
+4			CARD32		IMAGE_META_DATA_OFFSET
+
+4			CARD32		IMAGE_PIXEL_DATA_TYPE
+4			CARD32		IMAGE_PIXEL_DATA_LENGTH
+N/A			N/A		PIXEL_DATA
+
+IMAGE_PIXEL_DATA_TYPE
+0 GdkPixdata format
+
+MetaData:
+4			CARD32		EMBEDDED_RECT_OFFSET
+4			CARD32		ATTACH_POINT_LIST_OFFSET
+4			CARD32		DISPLAY_NAME_LIST_OFFSET
+
+EmbeddedRect:
+2			CARD16		X0
+2			CARD16		Y0
+2			CARD16		X1
+2			CARD16		Y1
+
+AttachPointList:
+4			CARD32		N_ATTACH_POINTS
+4*N_ATTACH_POINTS	AttachPoint
+
+AttachPoint:
+2			CARD16		X
+2			CARD16		Y
+
+DisplayNameList:
+4			CARD32		N_DISPLAY_NAMES
+4*N_DISPLAY_NAMES	DisplayName
+
+DisplayName:
+4			CARD32		DISPLAY_LANG_OFFSET
+4			CARD32		DISPLAY_NAME_OFFSET
+		
+
+Notes:
+
+* All offsets are from in bytes from the beginning of the file
+
+* Strings are zero-terminated
+
+* Directories are stored as relative paths.
+
+* All numbers are in network (big-endian) order. This is
+  necessary because the data will be stored in arch-independent
+  directories like /usr/share/icons or even in user's 
+  home directories.
+
+* The hash function is that used by g_str_hash()
+
+  unsigned int
+  icon_str_hash (gconstpointer key)
+  {
+    const char *p = key;
+    unsigned int h = *p;
+
+    if (h)
+      for (p += 1; *p != '\0'; p++)
+        h = (h << 5) - h + *p;
+
+    return h;
+  }
+
+ This should not be implemented by calling g_str_hash(). For
+ optimal results, N_BUCKETS should be typically be prime.
+
+* The same file format is used for icon themes (e.g.,
+  /usr/share/icons/Bluecurve) and for unthemed icon directories
+  (e.g., /usr/share/pixmaps)
+
+  For an unthemed directory, N_DIRECTORIES==0 and each
+  image has a DIRECTORY_INDEX field of 0xFFFF.
+
+* Up-to-dateness of a cache file is determined simply:
+
+    If the mod-time on the directory where the cache file
+    lives is newer than the mod-time of the cache file,
+    the cache file is out of date.
+
+* Cache files have to be written atomically - write to a
+  temporary name, then move over the old file - so that
+  clients that have the old cache file open and mmap'ed
+  won't get corrupt data.

docs/refcounting.txt

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

docs/reference/gdk-pixbuf/Makefile.am

@@ -28,6 +28,7 @@ IGNORE_HFILES=				\
 	gdk-pixbuf-private.h		\
 	io-gif-animation.h		\
 	io-ani-animation.h		\
+	xpm-color-table.h		\
 	test-images.h
 
 INCLUDES = 			\
@@ -61,7 +62,9 @@ content_files =				\
 HTML_IMAGES = composite.png
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
+FIXXREF_OPTIONS= --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
+
 
 include $(top_srcdir)/gtk-doc.make
 

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

@@ -89,6 +89,7 @@ gdk_pixbuf_copy
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk-pixbuf/gdk-pixdata.h</INCLUDE>
 <FILE>inline</FILE>
 GdkPixdata
 GdkPixdataType
@@ -107,6 +108,7 @@ gdk_pixdata_to_csource
 gdk_pixbuf_add_alpha
 gdk_pixbuf_copy_area
 gdk_pixbuf_saturate_and_pixelate
+gdk_pixbuf_apply_embedded_orientation
 gdk_pixbuf_fill
 </SECTION>
 
@@ -127,6 +129,11 @@ gdk_pixbuf_animation_iter_get_delay_time
 gdk_pixbuf_animation_iter_on_currently_loading_frame
 gdk_pixbuf_animation_iter_get_pixbuf
 
+<SUBSECTION>
+GdkPixbufSimpleAnim
+gdk_pixbuf_simple_anim_new
+gdk_pixbuf_simple_anim_add_frame
+
 <SUBSECTION Standard>
 GDK_PIXBUF_ANIMATION
 GDK_TYPE_PIXBUF_ANIMATION
@@ -135,11 +142,27 @@ GDK_IS_PIXBUF_ANIMATION_ITER
 GDK_PIXBUF_ANIMATION_ITER
 GDK_TYPE_PIXBUF_ANIMATION_ITER
 
+GDK_PIXBUF_SIMPLE_ANIM_GET_CLASS
+GDK_IS_PIXBUF_SIMPLE_ANIM
+GDK_PIXBUF_SIMPLE_ANIM_CLASS
+GDK_IS_PIXBUF_SIMPLE_ANIM_CLASS
+GDK_TYPE_PIXBUF_SIMPLE_ANIM
+GDK_PIXBUF_SIMPLE_ANIM
+GDK_TYPE_PIXBUF_SCALED_ANIM
+GDK_TYPE_PIXBUF_SCALED_ANIM_ITER
 <SUBSECTION Private>
 gdk_pixbuf_non_anim_new
 
 gdk_pixbuf_animation_get_type
 gdk_pixbuf_animation_iter_get_type
+
+gdk_pixbuf_simple_anim_get_type
+gdk_pixbuf_simple_anim_iter_get_type
+GdkPixbufSimpleAnimClass
+gdk_pixbuf_scaled_anim_get_type
+gdk_pixbuf_scaled_anim_iter_get_type
+GdkPixbufScaledAnimClass
+GdkPixbufScaledAnim
 </SECTION>
 
 <SECTION>
@@ -250,6 +273,7 @@ XlibRgbCmap
 XlibRgbDither
 xlib_rgb_init
 xlib_rgb_init_with_depth
+xlib_rgb_xpixel_from_rgb
 xlib_rgb_gc_set_foreground
 xlib_rgb_gc_set_background
 xlib_draw_rgb_image

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

@@ -145,6 +145,9 @@
   <index role="2.6">
     <title>Index of new symbols in 2.6</title>
   </index>  
+  <index role="2.8">
+    <title>Index of new symbols in 2.8</title>
+  </index>  
 
   &Porting-From-Imlib;
 

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

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

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

@@ -20,16 +20,19 @@ Animated images.
     #GdkPixbufLoader
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
-  <para>
-    This object describes an animation.
-  </para>
+<para>
+And opaque struct representing an animation.
+</para>
 
 
 <!-- ##### STRUCT GdkPixbufAnimationIter ##### -->
 <para>
-A #GdkPixbufAnimationIter provides the necessary functionality to
-display an animation. See gdk_pixbuf_animation_get_iter().
+And opaque struct representing an iterator which points to a
+certain position in an animation.
 </para>
 
 
@@ -143,3 +146,29 @@ display an animation. See gdk_pixbuf_animation_get_iter().
 @Returns: 
 
 
+<!-- ##### STRUCT GdkPixbufSimpleAnim ##### -->
+<para>
+An
+</para>
+
+
+<!-- ##### FUNCTION gdk_pixbuf_simple_anim_new ##### -->
+<para>
+
+</para>
+
+@width: 
+@height: 
+@rate: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_simple_anim_add_frame ##### -->
+<para>
+
+</para>
+
+@animation: 
+@pixbuf: 
+
+

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

@@ -43,6 +43,9 @@ Creating a pixbuf from image data that is already in memory.
     gdk_pixbuf_finalize().
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new ##### -->
 <para>
 
@@ -92,9 +95,6 @@ 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

@@ -25,6 +25,9 @@ Loading a pixbuf from a file.
     #GdkPixbufLoader.
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
 <para>
 
@@ -63,8 +66,6 @@ End:
 @preserve_aspect_ratio: 
 @error: 
 @Returns: 
-<!-- # Unused Parameters # -->
-@keep_aspect_ratio: 
 
 
 <!-- ##### FUNCTION gdk_pixbuf_get_file_info ##### -->

docs/reference/gdk-pixbuf/tmpl/file-saving.sgml

@@ -6,7 +6,11 @@ Saving a pixbuf to a file.
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+These functions allow to save a #GdkPixbuf in a number of 
+file formats. The formatted data can be written to a file
+or to a memory buffer. &gdk-pixbuf; can also call a user-defined
+callback on the data, which allows to e.g. write the image 
+to a socket or store it in a database.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -14,6 +18,9 @@ Saving a pixbuf to a file.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
 <para>
 

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

@@ -69,6 +69,9 @@ Application-driven progressive image loading.
     gdk_pixbuf_new_from_file(), gdk_pixbuf_animation_new_from_file()
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufLoader ##### -->
 <para>
 The <structname>GdkPixbufLoader</structname> struct contains only private

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml

@@ -23,6 +23,9 @@ Getting parts of an X drawable's image data into a pixbuf.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_get_from_drawable ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml

@@ -20,6 +20,9 @@ Initializing the &gdk-pixbuf; Xlib library.
     XlibRGB
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_init ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml

@@ -21,6 +21,9 @@ Rendering a pixbuf to an X drawable.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_render_threshold_alpha ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml

@@ -17,6 +17,9 @@ Rendering RGB buffers to X drawables.
     GdkRGB
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT XlibRgbCmap ##### -->
   <para>
     FIXME: Describe this.
@@ -62,6 +65,15 @@ displays.
 @prefDepth: 
 
 
+<!-- ##### FUNCTION xlib_rgb_xpixel_from_rgb ##### -->
+<para>
+
+</para>
+
+@rgb: 
+@Returns: 
+
+
 <!-- ##### FUNCTION xlib_rgb_gc_set_foreground ##### -->
 <para>
 

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

@@ -90,6 +90,9 @@ put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blu
   <para>
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM GdkPixbufError ##### -->
 <para>
 An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;

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

@@ -16,6 +16,9 @@ you're linking against.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### VARIABLE gdk_pixbuf_version ##### -->
 <para>
 Contains the full version of the &gdk-pixbuf; library as a string.

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

@@ -5,15 +5,23 @@ Inline data
 Functions for inlined pixbuf handling.
 
 <!-- ##### SECTION Long_Description ##### -->
-  <para>
-
-  </para>
+<para>
+Using #GdkPixdata, images can be compiled into an application,
+making it unnecessary to refer to external image files at runtime.
+&gdk-pixbuf; includes a utility named gdk-pixbuf-csource, which 
+can be used to convert image files into #GdkPixdata structures suitable
+for inclusion in C sources. To convert the #GdkPixdata structures back 
+into #GdkPixbuf<!-- -->s, use gdk_pixbuf_from_pixdata.
+</para>
 
 <!-- ##### SECTION See_Also ##### -->
   <para>
 
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixdata ##### -->
   <para>
 

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

@@ -65,6 +65,9 @@ They are not covered by the same stability guarantees as the regular
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_set_option ##### -->
 <para>
 
@@ -201,14 +204,19 @@ operations.
 <!-- ##### STRUCT GdkPixbufModulePattern ##### -->
 <para>
 The signature of a module is a set of prefixes. Prefixes are encoded as
-pairs of ordinary strings, where the second string, if not %NULL, must be
-of the same length as the first one and may contain ' ', '!', 'x', 'z', 
-and 'n' to indicate bytes that must be matched, not matched, 
-"don't-care"-bytes, zeros and non-zeros.
+pairs of ordinary strings, where the second string, called the mask, if 
+not %NULL, must be of the same length as the first one and may contain 
+' ', '!', 'x', 'z', and 'n' to indicate bytes that must be matched, 
+not matched, "don't-care"-bytes, zeros and non-zeros. 
 Each prefix has an associated integer that describes the relevance of 
 the prefix, with 0 meaning a mismatch and 100 a "perfect match".
 </para>
-
+<para>
+Starting with &gdk-pixbuf; 2.8, the first byte of the mask may be '*', 
+indicating an unanchored pattern that matches not only at the beginning, 
+but also in the middle. Versions prior to 2.8 will interpret the '*'
+like an 'x'. 
+</para>
 <para>
 The signature of a module is stored as an array of 
 #GdkPixbufModulePattern<!-- -->s. The array is terminated by a pattern
@@ -337,7 +345,7 @@ is loaded and must set the function pointers of the #GdkPixbufModule.
 @load_increment: continues an incremental load.
 @load_animation: loads an animation from a file.
 @save: saves a #GdkPixbuf to a file.
-@save_to_callback: 
+@save_to_callback: saves a #GdkPixbuf by calling the given #GdkPixbufSaveFunc.
 
 <!-- ##### STRUCT GdkPixbufAnimationClass ##### -->
 <para>
@@ -346,7 +354,7 @@ Modules supporting animations must derive a type from
 virtual functions.
 </para>
 
-@parent_class: 
+@parent_class: the 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.
@@ -359,7 +367,7 @@ Modules supporting animations must derive a type from
 virtual functions.
 </para>
 
-@parent_class: 
+@parent_class: the 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-pixbuf/tmpl/refcounting.sgml

@@ -45,6 +45,9 @@ Functions for reference counting and memory management on pixbufs.
     #GdkPixbuf, gdk_pixbuf_new_from_data().
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
   <para>
 

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

@@ -23,6 +23,15 @@ Scaling pixbufs and scaling and compositing pixbufs
     new pixbuf.
   </para>
 
+  <para>
+   Scaling and compositing functions take advantage of MMX hardware
+   acceleration on systems where MMX is supported.  If gdk-pixbuf is built
+   with the Sun mediaLib library, these functions are instead accelerated
+   using mediaLib, which provides hardware acceleration on Intel, AMD,
+   and Sparc chipsets.  If desired, mediaLib support can be turned off by
+   setting the GDK_DISABLE_MEDIALIB environment variable.  
+  </para>
+
   <para>
     The following example demonstrates handling an expose event by
     rendering the appropriate area of a source image (which is scaled
@@ -42,8 +51,6 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
   GdkPixbuf *dest;
 
-  gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
-  
   dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);
 
   gdk_pixbuf_composite_color (pixbuf, dest,
@@ -54,10 +61,10 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
                               GDK_INTERP_BILINEAR, 255,
                               event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
 
-  gdk_pixbuf_render_to_drawable (dest, widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
-                                 0, 0, event->area.x, event->area.y,
-                                 event->area.width, event->area.height,
-                                 GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
+  gdk_draw_pixbuf (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL], dest,
+                   0, 0, event->area.x, event->area.y,
+                   event->area.width, event->area.height,
+                   GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
   
   gdk_pixbuf_unref (dest);
   
@@ -71,6 +78,9 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
     <link linkend="gdk-GdkRGB">GdkRGB</link>.
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM GdkInterpType ##### -->
   <para>
     This enumeration describes the different interpolation modes that

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

@@ -17,6 +17,9 @@ Utility and miscellaneous convenience functions.
     #GdkPixbuf
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_add_alpha ##### -->
 <para>
 
@@ -61,6 +64,15 @@ End:
 @pixelate: 
 
 
+<!-- ##### FUNCTION gdk_pixbuf_apply_embedded_orientation ##### -->
+<para>
+
+</para>
+
+@src: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_pixbuf_fill ##### -->
 <para>
 

docs/reference/gdk/Makefile.am

@@ -28,10 +28,13 @@ IGNORE_HFILES=			\
 	gdkprivate.h		\
 	gdkpoly-generic.h	\
 	gdkregion-generic.h	\
+	keyname-table.h		\
 	linux-fb 		\
 	nanox 			\
 	win32 			\
-	x11
+	directfb		\
+	x11			\
+	quartz
 
 # Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=			\
@@ -140,7 +143,11 @@ HTML_IMAGES =				\
 	images/xterm.png 
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
+
 
 include $(top_srcdir)/gtk-doc.make
 

docs/reference/gdk/gdk-docs.sgml

@@ -15,6 +15,7 @@
 <!ENTITY gdk-Selections SYSTEM "xml/selections.xml">
 <!ENTITY gdk-Properties-and-Atoms SYSTEM "xml/properties.xml">
 <!ENTITY gdk-Pango-Interaction SYSTEM "xml/pango_interaction.xml">
+<!ENTITY gdk-Cairo-Interaction SYSTEM "xml/cairo_interaction.xml">
 <!ENTITY gdk-Points-Rectangles-and-Regions SYSTEM "xml/regions.xml">
 <!ENTITY gdk-Threads SYSTEM "xml/threads.xml">
 <!ENTITY gdk-Keys SYSTEM "xml/keys.xml">
@@ -81,7 +82,7 @@
     &gdk-Input-Devices;
 
     &gdk-Pango-Interaction;
-
+    &gdk-Cairo-Interaction;
     &gdk-X-Window-System-Interaction;
   </reference>
 
@@ -100,8 +101,14 @@
   <index role="2.6">
     <title>Index of new symbols in 2.6</title>
   </index>  
-  <index role="2.6">
+  <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>  
+  <index role="2.12">
+    <title>Index of new symbols in 2.12</title>
+  </index>  
 
 </book>

docs/reference/gdk/gdk-overrides.txt

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

docs/reference/gdk/gdk-sections.txt

@@ -12,6 +12,7 @@ gdk_set_locale
 gdk_set_sm_client_id
 gdk_exit
 gdk_notify_startup_complete
+gdk_notify_startup_complete_with_id
 
 <SUBSECTION>
 gdk_get_program_class
@@ -54,7 +55,6 @@ gdk_error_trap_pop
 <SUBSECTION>
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
-GDK_WINDOWING_FB
 
 <SUBSECTION Standard>
 GDK_TYPE_GRAB_STATUS
@@ -152,6 +152,9 @@ 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
+gdk_display_supports_composite
 <SUBSECTION Standard>
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
@@ -197,6 +200,9 @@ gdk_screen_get_system_colormap
 gdk_screen_get_system_visual
 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
@@ -213,6 +219,12 @@ 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
@@ -374,6 +386,7 @@ gdk_color_alloc
 gdk_color_change
 gdk_color_equal
 gdk_color_hash
+gdk_color_to_string
 
 <SUBSECTION Standard>
 GDK_COLORMAP
@@ -496,7 +509,6 @@ GDK_IS_DRAWABLE_CLASS
 <SUBSECTION Private>
 GdkDrawableClass
 gdk_draw_bitmap
-gdk_draw_rectangle_alpha_libgtk_only
 </SECTION>
 
 <SECTION>
@@ -638,10 +650,13 @@ gdk_window_fullscreen
 gdk_window_unfullscreen
 gdk_window_set_keep_above
 gdk_window_set_keep_below
+gdk_window_set_opacity
+gdk_window_set_composited
 gdk_window_move
 gdk_window_resize
 gdk_window_move_resize
 gdk_window_scroll
+gdk_window_move_region
 gdk_window_reparent
 gdk_window_clear
 gdk_window_clear_area
@@ -654,6 +669,7 @@ gdk_window_register_dnd
 gdk_window_begin_resize_drag
 gdk_window_begin_move_drag
 gdk_window_constrain_size
+gdk_window_beep
 
 <SUBSECTION>
 gdk_window_begin_paint_rect
@@ -688,6 +704,10 @@ 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
@@ -702,8 +722,10 @@ 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
 gdk_window_get_position
 gdk_window_get_root_origin
 gdk_window_get_frame_extents
@@ -725,6 +747,7 @@ gdk_window_set_icon
 gdk_window_set_icon_name
 gdk_window_set_transient_for
 gdk_window_set_role
+gdk_window_set_startup_id
 gdk_window_set_group
 gdk_window_get_group
 gdk_window_set_decorations
@@ -818,6 +841,7 @@ 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
@@ -843,7 +867,9 @@ gdk_pango_context_get
 gdk_pango_context_get_for_screen
 gdk_pango_context_set_colormap
 GdkPangoAttrEmbossed
+GdkPangoAttrEmbossColor
 GdkPangoAttrStipple
+gdk_pango_attr_emboss_color_new
 gdk_pango_attr_embossed_new
 gdk_pango_attr_stipple_new
 gdk_pango_layout_get_clip_region
@@ -861,6 +887,17 @@ gdk_pango_renderer_get_type
 GdkPangoRendererPrivate
 </SECTION>
 
+<SECTION>
+<TITLE>Cairo Interaction</TITLE>
+<FILE>cairo_interaction</FILE>
+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>
+
 <SECTION>
 <TITLE>Points, Rectangles and Regions</TITLE>
 <FILE>regions</FILE>
@@ -921,6 +958,10 @@ gdk_threads_enter
 gdk_threads_leave
 gdk_threads_mutex
 gdk_threads_set_lock_functions
+gdk_threads_add_idle
+gdk_threads_add_idle_full
+gdk_threads_add_timeout
+gdk_threads_add_timeout_full
 
 <SUBSECTION Private>
 gdk_threads_lock
@@ -939,6 +980,7 @@ gdk_keymap_translate_keyboard_state
 gdk_keymap_get_entries_for_keyval
 gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_direction
+gdk_keymap_have_bidi_layouts
 
 <SUBSECTION>
 gdk_keyval_name
@@ -1037,6 +1079,7 @@ gdk_event_get_state
 gdk_event_get_axis
 gdk_event_get_coords
 gdk_event_get_root_coords
+gdk_event_request_motions
 
 <SUBSECTION>
 gdk_event_handler_set
@@ -1088,6 +1131,7 @@ GdkEventNoExpose
 GdkEventWindowState
 GdkEventSetting
 GdkEventOwnerChange
+GdkEventGrabBroken
 
 <SUBSECTION>
 GdkScrollDirection
@@ -1123,8 +1167,10 @@ GdkCursorType
 gdk_cursor_new
 gdk_cursor_new_from_pixmap
 gdk_cursor_new_from_pixbuf
+gdk_cursor_new_from_name
 gdk_cursor_new_for_display
 gdk_cursor_get_display
+gdk_cursor_get_image
 gdk_cursor_ref
 gdk_cursor_unref
 gdk_cursor_destroy
@@ -1223,6 +1269,7 @@ 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
@@ -1240,15 +1287,19 @@ gdk_x11_screen_supports_net_wm_hint
 gdk_x11_screen_get_window_manager_name
 gdk_x11_screen_lookup_visual
 gdk_x11_window_set_user_time
+gdk_x11_window_move_to_current_desktop
 gdk_x11_display_get_user_time
 gdk_x11_colormap_foreign_new
 gdk_x11_colormap_get_xcolormap
 gdk_x11_colormap_get_xdisplay
 gdk_x11_cursor_get_xcursor
 gdk_x11_cursor_get_xdisplay
+gdk_x11_display_broadcast_startup_message
+gdk_x11_display_get_startup_notification_id
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab
+gdk_x11_display_set_cursor_theme
 gdk_x11_register_standard_event_type
 gdk_x11_drawable_get_xdisplay
 gdk_x11_drawable_get_xid

docs/reference/gdk/tmpl/cairo_interaction.sgml

@@ -0,0 +1,87 @@
+<!-- ##### SECTION Title ##### -->
+Cairo Interaction
+
+<!-- ##### SECTION Short_Description ##### -->
+Functions to support using Cairo
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+<link href="http://cairographics.org">Cairo</link> is a graphics 
+library that supports vector graphics and image compositing that
+can be used with GDK. Since 2.8, GTK+ does most of its drawing
+using Cairo. 
+</para>
+
+<para>
+GDK does not wrap the Cairo API, instead it allows to create Cairo 
+contexts which can be used to draw on GDK drawables. Additional
+functions allow to convert GDK's rectangles and regions into
+Cairo paths and to use pixbufs as sources for drawing operations.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### FUNCTION gdk_cairo_create ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_cairo_set_source_color ##### -->
+<para>
+
+</para>
+
+@cr: 
+@color: 
+
+
+<!-- ##### FUNCTION gdk_cairo_set_source_pixbuf ##### -->
+<para>
+
+</para>
+
+@cr: 
+@pixbuf: 
+@pixbuf_x: 
+@pixbuf_y: 
+
+
+<!-- ##### FUNCTION gdk_cairo_set_source_pixmap ##### -->
+<para>
+
+</para>
+
+@cr: 
+@pixmap: 
+@pixmap_x: 
+@pixmap_y: 
+
+
+<!-- ##### FUNCTION gdk_cairo_rectangle ##### -->
+<para>
+
+</para>
+
+@cr: 
+@rectangle: 
+
+
+<!-- ##### FUNCTION gdk_cairo_region ##### -->
+<para>
+
+</para>
+
+@cr: 
+@region: 
+
+

docs/reference/gdk/tmpl/colors.sgml

@@ -23,7 +23,7 @@ with gdk_colormap_get_system()) is the default
 colormap of the system. If you are using GdkRGB,
 there is another colormap that is important - the
 colormap in which GdkRGB works, retrieved with
-gdk_rgb_get_cmap(). However, when using GdkRGB, 
+gdk_rgb_get_colormap(). However, when using GdkRGB, 
 it is not generally necessary to allocate colors
 directly.
 </para>
@@ -43,6 +43,9 @@ gdk_color_change() will probably become aliases.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkColor ##### -->
 <para>
 The #GdkColor structure is used to describe an 
@@ -62,7 +65,6 @@ allocated or unallocated color.
 The colormap structure contains the following public fields.
 </para>
 
-@parent_instance: 
 @size: For pseudo-color colormaps, the number of colors
   in the colormap.
 @colors: An array containing the current values in the
@@ -287,3 +289,12 @@ The colormap structure contains the following public fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_color_to_string ##### -->
+<para>
+
+</para>
+
+@color: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/cursors.sgml

@@ -6,7 +6,21 @@ Standard and pixmap cursors
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+These functions are used to create and destroy cursors.
+There is a number of standard cursors, but it is also
+possible to construct new cursors from pixmaps and
+pixbufs. There may be limitations as to what kinds of
+cursors can be constructed on a given display, see
+gdk_display_supports_cursor_alpha(), 
+gdk_display_supports_cursor_color(),
+gdk_display_get_default_cursor_size() and
+gdk_display_get_maximal_cursor_size().
+</para>
+<para>
+Cursors by themselves are not very interesting, they must be be
+bound to a window for users to see them. This is done with 
+gdk_window_set_cursor() or by setting the cursor member of the
+#GdkWindowAttr struct passed to gdk_window_new().
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -14,13 +28,15 @@ Standard and pixmap cursors
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkCursor ##### -->
 <para>
 A <type>GdkCursor</type> structure represents a cursor.
 </para>
 
-@type: 
-@ref_count: 
+@type: the #GdkCursorType of the cursor
 
 <!-- ##### ENUM GdkCursorType ##### -->
 <para>
@@ -104,9 +120,9 @@ The standard cursors available.
 @GDK_UR_ANGLE: <inlinegraphic format="PNG" fileref="ur_angle.png"></inlinegraphic>
 @GDK_WATCH: <inlinegraphic format="PNG" fileref="watch.png"></inlinegraphic>
 @GDK_XTERM: <inlinegraphic format="PNG" fileref="xterm.png"></inlinegraphic>
-@GDK_LAST_CURSOR: 
+@GDK_LAST_CURSOR: last cursor type
 @GDK_CURSOR_IS_PIXMAP: type of cursors constructed with 
-    gdk_cursor_new_from_pixmap().
+gdk_cursor_new_from_pixmap() or gdk_cursor_new_from_pixbuf()
 
 <!-- ##### FUNCTION gdk_cursor_new ##### -->
 <para>
@@ -142,6 +158,16 @@ The standard cursors available.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_cursor_new_from_name ##### -->
+<para>
+
+</para>
+
+@display: 
+@name: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_cursor_new_for_display ##### -->
 <para>
 
@@ -161,6 +187,15 @@ The standard cursors available.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_cursor_get_image ##### -->
+<para>
+
+</para>
+
+@cursor: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_cursor_ref ##### -->
 <para>
 

docs/reference/gdk/tmpl/dnd.sgml

@@ -22,6 +22,9 @@ the GTK+ documentation for more information.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_drag_get_selection ##### -->
 <para>
 </para>
@@ -176,7 +179,7 @@ A <structname>GdkDragContext</structname> holds information about a
 drag in progress. It is used on both source and destination sides.
 </para>
 
-@parent_instance: 
+@parent_instance: the parent instance
 @protocol: the DND protocol which governs this drag.
 @is_source: %TRUE if the context is used on the source side.
 @source_window: the source of this drag.
@@ -194,7 +197,7 @@ Used in #GdkDragContext to indicate what the destination
 should do with the dropped data.
 </para>
 
-@GDK_ACTION_DEFAULT: 
+@GDK_ACTION_DEFAULT: Means nothing, and should not be used.
 @GDK_ACTION_COPY: Copy the data.
 @GDK_ACTION_MOVE: Move the data, i.e. first copy it, then delete
   it from the source using the DELETE target of the X selection protocol.

docs/reference/gdk/tmpl/drawing.sgml

@@ -31,6 +31,9 @@ gtk_widget_create_pango_layout().
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkDrawable ##### -->
 <para>
 An opaque structure representing an object that can be

docs/reference/gdk/tmpl/event_structs.sgml

@@ -20,6 +20,9 @@ required events are received. See gtk_widget_set_events().
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### UNION GdkEvent ##### -->
 <para>
 The #GdkEvent struct contains a union of all of the event structs,
@@ -105,6 +108,8 @@ 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>
@@ -421,6 +426,27 @@ only available if the X server supports the XFIXES extension.
 @selection_time: the time at which the selection ownership was taken over
 @Since: 2.6
 
+<!-- ##### STRUCT GdkEventGrabBroken ##### -->
+<para>
+Generated when a pointer or keyboard grab is broken. On X11, this happens
+when the grab window becomes unviewable (i.e. it or one of its ancestors 
+is unmapped), or if the same application grabs the pointer or keyboard
+again. Note that implicit grabs (which are initiated by button presses)
+can also cause #GdkEventGrabBroken events.
+</para>
+
+@type: the type of the event (%GDK_GRAB_BROKEN)
+@window: the window which received the event, i.e. the window
+ that previously owned the grab
+@send_event: %TRUE if the event was sent explicitly (e.g. using <function>XSendEvent</function>).
+@keyboard: %TRUE if a keyboard grab was broken, %FALSE if a pointer 
+  grab was broken
+@implicit: %TRUE if the broken grab was implicit
+@grab_window: If this event is caused by another grab in the same 
+  application, @grab_window contains the new grab window. Otherwise
+  @grab_window is %NULL.
+@Since: 2.8
+
 <!-- ##### ENUM GdkScrollDirection ##### -->
 <para>
 Specifies the direction for #GdkEventScroll. 
@@ -470,7 +496,7 @@ full details of crossing event generation.
    which are not ancestors of each other and the window is part of
    the ancestor chain between one of these windows and their least
    common ancestor.
-@GDK_NOTIFY_UNKNOWN: 
+@GDK_NOTIFY_UNKNOWN: an unknown type of enter/leave event occurred.
 
 <!-- ##### ENUM GdkPropertyState ##### -->
 <para>

docs/reference/gdk/tmpl/events.sgml

@@ -27,6 +27,9 @@ The structs used for each type of event.
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM GdkEventType ##### -->
 <para>
 Specifies the type of the event.
@@ -81,11 +84,14 @@ has changed.
 @GDK_VISIBILITY_NOTIFY: the window visibility status has changed.
 @GDK_NO_EXPOSE: indicates that the source region was completely available
 when parts of a drawable were copied. This is not very useful.
-@GDK_SCROLL: 
-@GDK_WINDOW_STATE: 
-@GDK_SETTING: 
+@GDK_SCROLL: the scroll wheel was turned
+@GDK_WINDOW_STATE: the state of a window has changed. See #GdkWindowState
+for the possible window states
+@GDK_SETTING: a setting has been modified.
 @GDK_OWNER_CHANGE: the owner of a selection has changed. This event type
   was added in 2.6
+@GDK_GRAB_BROKEN: a pointer or keyboard grab was broken. This event type
+  was added in 2.8.
 
 <!-- ##### ENUM GdkEventMask ##### -->
 <para>
@@ -98,33 +104,35 @@ above.
 number of %GDK_MOTION_NOTIFY events received. Normally a %GDK_MOTION_NOTIFY
 event is received each time the mouse moves. However, if the application
 spends a lot of time processing the event (updating the display, for example),
-it can easily lag behind the position of the mouse. When using the
-%GDK_POINTER_MOTION_HINT_MASK the server will only send a single %GDK_MOTION_NOTIFY
-event (which is marked as a hint) until the application asks for more, by calling 
-gdk_window_get_pointer().
+it can lag behind the position of the mouse. When using
+%GDK_POINTER_MOTION_HINT_MASK, fewer %GDK_MOTION_NOTIFY events will be sent,
+some of which are marked as a hint (the is_hint member is %TRUE).
+To receive more motion events after a motion hint event, the application
+needs to asks for more, by calling gdk_event_request_motions().
 </para>
 
-@GDK_EXPOSURE_MASK: 
-@GDK_POINTER_MOTION_MASK: 
-@GDK_POINTER_MOTION_HINT_MASK: 
-@GDK_BUTTON_MOTION_MASK: 
-@GDK_BUTTON1_MOTION_MASK: 
-@GDK_BUTTON2_MOTION_MASK: 
-@GDK_BUTTON3_MOTION_MASK: 
-@GDK_BUTTON_PRESS_MASK: 
-@GDK_BUTTON_RELEASE_MASK: 
-@GDK_KEY_PRESS_MASK: 
-@GDK_KEY_RELEASE_MASK: 
-@GDK_ENTER_NOTIFY_MASK: 
-@GDK_LEAVE_NOTIFY_MASK: 
-@GDK_FOCUS_CHANGE_MASK: 
-@GDK_STRUCTURE_MASK: 
-@GDK_PROPERTY_CHANGE_MASK: 
-@GDK_VISIBILITY_NOTIFY_MASK: 
-@GDK_PROXIMITY_IN_MASK: 
-@GDK_PROXIMITY_OUT_MASK: 
-@GDK_SUBSTRUCTURE_MASK: 
-@GDK_SCROLL_MASK: 
+@GDK_EXPOSURE_MASK: receive expose events
+@GDK_POINTER_MOTION_MASK: receive all pointer motion events
+@GDK_POINTER_MOTION_HINT_MASK: see the explanation above
+@GDK_BUTTON_MOTION_MASK: receive pointer motion events while any button is pressed
+@GDK_BUTTON1_MOTION_MASK: receive pointer motion events while 1 button is pressed
+@GDK_BUTTON2_MOTION_MASK: receive pointer motion events while 2 button is pressed
+@GDK_BUTTON3_MOTION_MASK: receive pointer motion events while 3 button is pressed
+@GDK_BUTTON_PRESS_MASK: receive button press events
+@GDK_BUTTON_RELEASE_MASK: receive button release events
+@GDK_KEY_PRESS_MASK: receive key press events
+@GDK_KEY_RELEASE_MASK: receive key release events
+@GDK_ENTER_NOTIFY_MASK: receive window enter events
+@GDK_LEAVE_NOTIFY_MASK: receive window leave events
+@GDK_FOCUS_CHANGE_MASK: receive focus change events
+@GDK_STRUCTURE_MASK: receive events about window configuration change
+@GDK_PROPERTY_CHANGE_MASK: receive property change events
+@GDK_VISIBILITY_NOTIFY_MASK: receive visibility change events
+@GDK_PROXIMITY_IN_MASK: receive proximity in events
+@GDK_PROXIMITY_OUT_MASK: receive proximity out events
+@GDK_SUBSTRUCTURE_MASK: receive events about window configuration changes of 
+  child windows
+@GDK_SCROLL_MASK: receive scroll events
 @GDK_ALL_EVENTS_MASK: the combination of all the above event masks.
 
 <!-- ##### MACRO GDK_CURRENT_TIME ##### -->
@@ -261,6 +269,14 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_event_request_motions ##### -->
+<para>
+
+</para>
+
+@event: 
+
+
 <!-- ##### FUNCTION gdk_event_handler_set ##### -->
 <para>
 </para>
@@ -288,8 +304,6 @@ gdk_event_handler_set().
 @event: 
 @winid: 
 @Returns: 
-<!-- # Unused Parameters # -->
-@xid: 
 
 
 <!-- ##### FUNCTION gdk_event_send_client_message_for_display ##### -->
@@ -301,8 +315,6 @@ gdk_event_handler_set().
 @event: 
 @winid: 
 @Returns: 
-<!-- # Unused Parameters # -->
-@xid: 
 
 
 <!-- ##### FUNCTION gdk_event_send_clientmessage_toall ##### -->