2.6.10

2005-08-17  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_grab_notify): Complete the
	backported fix.

ChangeLog

@@ -1,5 +1,896 @@
+2005-08-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.10 ===
+
+	* NEWS: Updates
+
+2005-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_grab_notify): Complete the 
+	backported fix.  
+
+2005-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	Backported fixes from 2.8:
+	
+	* gtk/gtkmenu.c (gtk_menu_grab_notify): Take window
+	groups into account.  (#309473, Diego Gonzalez)
+
+	* gtk/gtkwindow.[hc]: Add a non-exported function to
+	get the grab widget of a window group.
+
+	* gtk/gtkicontheme.c: When changing the icon theme, defer
+	the resetting of rc styles to an idle, so that it does
+	not happen e.g during expose handling (which is problematic,
+	since some widgets, like the toolbar, are changing the
+	hierarchy in response to style changes).  (#300539, reported
+	by many people, analyzed by Owen Taylor)
+
+Fri Aug  5 16:54:19 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkmenutoolbutton.c
+	(gtk_menu_tool_button_construct_contents): Set the relief of the
+	arrow button to the value returned by
+	gtk_tool_item_get_relief_style(). Patch from Benjamin Berg.
+	Bug 312695.
+
+2005-08-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.6.9 ===
+
+	* gtk/gtkuimanager.c (update_node): Update tooltips when 
+	reconnecting toolitems.  (#312173, Alex Graveley)
+
+	* gtk/gtkclipboard.c (gtk_clipboard_set_image) 
+	(gtk_clipboard_set_text): Don't leak atom names.  (#311933,
+	Peter Zelezny)
+
+	* gtk/gtkmain.c (do_post_parse_initialization): Call
+	gettext_initialization() here as well.  (#311612, Dan Winship)
+
+2005-07-30  Hans Breuer  <hans@breuer.org>
+
+	* gtk/makefile.msc.in : updated
+
+2005-07-29  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdrawable-win32.c (blit_inside_drawable): Rename
+	from blit_inside_window(), as it now does blitting inside a
+	bitmap, too. No code change, still just call BitBlt().
+	(_gdk_win32_blit): Check for source equalling destination
+	first. (#169508, #131977) 
+	Do away with the superfluous local draw_impl variable, the
+	parameter to this function is already a GdkDrawableImplWin32*, no
+	need to copy and cast it.
+
+2005-07-28  Robert Ögren  <gtk@roboros.com>
+
+	Avoid spurious core pointer events when the tablet pen is lifted.
+	(#167000)
+
+	* gdk/win32/gdkinput-win32.c (set_ignore_core): New static function,
+	handles delayed unsetting of _gdk_input_ignore_core.
+	(_gdk_input_other_event): Call set_ignore_core instead of setting
+	_gdk_input_ignore_core directly.
+
+2005-07-27  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkmain-win32.c (_gdk_win32_psstyle_to_string): Handle
+	PS_ALTERNATE, too.
+
+	* gdk/win32/gdkmain-win32.c (gdk_screen_get_height_mm): Fix for
+	multi-monitor cases. (#311677, Tim Evans)
+
+2005-07-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2005-07-21  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "hy" to ALL_LINGUAS.
+
+2005-07-21  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
+	wide-char API when available. (#311079, Peter Zelezny)
+
+2005-07-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdnd.c (gtk_drag_begin_internal): Don't fail if we
+	can't get a keyboard grab.  (#168351)
+
+2005-07-19  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate
+	past the end of the string, so pango_layout_get_cursor_pos() won't
+	complain. (#309211, Tommi Komulainen).
+
+2005-07-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
+	gettext_initialization before checking gtk_initialized, otherwise
+	there are scenarios where it is not called at all. For an
+	example, see tests/testfilechooserbutton.c.  (#310323, 
+	Arkady L. Shane)
+
+2005-07-14  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkfilesystemwin32.c (filename_get_info): Implement getting
+	the MIME type of a file. Look it up in the Registry. Bug reported
+	by Hans Oesterholt.
+
+2005-07-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkicontheme.c (load_themes): Don't keep the caches
+	for unthemed directories in a separate list, instead append
+	them at the end of the dir_mtimes list, so that we can check
+	them for staleness like the other caches.  (#310221, Mark 
+	McLoughlin)
+
+2005-07-13  Robert Ögren  <gtk@roboros.com>
+
+	Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust
+	on Windows. (#167004, thanks to	"pnohant" for testing)
+
+	Code cleanup: Remove the unused and unmaintained code for using a
+	non-system tablet context (USE_SYSCONTEXT ifdef:s), suggested
+	by Tor Lillqvist.
+
+	* gdk/win32/gdkinput-win32.c (_gdk_input_wintab_init_check): Handle
+	tablet drivers that don't support WTI_DDCTXS/WTI_DSCTXS gracefully.
+	Sligthly reorganize and simplify the code to support this.
+	(_gdk_input_wintab_init_check, _gdk_input_other_event): Remove
+	USE_SYSCONTEXT ifdef:s and the code for the case it was not defined.
+	(gdk_input_window_find_within): Removed.
+
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.  
+	(#162979, Paul Cornett)
+
+	* gtk/gtkhscale.c (gtk_hscale_new_with_range): 
+	(gtk_vscale_new_with_range): Add some additional docs on 
+	precision here too.  (#309238, Steve Chaplin)
+
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	Implement Drag-and-Drop to the file list.  (#145121, Sven Neumann)
+	
+	* gtk/gtkfilechooserdefault.c (file_list_drag_data_received_cb) 
+	(file_list_drag_drop_cb, file_list_drag_motion_cb): New functions
+	to handle drag-and-drop on the file list.
+	(create_file_list): Set up drag-and-drop handlers on the file list.
+
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	Fix #157787, reported by Jonathan Blandford: 
+	
+	* gtk/gtkfilechooserdefault.c 
+	(gtk_file_chooser_default_set_current_folder): Don't leave a 
+	"trail" behind when set_current_folder is called explicitly.
+	(gtk_file_chooser_default_update_current_folder): New function
+	that is called to update the current folder in response to
+	user actions.
+
+	* gtk/gtkpathbar.c (_gtk_path_bar_set_path): Add a boolean
+	keep_trail argument, and don't leave a "trail" behind unless
+	it is set.
+
+2005-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): Add some
+	additional docs on precision.  (#309238, Steve Chaplin)
+
+2005-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/imime.c: Fix includes.  (#309462, Kazuki IWAMOTO)
+
+2005-07-03  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_vertical_autoscroll): remove
+	stray debugging g_prints.
+
+2005-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
+	loop when G_FILENAME_ENCODING is invalid.  (#309280, Padraig Brady)
+
+2005-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkvisual-x11.c (gdk_visual_decompose_mask): Avoid
+	infinite loop if a mask is zero.  (#309222, David Saxton)
+
+	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): 
+	Clarify the code, gcc 4 complains about predecrement in  MAX().
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Don't prematurely unregister callbacks.
+
+2005-06-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Avoid a segfault.  (#309054)
+
+	* gtk/gtkmenu.c (gtk_menu_grab_notify): Cancel menus when
+	they are grab-shadowed by something thats not a
+	submenu.  (#145416, Euan MacGregor)
+
+2005-06-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Unregister XIM callbacks here.  (#309054)
+
+2005-06-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't
+	jump to the next line if we are at the end of the line.  
+	(gtk_text_view_move_cursor_internal): Make movement by
+	paragraphs up/down symmetric.  (#307055, Behnam Esfahbod)
+
+2005-06-23  Tor Lillqvist  <tml@novell.com>
+
+	Improve and simplify line segment rendering on Win32, especially
+	the implementation of GDK_CAP_NOT_LAST, and dashed lines. Fixes
+	bugs #306396 and #308413.
+
+	* gdk/win32/gdkprivate-win32.h (GdkGCWin32): Save the GdkGC's
+	line_style, cap_style and join_style as such in the
+	GdkGCWin32. Don't need to keep the pen_double_dash flag, we can
+	check the line_style.
+
+	* gdk/win32/gdkgc-win32.c (fixup_pen): New internal function. Sets
+	up the GDI pen type, style, end cap and join attributes to use
+	based on the pen width, GDK line style, end cap style, and join
+	style.
+
+	For a narrow (zero-width) GDK pen with the GDK_CAP_NOT_LAST end
+	cap style, which typically are used for XOR drawing where it is
+	essential that the last pixel is not drawn, use a GDI cosmetic
+	pen. Only for a cosmetic pen does GDI not draw the last pixel. I
+	deduced this by experimetation, the documentation is rather vague.
+
+	For other GDK pens use a geometric GDI pen. If the width is 0 or 1
+	and the GDK end cap style is GDK_CAP_BUTT, and the line style is
+	GDK_LINE_SOLID, use PS_ENDCAP_ROUND. This ensures that also
+	single-pixel length lines are drawn. (For sngle-pixel width lines
+	roundness as such is of course irrelevant.) For dashed lines, use
+	PS_ENDCAP_FLAT.
+
+	For wide lines use PS_ENDCAP_FLAT, _ROUND or _SQUARE,
+	respectively, for GDK_CAP_BUTT, GDK_CAP_ROUND and GDK_CAP_PROJECTING.
+
+	For one pixel on-off dashed lines, use PS_ALTERNATE, it seems to
+	work better than PS_USERSTYLE. For other dashed lines, use
+	PS_USERSTYLE and the dashes as set by the user (or the default
+	four-pixel on-off style).
+
+	(gdk_win32_gc_values_to_win32values, gdk_win32_gc_set_dashes):
+	Call fixup_pen() to do the pen settings after modifying some of
+	the GDK GC attributes that affect pens.
+
+	* gdk/win32/gdkdrawable-win32.c (render_line_horizontal,
+	render_line_vertical, draw_segments): Check GdkGCWin32::line_style
+	instead of the the removed pen_double_dash member. Don't use
+	PATCOPY unconditionally in the PatBlt() call, use a raster op
+	code that depends on the GC function in use.
+
+	(draw_rectangle, draw_segments, draw_lines): Be more careful in
+	deciding when to do the manual dash rendering.
+
+	(draw_segments): Don't do any manual "last point" drawing at
+	all. The above changes takes care of narrow line segments being
+	drawn correctly in most cases, at least on NT-based Windows.
+
+2005-06-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): 
+	Fix an error in the cache timeout logic.  (#166601, Morten
+	Welinder)
+
+	* gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Remove
+	a leftover debugging envvar.  
+
+2005-06-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdnd-x11.c (xdnd_finished_filter): Set the
+	time field in the event.  (#308573, Morten Welinder)
+
+	* gtk/gtkbutton.c (gtk_button_construct_child): Don't
+	trigger warnings if there are extra references to the
+	hbox.  (#308677, Dan Winship)
+
+	* gtk/gtkfilesystemunix.c: Ignore everything after the
+	first space in lines from the .gtk-bookmarks file.
+
+2005-06-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdnd.c (gtk_drag_source_set): Connect to 
+	button-release-event as well, to handle touchscreen 
+	scenarios better.  (#171490, Markku Vire)
+
+2005-06-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconcache.c: Handle missing MAP_FAILED.  (#308449, Georg
+	Schwarz) 
+
+2005-06-17  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Set the actions
+	and suggested_action fields in the GdkDragContext to
+	GDK_ACTION_COPY. Otherwise apps that check the suggested_action
+	field, like eog, won't accept dropped files.
+
+2005-06-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_complete): 
+	Resize the popup if necessary.  (#308076, Vincent Noel)
+
+	* gtk/gtkwindow.c (gtk_window_real_set_focus): Queue a
+	draw on the old and new focus widgets, if their defaultness
+	changes.  (#305607, Billy Biggs)
+
+2005-06-16  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkmain.c (g_win32_locale_filename_from_utf8): [Win32]
+	Borrow this function from GLib HEAD.
+	(_gtk_get_localedir): [Win32] Make sure the run-time locale
+	directory is in system codepage, as it is passed to the
+	non-UTF8-aware gettext library.
+
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+	
+	* configure.in: Bump version
+
+	* === Released 2.6.8 ===
+
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: More updates, move bug numbers to my
+	separate list of bugs, which will get merged into
+	the announcement. For 2.8.0, I will try a somewhat
+	different style for the NEWS, and list bugs and
+	contributors separately from features.
+
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	* NEWS: Fill in with GtkFileChooser bugs.
+
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #302087:
+
+	* gtk/gtkfilechooserdefault.c (list_selection_changed): Emit
+	"selection-changed" and do the normal housekeeping even if we are
+	in SAVE mode and there is nothing selected.  We didn't emit that
+	signal if we were in SAVE mode and unselect_all() got called.
+	(gtk_file_chooser_default_unselect_all): Call
+	pending_select_paths_free() so that we cancel any asynchronous
+	selections.
+	(gtk_file_chooser_default_set_current_name): Likewise.
+
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	Fixes #307640:
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_should_respond): Oops, I broke SAVE
+	mode.  If the parent path is a folder, only create a subfolder if
+	we are in CREATE_FOLDER mode; if we are in SAVE mode, just return
+	and respond.  Also, pick up the case where the user types
+	"dirname/" instead of "dirname".
+	(check_save_entry): Make the return type void.  Add some return
+	parameters so that we can do more thorough checking.
+	(gtk_file_chooser_default_get_paths): If the file part is empty
+	and we are in SAVE mode, return an empty selection.
+
+2005-06-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserbutton.c (model_update_current_folder): 
+	Free the data of the row before overwriting it.  (#307490,
+	Kjartan Maraas)	
+
+2005-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkselection.c (gtk_target_list_add_image_targets): 
+	Don't leak the format names.  (#307190, Morten Welinder)
+
+2005-06-12  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gdk/x11/gdkasync.c: (send_event_handler): Merge
+	fix for a leak from HEAD. Bug #307281.
+
+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2005-06-09  Federico Mena Quintero  <federico@ximian.com>
+
+	Fixes #162358:
+
+	* gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't return
+	immediately if we are in CREATE_FOLDER mode, so that we can fill
+	the entry with the newly-selected folder.
+	(gtk_file_chooser_default_set_property): Warn against turning on
+	multiple selection for CREATE_FOLDER mode, or about setting that
+	action while multiple selection is on.
+	(update_chooser_entry): Change the entry's contents as well if we
+	are in CREATE_FOLDER mode.  If nothing is selected, clear the
+	chooser entry.
+	(trap_activate_cb): Don't trap enter/space if modifiers are
+	pressed.  This lets one use Ctrl-space to toggle rows in multiple
+	selection mode.
+	(gtk_file_chooser_default_should_respond): Clean up the if-chain
+	mess of special cases by using an array to determine what to do.
+	Also, for the save-entry case in CREATE_FOLDER mode, actually fix
+	the bug where the file chooser would switch to an existing folder
+	rather than confirming with it, and create the folder ourselves.
+	(error_creating_folder_over_existing_file_dialog): New function.
+
+	* gtk/gtkfilechooserentry.c (check_completion_callback): Only
+	insert the common prefix if we are in an "open" mode.  Use a
+	helper function.
+	(append_common_prefix): New helper function; code moved over from
+	check_completion_callback().
+	(find_common_prefix): New helper function.
+	(gtk_file_chooser_entry_focus): Append the common prefix if the
+	user requests it explicitly.
+
+2005-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdnd-x11.c (motif_drop_start, xdnd_drop_filter): Update
+	the user time on the window when a drop happens.  (#169364, Alexander
+	Hunziker, patch by Elijah Newren)
+
+2005-06-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): Check for
+	negative before appending the index, to avoid double error
+	message.  (#306393, Morten Welinder)
+
+	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): 
+	Don't crash if search_window is NULL.  (#304914, Victor Osadci,
+	testcase by Olaf Vitters)
+
+2005-06-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gtk/gtkfilechooserbutton.c: (update_label_and_image):
+	Plug a leak. Closes bug #306754.
+
+2005-06-03  Dom Lachowicz <cinamod@hotmail.com>
+
+	Merge from HEAD:
+	
+	* modules/engines/ms-windows/msw_style.c: Re-sync with gtk-wimp
+	* modules/engines/ms-windows/xp_theme.c: Ditto
+	* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: Ditto
+
+2005-06-05  Tor Lillqvist  <tml@novell.com>
+
+	* modules/engines/Makefile.am
+	* modules/input/Makefile.am: Decide whether to build the
+	ms-windows theme engine based on the GDK backend, not based on
+	platform. (I.e., if building for Cygwin with the X11 backend, we
+	shouldn't build the ms-windows engine, but if building for Cygwin
+	but with the Win32 backend, we should.) Ditto for the IME
+	(Windows) input module. (#305832)
+
+2005-06-04  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkcursor-win32.c
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkprivate-win32.h: Support full-colour cursors.
+	Support cursors with alpha on XP. Use code in common with the
+	support for alpha icons that already was present. (#306101, Tim
+	Evans)
+
+	* modules/engines/ms-windows/msw_style.c: Render insensitive icons
+	in a way that more closely matches Windows. (#305986, Tim Evans).
+
+	* modules/engines/ms-windows/Makefile.am (LDADDS): Link with
+	gdk-pixbuf.
+
+2005-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_tag): Queue the 
+	redisplay after modifying the tag in the btree, otherwise 
+	we end up showing the old tags until the next redraw comes 
+	around.   (#143537, Gary Kramlich, Peter Wainwright)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make 
+	autoscrolling work at the bottom of the screen.
+
+2005-05-26  Maciej Katafiasz  <email@mathrick.org>
+
+	* docs/reference/gtk/tmpl/gtkentry.sgml:
+	Point to GtkTextView instead of GtkText. Fixes bug #305535
+
+2005-05-26  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdrawable-win32.c (_gdk_win32_blit): If blitting
+	from the root window, take the multi-monitor offset into
+	account. (#305511)
+
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/clipboard.c: Demonstrate image copy-and-paste
+	and drag-and-drop.
+
+	* demos/gtk-demo/appwindow.c (do_appwindow): Set the window
+	icon by name.
+
+	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): Draw the 
+	background of rows insensitive when the treeview is insensitive.
+	(pointed out by Billy Biggs)
+
+	* gtk/gtkselection.c (gtk_target_list_add_image_targets): 
+	Make sure png comes first, otherwise dnd may use bmp by
+	default, loosing transparency.
+
+2005-05-25  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtktextview.c (blink_cb): block the text_layout's "changed"
+	handler when changing cursor visibility because it would expose
+	the whole paragraph where the cursor is. Instead, expose the
+	cursors' areas manually. (#173047).
+
+	(text_window_invalidate_cursors): new function which exposes the
+	cursors.
+
+	* gtk/gtkstyle.c (draw_insertion_cursor): added comment that the
+	same cursor size calculation is in text_window_invalidate_cursors().
+
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/editable_cells.c (create_items_model): Also
+	demonstrate GtkCellRendererProgress.
+
+	* demos/gtk-demo/Makefile.am (demos): 
+	* demos/gtk-demo/combobox.c: Add a demo showing combo box 
+	variations.
+
+	* demos/gtk-demo/Makefile.am (demos): 
+	* demos/gtk-demo/pickers.c: Add a demo showing all picker widgets.
+
+2005-05-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init):
+	Revert an accidental commit.
+
+	* gtk/gtkfilechooserdefault.c (filter_create): Don't grab
+	the focus away from the file list when operating the filter
+	combo with the pointer.  (#304844, Sven Neumann)
+
+2005-05-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (handle_special): Map VK_APPS to
+	GDK_Menu. (#172383, Ivan Wong)
+
+	* gdk/win32/gdkkeys-win32.c (handle_dead): If the keysym isn't one
+	of the special cases this function takes care of, use it as
+	such. This takes care of for instance the Bengali Virama, see bug
+	#165723.
+
+2005-05-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkimcontextsimple.c (check_table): Avoid a possible
+	buffer overrun.  (#142444, Leonard Michlmayr)
+
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): 
+	Use the correct function to conver the uri to a path.  (#304565,
+	Ismael Juma)
+
+	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the
+	Cancel button properly.  (#304234, Sven Neumann)
+
+	* gtk/gtkwidget.c (gtk_widget_add_events): Try harder to set
+	the event masks of descendent windows.  (#169821, Tommi Komulainen)
+
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkproperty-x11.c (gdk_property_get): Warn if
+	length overflows.  (#161520, Ian Wienand)
+
+2005-05-18  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkkeys-win32.c
+	* gdk/win32/gdkprivate-win32.h: Check the KF_EXTENDED bit in
+	lParam of WM_KEY* messages to distinguish between left and right
+	Control and Alt keys. Unfortunately, the right Shift key doesnt
+	set KF_EXTENDED, so to distinguish between left and right Shift
+	keys, check the scan code. (#304584)
+
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkscale.c (gtk_scale_class_init): Fix the default
+	values of draw-value and value-pos to be the values we
+	actually use in _init. (#304547, Mikael Hallendal)
+
+2005-05-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (cursor_blinks): Don't blink the cursor
+	if the text view is not editable.  
+
+	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
+	the popup posted if the button is released over the cellview.
+	This matches the behaviour of other combo box implementations.  
+	(#171378)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up 
+	and GDK_Page_Down twice.  (#168333, Hazael Maldonado Torres)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
+	the entry is not editable.  (#304171,Nikos Kouremenos)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
+	Make sure the action of the button and the dialog are in sync,
+	when the dialog is provided by the app.  (#303987, David A Knight)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkpango.c (gdk_pango_renderer_get_default): Fix a typo
+	in the docs.  (#303940, Masao Mutoh)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktoggleaction.c (connect_proxy): Be more careful when
+	casting.  (#304089, Philip Langdale)
+
+	* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only shrink
+	the label if we need to.  (#169390, Felix Riemann)
+
+2005-05-10  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Check
+	that GDK_IS_SCREEN(screen) (like the X11 backend does), not screen
+	== gdk_screen_get_default(), as that might return NULL when this
+	function is called.
+
+2005-05-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the
+	padding in RTL mode.  (#303572, Maciej Katafiasz)
+
+2005-05-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_get_width_mm) 
+	(gdk_screen_get_height_mm): Fix typos in the docs. (#303389,
+	Masao Mutoh)
+
+2005-05-06  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilesystemunix.c (fill_in_mime_type): Don't fill the mime
+	types if this is an AFS directory.
+	(fill_in_names): If we are in an AFS directory, set the MIME type
+	blindly to "x-directory/normal".
+
+2005-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always
+	initialize child-visible to FALSE, otherwise we may end up
+	with the wrong page visible initially.  (#302283, Patrik Fimml)
+
+	* gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders
+	appear insensitive in insensitive treeviews. 
+
+2005-05-04  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c gdk/x11/gdkwindow-x11.h: Fix a bug
+	in focus tracking when we move between has_pointer_focus and 
+	has_focus_window directly. (#109246, Billy Biggs, Niko Tyni 
+	and others)
+
+	* gdk/x11/gdkevents-x11.c: Also fix some extremely confusion
+	that could happen in the case of no window manager + keyboard grabs,
+	by moving to a more consistent model of when we pay attention
+	to mode=NotifyGrab/NotifyUngrab events.
+
+2005-05-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* tests/testfilechooser.c: Oops, remove mtrace() stuff.
+
+	Fixes #301068:
+
+	* gtk/gtkfilesystemunix.c (struct _GtkFileSystemUnix): Add fields
+	to store struct stat for /afs and /net, and boolean fields to say
+	whether these are valid.
+	(struct _GtkFileFolderUnix): Added a boolean is_network_dir field.
+	(gtk_file_system_unix_get_folder): Fill in the is_network_dir
+	field of the folder structure.
+	(fill_in_names): If the folder is a network directory, create a
+	fake struct stat for its entries.
+	(fill_in_stats): Don't stat() the children of network directories.
+
+	* gtk/gtkfilechooserdefault.c (list_mtime_data_func): If the mtime
+	is 0, use "Unknown" for the cell's displayed text.
+
+2005-05-02  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkmain.c (do_post_parse_initialization): return silently if
+	"gtk_initialized" is TRUE. Re-enables calling GTK's init functions
+	multiple times when using gtk_get_option_group(), just as one can
+	call gtk_init() multiple times without doing any harm.
+
+2005-05-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_expose_event): Propagate
+	the event to unanchored children in the text window.  
+	(#302494, Stephen Kennedy)
+
+2005-04-30  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Take
+	multi-monitor offset into account. (#302525)
+
+2005-04-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this
+	function, instead show the bin_window when it is created.
+
+	* gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't 
+	grab focus to unrealized widgets.  (#302240, Philip Langdale)
+
+	* gtk/gtktreeview.c (gtk_tree_view_state_changed): Set
+	background upon state changes.  (#301651, Billy Biggs)
+	(gtk_tree_view_get_path_at_pos): Take RTL into account
+	when iterating over the columns.  (#302163)
+
+	* configure.in: Check for nm.
+
+	* gtk/Makefile.am: Use $(NM), not nm directly. (#301299, 
+	Nguyen Thai Ngoc Duy)
+
+	* gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use
+	the internal unselect_all function, since we need the unselection
+	to happen even in browse mode.  (#300995, Mathias Hasselmann)
+
+	* gtk/gtkuimanager.c (update_node): Use g_object_notify() instead
+	of triggering a ::notify by re-setting the property.  (#300982,
+	Sven Neumann)
+
+	* gtk/gtkaction.c (connect_proxy): Use gtk_action_sync_tooltip().
+
+	* gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Also
+	scroll horizontally when necessary, and keep the northwest
+	corner of the item visible.  (#300913, Mathias Hasselmann)
+
+	* tests/testiconview.c: Add some more tests.
+
+	* gtk/gtkiconview.c (gtk_icon_view_select_path): Don't crash
+	if the path does not point to a row in the model.  (#300909,
+	Mathias Hasselmann)
+	(gtk_icon_view_rows_reordered): Re-layout here.  (#301009, 
+	Mathias Hasselmann)
+
+	* tests/testtext.c: Add some more attribute tests.
+
+	* gtk/gtktexttag.c (gtk_text_tag_class_init): Correct the documentation
+	of the rise property. String change, but it is more important to
+	be correct than to be translated.  (#301740)
+
+2005-04-25  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkfilesystemwin32.c
+	(gtk_file_system_win32_volume_get_display_name): Get volume name
+	also on Win9x. (#301798, Daniel Atallah)
+	(canonicalize_filename): Add explicit braces to silence compiler
+	warning.
+
+2005-04-24  Hans Breuer  <hans@breuer.org>
+
+	* gtk/stock-icons/makefile.msc : updated
+
+2005-04-22  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkmain.c: Initailize gettext before use. Calling
+	bindtextdomain() and bind_textdomain_codeset() in
+	do_post_parse_initialization() is too late. Put the calls in a new
+	function gettext_initialization(), and call that from
+	gtk_init_with_args() and gtk_parse_args(). Fixes #170948 for
+	GTK+'s part, but the same problem occurs also at least in
+	atk. Thanks to Robert Ögren, Daniel Atallah and Kevin Stange.
+
+2005-04-19  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match
+	character height instead of cell height. Fix #301228.
+
+2005-04-18  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove
+	obsolete assertion that the selected row can't be a volume; this
+	is handled by the "removable" column now.  Fixes #301017.
+
+2005-04-15  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
+	Patch from Christian Neumair <chris@gnome-de.org>; only select the
+	first row if we are in OPEN mode.  The only other case we were
+	letting pass through was SELECT_FOLDER, but selecting the first
+	row when changing folders confuses people when folders are
+	actually being selected.  Fixes #171885.
+
+2005-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.6.7 ====
+
+	* gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+	Revert the fix for #170727, since it causes problems
+	with user-specified accelerators. 
+
+	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+	Revert the changes to display broken images, since there
+	are applications which rely on the old behaviour.
+
+2005-04-11  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	Fix #300218:
+
+	* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Fix
+	C99ism.
+
+	* gtk/updateiconcache.c: Guard inclusion of unistd.h and
+	utime.h.
+
+2005-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version.
+
+2005-04-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.6 ===
+
+	* gdk/abicheck.sh: Handle duplicate symbols.
+
+	* NEWS: Updates
+
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkinput-xfree.c:
+	* gdk/x11/gdkinput-none.c:
+	* gdk/gtk.symbols: Some more fixes necessary to 
+	make building with gcc 4 work.
+
+	Add 16x16 versions of the zoom icons and of 
+	GTK_STOCK_INDEX. Some of the images were taken from 
+	the hicolor icon theme, and were originally created 
+	by Jakub Steiner and Tuomas Kuosmanen. 	(#167515, 
+	Vincent Noel)
+	
+	* gtk/stock-icons/stock_index_16.png:
+	* gtk/stock-icons/stock_zoom_1_16.png:
+	* gtk/stock-icons/stock_zoom_fit_16.png:
+	* gtk/stock-icons/stock_zoom_in_16.png:
+	* gtk/stock-icons/stock_zoom_out_16.png: New images.
+	
+	* gtk/stock-icons/Makefile.am: Add the new images. 
+
+	* gtk/gtkiconfactory.c (get_default_icons): Add the new 
+	images. 
+
+	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+	Don't display too many broken images.  (#169870, Roman
+	Kagan, patch by Ivan Wong)
+
+	* gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+	output.  (#300013, Tommi Komulainen)
+
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
 	* === Released 2.6.5 ===
 
 	* NEWS: Updates
@@ -53,7 +944,7 @@
 	* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): 
 	Ignore regions which fall completely outside the line.  
 	(#165862, Felipe Heidrich)
-	
+
 2005-04-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g, 

ChangeLog.pre-2-10

@@ -1,5 +1,896 @@
+2005-08-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.10 ===
+
+	* NEWS: Updates
+
+2005-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_grab_notify): Complete the 
+	backported fix.  
+
+2005-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	Backported fixes from 2.8:
+	
+	* gtk/gtkmenu.c (gtk_menu_grab_notify): Take window
+	groups into account.  (#309473, Diego Gonzalez)
+
+	* gtk/gtkwindow.[hc]: Add a non-exported function to
+	get the grab widget of a window group.
+
+	* gtk/gtkicontheme.c: When changing the icon theme, defer
+	the resetting of rc styles to an idle, so that it does
+	not happen e.g during expose handling (which is problematic,
+	since some widgets, like the toolbar, are changing the
+	hierarchy in response to style changes).  (#300539, reported
+	by many people, analyzed by Owen Taylor)
+
+Fri Aug  5 16:54:19 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkmenutoolbutton.c
+	(gtk_menu_tool_button_construct_contents): Set the relief of the
+	arrow button to the value returned by
+	gtk_tool_item_get_relief_style(). Patch from Benjamin Berg.
+	Bug 312695.
+
+2005-08-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.6.9 ===
+
+	* gtk/gtkuimanager.c (update_node): Update tooltips when 
+	reconnecting toolitems.  (#312173, Alex Graveley)
+
+	* gtk/gtkclipboard.c (gtk_clipboard_set_image) 
+	(gtk_clipboard_set_text): Don't leak atom names.  (#311933,
+	Peter Zelezny)
+
+	* gtk/gtkmain.c (do_post_parse_initialization): Call
+	gettext_initialization() here as well.  (#311612, Dan Winship)
+
+2005-07-30  Hans Breuer  <hans@breuer.org>
+
+	* gtk/makefile.msc.in : updated
+
+2005-07-29  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdrawable-win32.c (blit_inside_drawable): Rename
+	from blit_inside_window(), as it now does blitting inside a
+	bitmap, too. No code change, still just call BitBlt().
+	(_gdk_win32_blit): Check for source equalling destination
+	first. (#169508, #131977) 
+	Do away with the superfluous local draw_impl variable, the
+	parameter to this function is already a GdkDrawableImplWin32*, no
+	need to copy and cast it.
+
+2005-07-28  Robert Ögren  <gtk@roboros.com>
+
+	Avoid spurious core pointer events when the tablet pen is lifted.
+	(#167000)
+
+	* gdk/win32/gdkinput-win32.c (set_ignore_core): New static function,
+	handles delayed unsetting of _gdk_input_ignore_core.
+	(_gdk_input_other_event): Call set_ignore_core instead of setting
+	_gdk_input_ignore_core directly.
+
+2005-07-27  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkmain-win32.c (_gdk_win32_psstyle_to_string): Handle
+	PS_ALTERNATE, too.
+
+	* gdk/win32/gdkmain-win32.c (gdk_screen_get_height_mm): Fix for
+	multi-monitor cases. (#311677, Tim Evans)
+
+2005-07-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2005-07-21  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "hy" to ALL_LINGUAS.
+
+2005-07-21  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
+	wide-char API when available. (#311079, Peter Zelezny)
+
+2005-07-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdnd.c (gtk_drag_begin_internal): Don't fail if we
+	can't get a keyboard grab.  (#168351)
+
+2005-07-19  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate
+	past the end of the string, so pango_layout_get_cursor_pos() won't
+	complain. (#309211, Tommi Komulainen).
+
+2005-07-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
+	gettext_initialization before checking gtk_initialized, otherwise
+	there are scenarios where it is not called at all. For an
+	example, see tests/testfilechooserbutton.c.  (#310323, 
+	Arkady L. Shane)
+
+2005-07-14  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkfilesystemwin32.c (filename_get_info): Implement getting
+	the MIME type of a file. Look it up in the Registry. Bug reported
+	by Hans Oesterholt.
+
+2005-07-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkicontheme.c (load_themes): Don't keep the caches
+	for unthemed directories in a separate list, instead append
+	them at the end of the dir_mtimes list, so that we can check
+	them for staleness like the other caches.  (#310221, Mark 
+	McLoughlin)
+
+2005-07-13  Robert Ögren  <gtk@roboros.com>
+
+	Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust
+	on Windows. (#167004, thanks to	"pnohant" for testing)
+
+	Code cleanup: Remove the unused and unmaintained code for using a
+	non-system tablet context (USE_SYSCONTEXT ifdef:s), suggested
+	by Tor Lillqvist.
+
+	* gdk/win32/gdkinput-win32.c (_gdk_input_wintab_init_check): Handle
+	tablet drivers that don't support WTI_DDCTXS/WTI_DSCTXS gracefully.
+	Sligthly reorganize and simplify the code to support this.
+	(_gdk_input_wintab_init_check, _gdk_input_other_event): Remove
+	USE_SYSCONTEXT ifdef:s and the code for the case it was not defined.
+	(gdk_input_window_find_within): Removed.
+
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.  
+	(#162979, Paul Cornett)
+
+	* gtk/gtkhscale.c (gtk_hscale_new_with_range): 
+	(gtk_vscale_new_with_range): Add some additional docs on 
+	precision here too.  (#309238, Steve Chaplin)
+
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	Implement Drag-and-Drop to the file list.  (#145121, Sven Neumann)
+	
+	* gtk/gtkfilechooserdefault.c (file_list_drag_data_received_cb) 
+	(file_list_drag_drop_cb, file_list_drag_motion_cb): New functions
+	to handle drag-and-drop on the file list.
+	(create_file_list): Set up drag-and-drop handlers on the file list.
+
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	Fix #157787, reported by Jonathan Blandford: 
+	
+	* gtk/gtkfilechooserdefault.c 
+	(gtk_file_chooser_default_set_current_folder): Don't leave a 
+	"trail" behind when set_current_folder is called explicitly.
+	(gtk_file_chooser_default_update_current_folder): New function
+	that is called to update the current folder in response to
+	user actions.
+
+	* gtk/gtkpathbar.c (_gtk_path_bar_set_path): Add a boolean
+	keep_trail argument, and don't leave a "trail" behind unless
+	it is set.
+
+2005-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): Add some
+	additional docs on precision.  (#309238, Steve Chaplin)
+
+2005-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/imime.c: Fix includes.  (#309462, Kazuki IWAMOTO)
+
+2005-07-03  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_vertical_autoscroll): remove
+	stray debugging g_prints.
+
+2005-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
+	loop when G_FILENAME_ENCODING is invalid.  (#309280, Padraig Brady)
+
+2005-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkvisual-x11.c (gdk_visual_decompose_mask): Avoid
+	infinite loop if a mask is zero.  (#309222, David Saxton)
+
+	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): 
+	Clarify the code, gcc 4 complains about predecrement in  MAX().
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Don't prematurely unregister callbacks.
+
+2005-06-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Avoid a segfault.  (#309054)
+
+	* gtk/gtkmenu.c (gtk_menu_grab_notify): Cancel menus when
+	they are grab-shadowed by something thats not a
+	submenu.  (#145416, Euan MacGregor)
+
+2005-06-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Unregister XIM callbacks here.  (#309054)
+
+2005-06-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't
+	jump to the next line if we are at the end of the line.  
+	(gtk_text_view_move_cursor_internal): Make movement by
+	paragraphs up/down symmetric.  (#307055, Behnam Esfahbod)
+
+2005-06-23  Tor Lillqvist  <tml@novell.com>
+
+	Improve and simplify line segment rendering on Win32, especially
+	the implementation of GDK_CAP_NOT_LAST, and dashed lines. Fixes
+	bugs #306396 and #308413.
+
+	* gdk/win32/gdkprivate-win32.h (GdkGCWin32): Save the GdkGC's
+	line_style, cap_style and join_style as such in the
+	GdkGCWin32. Don't need to keep the pen_double_dash flag, we can
+	check the line_style.
+
+	* gdk/win32/gdkgc-win32.c (fixup_pen): New internal function. Sets
+	up the GDI pen type, style, end cap and join attributes to use
+	based on the pen width, GDK line style, end cap style, and join
+	style.
+
+	For a narrow (zero-width) GDK pen with the GDK_CAP_NOT_LAST end
+	cap style, which typically are used for XOR drawing where it is
+	essential that the last pixel is not drawn, use a GDI cosmetic
+	pen. Only for a cosmetic pen does GDI not draw the last pixel. I
+	deduced this by experimetation, the documentation is rather vague.
+
+	For other GDK pens use a geometric GDI pen. If the width is 0 or 1
+	and the GDK end cap style is GDK_CAP_BUTT, and the line style is
+	GDK_LINE_SOLID, use PS_ENDCAP_ROUND. This ensures that also
+	single-pixel length lines are drawn. (For sngle-pixel width lines
+	roundness as such is of course irrelevant.) For dashed lines, use
+	PS_ENDCAP_FLAT.
+
+	For wide lines use PS_ENDCAP_FLAT, _ROUND or _SQUARE,
+	respectively, for GDK_CAP_BUTT, GDK_CAP_ROUND and GDK_CAP_PROJECTING.
+
+	For one pixel on-off dashed lines, use PS_ALTERNATE, it seems to
+	work better than PS_USERSTYLE. For other dashed lines, use
+	PS_USERSTYLE and the dashes as set by the user (or the default
+	four-pixel on-off style).
+
+	(gdk_win32_gc_values_to_win32values, gdk_win32_gc_set_dashes):
+	Call fixup_pen() to do the pen settings after modifying some of
+	the GDK GC attributes that affect pens.
+
+	* gdk/win32/gdkdrawable-win32.c (render_line_horizontal,
+	render_line_vertical, draw_segments): Check GdkGCWin32::line_style
+	instead of the the removed pen_double_dash member. Don't use
+	PATCOPY unconditionally in the PatBlt() call, use a raster op
+	code that depends on the GC function in use.
+
+	(draw_rectangle, draw_segments, draw_lines): Be more careful in
+	deciding when to do the manual dash rendering.
+
+	(draw_segments): Don't do any manual "last point" drawing at
+	all. The above changes takes care of narrow line segments being
+	drawn correctly in most cases, at least on NT-based Windows.
+
+2005-06-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): 
+	Fix an error in the cache timeout logic.  (#166601, Morten
+	Welinder)
+
+	* gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Remove
+	a leftover debugging envvar.  
+
+2005-06-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdnd-x11.c (xdnd_finished_filter): Set the
+	time field in the event.  (#308573, Morten Welinder)
+
+	* gtk/gtkbutton.c (gtk_button_construct_child): Don't
+	trigger warnings if there are extra references to the
+	hbox.  (#308677, Dan Winship)
+
+	* gtk/gtkfilesystemunix.c: Ignore everything after the
+	first space in lines from the .gtk-bookmarks file.
+
+2005-06-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdnd.c (gtk_drag_source_set): Connect to 
+	button-release-event as well, to handle touchscreen 
+	scenarios better.  (#171490, Markku Vire)
+
+2005-06-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconcache.c: Handle missing MAP_FAILED.  (#308449, Georg
+	Schwarz) 
+
+2005-06-17  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Set the actions
+	and suggested_action fields in the GdkDragContext to
+	GDK_ACTION_COPY. Otherwise apps that check the suggested_action
+	field, like eog, won't accept dropped files.
+
+2005-06-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_complete): 
+	Resize the popup if necessary.  (#308076, Vincent Noel)
+
+	* gtk/gtkwindow.c (gtk_window_real_set_focus): Queue a
+	draw on the old and new focus widgets, if their defaultness
+	changes.  (#305607, Billy Biggs)
+
+2005-06-16  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkmain.c (g_win32_locale_filename_from_utf8): [Win32]
+	Borrow this function from GLib HEAD.
+	(_gtk_get_localedir): [Win32] Make sure the run-time locale
+	directory is in system codepage, as it is passed to the
+	non-UTF8-aware gettext library.
+
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+	
+	* configure.in: Bump version
+
+	* === Released 2.6.8 ===
+
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: More updates, move bug numbers to my
+	separate list of bugs, which will get merged into
+	the announcement. For 2.8.0, I will try a somewhat
+	different style for the NEWS, and list bugs and
+	contributors separately from features.
+
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	* NEWS: Fill in with GtkFileChooser bugs.
+
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #302087:
+
+	* gtk/gtkfilechooserdefault.c (list_selection_changed): Emit
+	"selection-changed" and do the normal housekeeping even if we are
+	in SAVE mode and there is nothing selected.  We didn't emit that
+	signal if we were in SAVE mode and unselect_all() got called.
+	(gtk_file_chooser_default_unselect_all): Call
+	pending_select_paths_free() so that we cancel any asynchronous
+	selections.
+	(gtk_file_chooser_default_set_current_name): Likewise.
+
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	Fixes #307640:
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_should_respond): Oops, I broke SAVE
+	mode.  If the parent path is a folder, only create a subfolder if
+	we are in CREATE_FOLDER mode; if we are in SAVE mode, just return
+	and respond.  Also, pick up the case where the user types
+	"dirname/" instead of "dirname".
+	(check_save_entry): Make the return type void.  Add some return
+	parameters so that we can do more thorough checking.
+	(gtk_file_chooser_default_get_paths): If the file part is empty
+	and we are in SAVE mode, return an empty selection.
+
+2005-06-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserbutton.c (model_update_current_folder): 
+	Free the data of the row before overwriting it.  (#307490,
+	Kjartan Maraas)	
+
+2005-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkselection.c (gtk_target_list_add_image_targets): 
+	Don't leak the format names.  (#307190, Morten Welinder)
+
+2005-06-12  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gdk/x11/gdkasync.c: (send_event_handler): Merge
+	fix for a leak from HEAD. Bug #307281.
+
+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2005-06-09  Federico Mena Quintero  <federico@ximian.com>
+
+	Fixes #162358:
+
+	* gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't return
+	immediately if we are in CREATE_FOLDER mode, so that we can fill
+	the entry with the newly-selected folder.
+	(gtk_file_chooser_default_set_property): Warn against turning on
+	multiple selection for CREATE_FOLDER mode, or about setting that
+	action while multiple selection is on.
+	(update_chooser_entry): Change the entry's contents as well if we
+	are in CREATE_FOLDER mode.  If nothing is selected, clear the
+	chooser entry.
+	(trap_activate_cb): Don't trap enter/space if modifiers are
+	pressed.  This lets one use Ctrl-space to toggle rows in multiple
+	selection mode.
+	(gtk_file_chooser_default_should_respond): Clean up the if-chain
+	mess of special cases by using an array to determine what to do.
+	Also, for the save-entry case in CREATE_FOLDER mode, actually fix
+	the bug where the file chooser would switch to an existing folder
+	rather than confirming with it, and create the folder ourselves.
+	(error_creating_folder_over_existing_file_dialog): New function.
+
+	* gtk/gtkfilechooserentry.c (check_completion_callback): Only
+	insert the common prefix if we are in an "open" mode.  Use a
+	helper function.
+	(append_common_prefix): New helper function; code moved over from
+	check_completion_callback().
+	(find_common_prefix): New helper function.
+	(gtk_file_chooser_entry_focus): Append the common prefix if the
+	user requests it explicitly.
+
+2005-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdnd-x11.c (motif_drop_start, xdnd_drop_filter): Update
+	the user time on the window when a drop happens.  (#169364, Alexander
+	Hunziker, patch by Elijah Newren)
+
+2005-06-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): Check for
+	negative before appending the index, to avoid double error
+	message.  (#306393, Morten Welinder)
+
+	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): 
+	Don't crash if search_window is NULL.  (#304914, Victor Osadci,
+	testcase by Olaf Vitters)
+
+2005-06-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gtk/gtkfilechooserbutton.c: (update_label_and_image):
+	Plug a leak. Closes bug #306754.
+
+2005-06-03  Dom Lachowicz <cinamod@hotmail.com>
+
+	Merge from HEAD:
+	
+	* modules/engines/ms-windows/msw_style.c: Re-sync with gtk-wimp
+	* modules/engines/ms-windows/xp_theme.c: Ditto
+	* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: Ditto
+
+2005-06-05  Tor Lillqvist  <tml@novell.com>
+
+	* modules/engines/Makefile.am
+	* modules/input/Makefile.am: Decide whether to build the
+	ms-windows theme engine based on the GDK backend, not based on
+	platform. (I.e., if building for Cygwin with the X11 backend, we
+	shouldn't build the ms-windows engine, but if building for Cygwin
+	but with the Win32 backend, we should.) Ditto for the IME
+	(Windows) input module. (#305832)
+
+2005-06-04  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkcursor-win32.c
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkprivate-win32.h: Support full-colour cursors.
+	Support cursors with alpha on XP. Use code in common with the
+	support for alpha icons that already was present. (#306101, Tim
+	Evans)
+
+	* modules/engines/ms-windows/msw_style.c: Render insensitive icons
+	in a way that more closely matches Windows. (#305986, Tim Evans).
+
+	* modules/engines/ms-windows/Makefile.am (LDADDS): Link with
+	gdk-pixbuf.
+
+2005-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_tag): Queue the 
+	redisplay after modifying the tag in the btree, otherwise 
+	we end up showing the old tags until the next redraw comes 
+	around.   (#143537, Gary Kramlich, Peter Wainwright)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make 
+	autoscrolling work at the bottom of the screen.
+
+2005-05-26  Maciej Katafiasz  <email@mathrick.org>
+
+	* docs/reference/gtk/tmpl/gtkentry.sgml:
+	Point to GtkTextView instead of GtkText. Fixes bug #305535
+
+2005-05-26  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdrawable-win32.c (_gdk_win32_blit): If blitting
+	from the root window, take the multi-monitor offset into
+	account. (#305511)
+
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/clipboard.c: Demonstrate image copy-and-paste
+	and drag-and-drop.
+
+	* demos/gtk-demo/appwindow.c (do_appwindow): Set the window
+	icon by name.
+
+	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): Draw the 
+	background of rows insensitive when the treeview is insensitive.
+	(pointed out by Billy Biggs)
+
+	* gtk/gtkselection.c (gtk_target_list_add_image_targets): 
+	Make sure png comes first, otherwise dnd may use bmp by
+	default, loosing transparency.
+
+2005-05-25  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtktextview.c (blink_cb): block the text_layout's "changed"
+	handler when changing cursor visibility because it would expose
+	the whole paragraph where the cursor is. Instead, expose the
+	cursors' areas manually. (#173047).
+
+	(text_window_invalidate_cursors): new function which exposes the
+	cursors.
+
+	* gtk/gtkstyle.c (draw_insertion_cursor): added comment that the
+	same cursor size calculation is in text_window_invalidate_cursors().
+
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/editable_cells.c (create_items_model): Also
+	demonstrate GtkCellRendererProgress.
+
+	* demos/gtk-demo/Makefile.am (demos): 
+	* demos/gtk-demo/combobox.c: Add a demo showing combo box 
+	variations.
+
+	* demos/gtk-demo/Makefile.am (demos): 
+	* demos/gtk-demo/pickers.c: Add a demo showing all picker widgets.
+
+2005-05-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init):
+	Revert an accidental commit.
+
+	* gtk/gtkfilechooserdefault.c (filter_create): Don't grab
+	the focus away from the file list when operating the filter
+	combo with the pointer.  (#304844, Sven Neumann)
+
+2005-05-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (handle_special): Map VK_APPS to
+	GDK_Menu. (#172383, Ivan Wong)
+
+	* gdk/win32/gdkkeys-win32.c (handle_dead): If the keysym isn't one
+	of the special cases this function takes care of, use it as
+	such. This takes care of for instance the Bengali Virama, see bug
+	#165723.
+
+2005-05-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkimcontextsimple.c (check_table): Avoid a possible
+	buffer overrun.  (#142444, Leonard Michlmayr)
+
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): 
+	Use the correct function to conver the uri to a path.  (#304565,
+	Ismael Juma)
+
+	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the
+	Cancel button properly.  (#304234, Sven Neumann)
+
+	* gtk/gtkwidget.c (gtk_widget_add_events): Try harder to set
+	the event masks of descendent windows.  (#169821, Tommi Komulainen)
+
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkproperty-x11.c (gdk_property_get): Warn if
+	length overflows.  (#161520, Ian Wienand)
+
+2005-05-18  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkkeys-win32.c
+	* gdk/win32/gdkprivate-win32.h: Check the KF_EXTENDED bit in
+	lParam of WM_KEY* messages to distinguish between left and right
+	Control and Alt keys. Unfortunately, the right Shift key doesnt
+	set KF_EXTENDED, so to distinguish between left and right Shift
+	keys, check the scan code. (#304584)
+
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkscale.c (gtk_scale_class_init): Fix the default
+	values of draw-value and value-pos to be the values we
+	actually use in _init. (#304547, Mikael Hallendal)
+
+2005-05-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (cursor_blinks): Don't blink the cursor
+	if the text view is not editable.  
+
+	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
+	the popup posted if the button is released over the cellview.
+	This matches the behaviour of other combo box implementations.  
+	(#171378)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up 
+	and GDK_Page_Down twice.  (#168333, Hazael Maldonado Torres)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
+	the entry is not editable.  (#304171,Nikos Kouremenos)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
+	Make sure the action of the button and the dialog are in sync,
+	when the dialog is provided by the app.  (#303987, David A Knight)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkpango.c (gdk_pango_renderer_get_default): Fix a typo
+	in the docs.  (#303940, Masao Mutoh)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktoggleaction.c (connect_proxy): Be more careful when
+	casting.  (#304089, Philip Langdale)
+
+	* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only shrink
+	the label if we need to.  (#169390, Felix Riemann)
+
+2005-05-10  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Check
+	that GDK_IS_SCREEN(screen) (like the X11 backend does), not screen
+	== gdk_screen_get_default(), as that might return NULL when this
+	function is called.
+
+2005-05-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the
+	padding in RTL mode.  (#303572, Maciej Katafiasz)
+
+2005-05-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_get_width_mm) 
+	(gdk_screen_get_height_mm): Fix typos in the docs. (#303389,
+	Masao Mutoh)
+
+2005-05-06  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilesystemunix.c (fill_in_mime_type): Don't fill the mime
+	types if this is an AFS directory.
+	(fill_in_names): If we are in an AFS directory, set the MIME type
+	blindly to "x-directory/normal".
+
+2005-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always
+	initialize child-visible to FALSE, otherwise we may end up
+	with the wrong page visible initially.  (#302283, Patrik Fimml)
+
+	* gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders
+	appear insensitive in insensitive treeviews. 
+
+2005-05-04  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c gdk/x11/gdkwindow-x11.h: Fix a bug
+	in focus tracking when we move between has_pointer_focus and 
+	has_focus_window directly. (#109246, Billy Biggs, Niko Tyni 
+	and others)
+
+	* gdk/x11/gdkevents-x11.c: Also fix some extremely confusion
+	that could happen in the case of no window manager + keyboard grabs,
+	by moving to a more consistent model of when we pay attention
+	to mode=NotifyGrab/NotifyUngrab events.
+
+2005-05-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* tests/testfilechooser.c: Oops, remove mtrace() stuff.
+
+	Fixes #301068:
+
+	* gtk/gtkfilesystemunix.c (struct _GtkFileSystemUnix): Add fields
+	to store struct stat for /afs and /net, and boolean fields to say
+	whether these are valid.
+	(struct _GtkFileFolderUnix): Added a boolean is_network_dir field.
+	(gtk_file_system_unix_get_folder): Fill in the is_network_dir
+	field of the folder structure.
+	(fill_in_names): If the folder is a network directory, create a
+	fake struct stat for its entries.
+	(fill_in_stats): Don't stat() the children of network directories.
+
+	* gtk/gtkfilechooserdefault.c (list_mtime_data_func): If the mtime
+	is 0, use "Unknown" for the cell's displayed text.
+
+2005-05-02  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkmain.c (do_post_parse_initialization): return silently if
+	"gtk_initialized" is TRUE. Re-enables calling GTK's init functions
+	multiple times when using gtk_get_option_group(), just as one can
+	call gtk_init() multiple times without doing any harm.
+
+2005-05-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_expose_event): Propagate
+	the event to unanchored children in the text window.  
+	(#302494, Stephen Kennedy)
+
+2005-04-30  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Take
+	multi-monitor offset into account. (#302525)
+
+2005-04-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this
+	function, instead show the bin_window when it is created.
+
+	* gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't 
+	grab focus to unrealized widgets.  (#302240, Philip Langdale)
+
+	* gtk/gtktreeview.c (gtk_tree_view_state_changed): Set
+	background upon state changes.  (#301651, Billy Biggs)
+	(gtk_tree_view_get_path_at_pos): Take RTL into account
+	when iterating over the columns.  (#302163)
+
+	* configure.in: Check for nm.
+
+	* gtk/Makefile.am: Use $(NM), not nm directly. (#301299, 
+	Nguyen Thai Ngoc Duy)
+
+	* gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use
+	the internal unselect_all function, since we need the unselection
+	to happen even in browse mode.  (#300995, Mathias Hasselmann)
+
+	* gtk/gtkuimanager.c (update_node): Use g_object_notify() instead
+	of triggering a ::notify by re-setting the property.  (#300982,
+	Sven Neumann)
+
+	* gtk/gtkaction.c (connect_proxy): Use gtk_action_sync_tooltip().
+
+	* gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Also
+	scroll horizontally when necessary, and keep the northwest
+	corner of the item visible.  (#300913, Mathias Hasselmann)
+
+	* tests/testiconview.c: Add some more tests.
+
+	* gtk/gtkiconview.c (gtk_icon_view_select_path): Don't crash
+	if the path does not point to a row in the model.  (#300909,
+	Mathias Hasselmann)
+	(gtk_icon_view_rows_reordered): Re-layout here.  (#301009, 
+	Mathias Hasselmann)
+
+	* tests/testtext.c: Add some more attribute tests.
+
+	* gtk/gtktexttag.c (gtk_text_tag_class_init): Correct the documentation
+	of the rise property. String change, but it is more important to
+	be correct than to be translated.  (#301740)
+
+2005-04-25  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkfilesystemwin32.c
+	(gtk_file_system_win32_volume_get_display_name): Get volume name
+	also on Win9x. (#301798, Daniel Atallah)
+	(canonicalize_filename): Add explicit braces to silence compiler
+	warning.
+
+2005-04-24  Hans Breuer  <hans@breuer.org>
+
+	* gtk/stock-icons/makefile.msc : updated
+
+2005-04-22  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkmain.c: Initailize gettext before use. Calling
+	bindtextdomain() and bind_textdomain_codeset() in
+	do_post_parse_initialization() is too late. Put the calls in a new
+	function gettext_initialization(), and call that from
+	gtk_init_with_args() and gtk_parse_args(). Fixes #170948 for
+	GTK+'s part, but the same problem occurs also at least in
+	atk. Thanks to Robert Ögren, Daniel Atallah and Kevin Stange.
+
+2005-04-19  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match
+	character height instead of cell height. Fix #301228.
+
+2005-04-18  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove
+	obsolete assertion that the selected row can't be a volume; this
+	is handled by the "removable" column now.  Fixes #301017.
+
+2005-04-15  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
+	Patch from Christian Neumair <chris@gnome-de.org>; only select the
+	first row if we are in OPEN mode.  The only other case we were
+	letting pass through was SELECT_FOLDER, but selecting the first
+	row when changing folders confuses people when folders are
+	actually being selected.  Fixes #171885.
+
+2005-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.6.7 ====
+
+	* gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+	Revert the fix for #170727, since it causes problems
+	with user-specified accelerators. 
+
+	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+	Revert the changes to display broken images, since there
+	are applications which rely on the old behaviour.
+
+2005-04-11  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	Fix #300218:
+
+	* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Fix
+	C99ism.
+
+	* gtk/updateiconcache.c: Guard inclusion of unistd.h and
+	utime.h.
+
+2005-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version.
+
+2005-04-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.6 ===
+
+	* gdk/abicheck.sh: Handle duplicate symbols.
+
+	* NEWS: Updates
+
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkinput-xfree.c:
+	* gdk/x11/gdkinput-none.c:
+	* gdk/gtk.symbols: Some more fixes necessary to 
+	make building with gcc 4 work.
+
+	Add 16x16 versions of the zoom icons and of 
+	GTK_STOCK_INDEX. Some of the images were taken from 
+	the hicolor icon theme, and were originally created 
+	by Jakub Steiner and Tuomas Kuosmanen. 	(#167515, 
+	Vincent Noel)
+	
+	* gtk/stock-icons/stock_index_16.png:
+	* gtk/stock-icons/stock_zoom_1_16.png:
+	* gtk/stock-icons/stock_zoom_fit_16.png:
+	* gtk/stock-icons/stock_zoom_in_16.png:
+	* gtk/stock-icons/stock_zoom_out_16.png: New images.
+	
+	* gtk/stock-icons/Makefile.am: Add the new images. 
+
+	* gtk/gtkiconfactory.c (get_default_icons): Add the new 
+	images. 
+
+	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+	Don't display too many broken images.  (#169870, Roman
+	Kagan, patch by Ivan Wong)
+
+	* gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+	output.  (#300013, Tommi Komulainen)
+
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
 	* === Released 2.6.5 ===
 
 	* NEWS: Updates
@@ -53,7 +944,7 @@
 	* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): 
 	Ignore regions which fall completely outside the line.  
 	(#165862, Felipe Heidrich)
-	
+
 2005-04-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g, 

ChangeLog.pre-2-8

@@ -1,5 +1,896 @@
+2005-08-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.10 ===
+
+	* NEWS: Updates
+
+2005-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_grab_notify): Complete the 
+	backported fix.  
+
+2005-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	Backported fixes from 2.8:
+	
+	* gtk/gtkmenu.c (gtk_menu_grab_notify): Take window
+	groups into account.  (#309473, Diego Gonzalez)
+
+	* gtk/gtkwindow.[hc]: Add a non-exported function to
+	get the grab widget of a window group.
+
+	* gtk/gtkicontheme.c: When changing the icon theme, defer
+	the resetting of rc styles to an idle, so that it does
+	not happen e.g during expose handling (which is problematic,
+	since some widgets, like the toolbar, are changing the
+	hierarchy in response to style changes).  (#300539, reported
+	by many people, analyzed by Owen Taylor)
+
+Fri Aug  5 16:54:19 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkmenutoolbutton.c
+	(gtk_menu_tool_button_construct_contents): Set the relief of the
+	arrow button to the value returned by
+	gtk_tool_item_get_relief_style(). Patch from Benjamin Berg.
+	Bug 312695.
+
+2005-08-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.6.9 ===
+
+	* gtk/gtkuimanager.c (update_node): Update tooltips when 
+	reconnecting toolitems.  (#312173, Alex Graveley)
+
+	* gtk/gtkclipboard.c (gtk_clipboard_set_image) 
+	(gtk_clipboard_set_text): Don't leak atom names.  (#311933,
+	Peter Zelezny)
+
+	* gtk/gtkmain.c (do_post_parse_initialization): Call
+	gettext_initialization() here as well.  (#311612, Dan Winship)
+
+2005-07-30  Hans Breuer  <hans@breuer.org>
+
+	* gtk/makefile.msc.in : updated
+
+2005-07-29  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdrawable-win32.c (blit_inside_drawable): Rename
+	from blit_inside_window(), as it now does blitting inside a
+	bitmap, too. No code change, still just call BitBlt().
+	(_gdk_win32_blit): Check for source equalling destination
+	first. (#169508, #131977) 
+	Do away with the superfluous local draw_impl variable, the
+	parameter to this function is already a GdkDrawableImplWin32*, no
+	need to copy and cast it.
+
+2005-07-28  Robert Ögren  <gtk@roboros.com>
+
+	Avoid spurious core pointer events when the tablet pen is lifted.
+	(#167000)
+
+	* gdk/win32/gdkinput-win32.c (set_ignore_core): New static function,
+	handles delayed unsetting of _gdk_input_ignore_core.
+	(_gdk_input_other_event): Call set_ignore_core instead of setting
+	_gdk_input_ignore_core directly.
+
+2005-07-27  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkmain-win32.c (_gdk_win32_psstyle_to_string): Handle
+	PS_ALTERNATE, too.
+
+	* gdk/win32/gdkmain-win32.c (gdk_screen_get_height_mm): Fix for
+	multi-monitor cases. (#311677, Tim Evans)
+
+2005-07-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2005-07-21  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "hy" to ALL_LINGUAS.
+
+2005-07-21  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
+	wide-char API when available. (#311079, Peter Zelezny)
+
+2005-07-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdnd.c (gtk_drag_begin_internal): Don't fail if we
+	can't get a keyboard grab.  (#168351)
+
+2005-07-19  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate
+	past the end of the string, so pango_layout_get_cursor_pos() won't
+	complain. (#309211, Tommi Komulainen).
+
+2005-07-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
+	gettext_initialization before checking gtk_initialized, otherwise
+	there are scenarios where it is not called at all. For an
+	example, see tests/testfilechooserbutton.c.  (#310323, 
+	Arkady L. Shane)
+
+2005-07-14  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkfilesystemwin32.c (filename_get_info): Implement getting
+	the MIME type of a file. Look it up in the Registry. Bug reported
+	by Hans Oesterholt.
+
+2005-07-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkicontheme.c (load_themes): Don't keep the caches
+	for unthemed directories in a separate list, instead append
+	them at the end of the dir_mtimes list, so that we can check
+	them for staleness like the other caches.  (#310221, Mark 
+	McLoughlin)
+
+2005-07-13  Robert Ögren  <gtk@roboros.com>
+
+	Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust
+	on Windows. (#167004, thanks to	"pnohant" for testing)
+
+	Code cleanup: Remove the unused and unmaintained code for using a
+	non-system tablet context (USE_SYSCONTEXT ifdef:s), suggested
+	by Tor Lillqvist.
+
+	* gdk/win32/gdkinput-win32.c (_gdk_input_wintab_init_check): Handle
+	tablet drivers that don't support WTI_DDCTXS/WTI_DSCTXS gracefully.
+	Sligthly reorganize and simplify the code to support this.
+	(_gdk_input_wintab_init_check, _gdk_input_other_event): Remove
+	USE_SYSCONTEXT ifdef:s and the code for the case it was not defined.
+	(gdk_input_window_find_within): Removed.
+
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.  
+	(#162979, Paul Cornett)
+
+	* gtk/gtkhscale.c (gtk_hscale_new_with_range): 
+	(gtk_vscale_new_with_range): Add some additional docs on 
+	precision here too.  (#309238, Steve Chaplin)
+
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	Implement Drag-and-Drop to the file list.  (#145121, Sven Neumann)
+	
+	* gtk/gtkfilechooserdefault.c (file_list_drag_data_received_cb) 
+	(file_list_drag_drop_cb, file_list_drag_motion_cb): New functions
+	to handle drag-and-drop on the file list.
+	(create_file_list): Set up drag-and-drop handlers on the file list.
+
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	Fix #157787, reported by Jonathan Blandford: 
+	
+	* gtk/gtkfilechooserdefault.c 
+	(gtk_file_chooser_default_set_current_folder): Don't leave a 
+	"trail" behind when set_current_folder is called explicitly.
+	(gtk_file_chooser_default_update_current_folder): New function
+	that is called to update the current folder in response to
+	user actions.
+
+	* gtk/gtkpathbar.c (_gtk_path_bar_set_path): Add a boolean
+	keep_trail argument, and don't leave a "trail" behind unless
+	it is set.
+
+2005-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): Add some
+	additional docs on precision.  (#309238, Steve Chaplin)
+
+2005-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/imime.c: Fix includes.  (#309462, Kazuki IWAMOTO)
+
+2005-07-03  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_vertical_autoscroll): remove
+	stray debugging g_prints.
+
+2005-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
+	loop when G_FILENAME_ENCODING is invalid.  (#309280, Padraig Brady)
+
+2005-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkvisual-x11.c (gdk_visual_decompose_mask): Avoid
+	infinite loop if a mask is zero.  (#309222, David Saxton)
+
+	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): 
+	Clarify the code, gcc 4 complains about predecrement in  MAX().
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Don't prematurely unregister callbacks.
+
+2005-06-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Avoid a segfault.  (#309054)
+
+	* gtk/gtkmenu.c (gtk_menu_grab_notify): Cancel menus when
+	they are grab-shadowed by something thats not a
+	submenu.  (#145416, Euan MacGregor)
+
+2005-06-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Unregister XIM callbacks here.  (#309054)
+
+2005-06-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't
+	jump to the next line if we are at the end of the line.  
+	(gtk_text_view_move_cursor_internal): Make movement by
+	paragraphs up/down symmetric.  (#307055, Behnam Esfahbod)
+
+2005-06-23  Tor Lillqvist  <tml@novell.com>
+
+	Improve and simplify line segment rendering on Win32, especially
+	the implementation of GDK_CAP_NOT_LAST, and dashed lines. Fixes
+	bugs #306396 and #308413.
+
+	* gdk/win32/gdkprivate-win32.h (GdkGCWin32): Save the GdkGC's
+	line_style, cap_style and join_style as such in the
+	GdkGCWin32. Don't need to keep the pen_double_dash flag, we can
+	check the line_style.
+
+	* gdk/win32/gdkgc-win32.c (fixup_pen): New internal function. Sets
+	up the GDI pen type, style, end cap and join attributes to use
+	based on the pen width, GDK line style, end cap style, and join
+	style.
+
+	For a narrow (zero-width) GDK pen with the GDK_CAP_NOT_LAST end
+	cap style, which typically are used for XOR drawing where it is
+	essential that the last pixel is not drawn, use a GDI cosmetic
+	pen. Only for a cosmetic pen does GDI not draw the last pixel. I
+	deduced this by experimetation, the documentation is rather vague.
+
+	For other GDK pens use a geometric GDI pen. If the width is 0 or 1
+	and the GDK end cap style is GDK_CAP_BUTT, and the line style is
+	GDK_LINE_SOLID, use PS_ENDCAP_ROUND. This ensures that also
+	single-pixel length lines are drawn. (For sngle-pixel width lines
+	roundness as such is of course irrelevant.) For dashed lines, use
+	PS_ENDCAP_FLAT.
+
+	For wide lines use PS_ENDCAP_FLAT, _ROUND or _SQUARE,
+	respectively, for GDK_CAP_BUTT, GDK_CAP_ROUND and GDK_CAP_PROJECTING.
+
+	For one pixel on-off dashed lines, use PS_ALTERNATE, it seems to
+	work better than PS_USERSTYLE. For other dashed lines, use
+	PS_USERSTYLE and the dashes as set by the user (or the default
+	four-pixel on-off style).
+
+	(gdk_win32_gc_values_to_win32values, gdk_win32_gc_set_dashes):
+	Call fixup_pen() to do the pen settings after modifying some of
+	the GDK GC attributes that affect pens.
+
+	* gdk/win32/gdkdrawable-win32.c (render_line_horizontal,
+	render_line_vertical, draw_segments): Check GdkGCWin32::line_style
+	instead of the the removed pen_double_dash member. Don't use
+	PATCOPY unconditionally in the PatBlt() call, use a raster op
+	code that depends on the GC function in use.
+
+	(draw_rectangle, draw_segments, draw_lines): Be more careful in
+	deciding when to do the manual dash rendering.
+
+	(draw_segments): Don't do any manual "last point" drawing at
+	all. The above changes takes care of narrow line segments being
+	drawn correctly in most cases, at least on NT-based Windows.
+
+2005-06-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): 
+	Fix an error in the cache timeout logic.  (#166601, Morten
+	Welinder)
+
+	* gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Remove
+	a leftover debugging envvar.  
+
+2005-06-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdnd-x11.c (xdnd_finished_filter): Set the
+	time field in the event.  (#308573, Morten Welinder)
+
+	* gtk/gtkbutton.c (gtk_button_construct_child): Don't
+	trigger warnings if there are extra references to the
+	hbox.  (#308677, Dan Winship)
+
+	* gtk/gtkfilesystemunix.c: Ignore everything after the
+	first space in lines from the .gtk-bookmarks file.
+
+2005-06-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdnd.c (gtk_drag_source_set): Connect to 
+	button-release-event as well, to handle touchscreen 
+	scenarios better.  (#171490, Markku Vire)
+
+2005-06-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconcache.c: Handle missing MAP_FAILED.  (#308449, Georg
+	Schwarz) 
+
+2005-06-17  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Set the actions
+	and suggested_action fields in the GdkDragContext to
+	GDK_ACTION_COPY. Otherwise apps that check the suggested_action
+	field, like eog, won't accept dropped files.
+
+2005-06-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_complete): 
+	Resize the popup if necessary.  (#308076, Vincent Noel)
+
+	* gtk/gtkwindow.c (gtk_window_real_set_focus): Queue a
+	draw on the old and new focus widgets, if their defaultness
+	changes.  (#305607, Billy Biggs)
+
+2005-06-16  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkmain.c (g_win32_locale_filename_from_utf8): [Win32]
+	Borrow this function from GLib HEAD.
+	(_gtk_get_localedir): [Win32] Make sure the run-time locale
+	directory is in system codepage, as it is passed to the
+	non-UTF8-aware gettext library.
+
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+	
+	* configure.in: Bump version
+
+	* === Released 2.6.8 ===
+
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: More updates, move bug numbers to my
+	separate list of bugs, which will get merged into
+	the announcement. For 2.8.0, I will try a somewhat
+	different style for the NEWS, and list bugs and
+	contributors separately from features.
+
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	* NEWS: Fill in with GtkFileChooser bugs.
+
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #302087:
+
+	* gtk/gtkfilechooserdefault.c (list_selection_changed): Emit
+	"selection-changed" and do the normal housekeeping even if we are
+	in SAVE mode and there is nothing selected.  We didn't emit that
+	signal if we were in SAVE mode and unselect_all() got called.
+	(gtk_file_chooser_default_unselect_all): Call
+	pending_select_paths_free() so that we cancel any asynchronous
+	selections.
+	(gtk_file_chooser_default_set_current_name): Likewise.
+
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	Fixes #307640:
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_should_respond): Oops, I broke SAVE
+	mode.  If the parent path is a folder, only create a subfolder if
+	we are in CREATE_FOLDER mode; if we are in SAVE mode, just return
+	and respond.  Also, pick up the case where the user types
+	"dirname/" instead of "dirname".
+	(check_save_entry): Make the return type void.  Add some return
+	parameters so that we can do more thorough checking.
+	(gtk_file_chooser_default_get_paths): If the file part is empty
+	and we are in SAVE mode, return an empty selection.
+
+2005-06-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserbutton.c (model_update_current_folder): 
+	Free the data of the row before overwriting it.  (#307490,
+	Kjartan Maraas)	
+
+2005-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkselection.c (gtk_target_list_add_image_targets): 
+	Don't leak the format names.  (#307190, Morten Welinder)
+
+2005-06-12  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gdk/x11/gdkasync.c: (send_event_handler): Merge
+	fix for a leak from HEAD. Bug #307281.
+
+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2005-06-09  Federico Mena Quintero  <federico@ximian.com>
+
+	Fixes #162358:
+
+	* gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't return
+	immediately if we are in CREATE_FOLDER mode, so that we can fill
+	the entry with the newly-selected folder.
+	(gtk_file_chooser_default_set_property): Warn against turning on
+	multiple selection for CREATE_FOLDER mode, or about setting that
+	action while multiple selection is on.
+	(update_chooser_entry): Change the entry's contents as well if we
+	are in CREATE_FOLDER mode.  If nothing is selected, clear the
+	chooser entry.
+	(trap_activate_cb): Don't trap enter/space if modifiers are
+	pressed.  This lets one use Ctrl-space to toggle rows in multiple
+	selection mode.
+	(gtk_file_chooser_default_should_respond): Clean up the if-chain
+	mess of special cases by using an array to determine what to do.
+	Also, for the save-entry case in CREATE_FOLDER mode, actually fix
+	the bug where the file chooser would switch to an existing folder
+	rather than confirming with it, and create the folder ourselves.
+	(error_creating_folder_over_existing_file_dialog): New function.
+
+	* gtk/gtkfilechooserentry.c (check_completion_callback): Only
+	insert the common prefix if we are in an "open" mode.  Use a
+	helper function.
+	(append_common_prefix): New helper function; code moved over from
+	check_completion_callback().
+	(find_common_prefix): New helper function.
+	(gtk_file_chooser_entry_focus): Append the common prefix if the
+	user requests it explicitly.
+
+2005-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdnd-x11.c (motif_drop_start, xdnd_drop_filter): Update
+	the user time on the window when a drop happens.  (#169364, Alexander
+	Hunziker, patch by Elijah Newren)
+
+2005-06-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): Check for
+	negative before appending the index, to avoid double error
+	message.  (#306393, Morten Welinder)
+
+	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): 
+	Don't crash if search_window is NULL.  (#304914, Victor Osadci,
+	testcase by Olaf Vitters)
+
+2005-06-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gtk/gtkfilechooserbutton.c: (update_label_and_image):
+	Plug a leak. Closes bug #306754.
+
+2005-06-03  Dom Lachowicz <cinamod@hotmail.com>
+
+	Merge from HEAD:
+	
+	* modules/engines/ms-windows/msw_style.c: Re-sync with gtk-wimp
+	* modules/engines/ms-windows/xp_theme.c: Ditto
+	* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: Ditto
+
+2005-06-05  Tor Lillqvist  <tml@novell.com>
+
+	* modules/engines/Makefile.am
+	* modules/input/Makefile.am: Decide whether to build the
+	ms-windows theme engine based on the GDK backend, not based on
+	platform. (I.e., if building for Cygwin with the X11 backend, we
+	shouldn't build the ms-windows engine, but if building for Cygwin
+	but with the Win32 backend, we should.) Ditto for the IME
+	(Windows) input module. (#305832)
+
+2005-06-04  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkcursor-win32.c
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkprivate-win32.h: Support full-colour cursors.
+	Support cursors with alpha on XP. Use code in common with the
+	support for alpha icons that already was present. (#306101, Tim
+	Evans)
+
+	* modules/engines/ms-windows/msw_style.c: Render insensitive icons
+	in a way that more closely matches Windows. (#305986, Tim Evans).
+
+	* modules/engines/ms-windows/Makefile.am (LDADDS): Link with
+	gdk-pixbuf.
+
+2005-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_tag): Queue the 
+	redisplay after modifying the tag in the btree, otherwise 
+	we end up showing the old tags until the next redraw comes 
+	around.   (#143537, Gary Kramlich, Peter Wainwright)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make 
+	autoscrolling work at the bottom of the screen.
+
+2005-05-26  Maciej Katafiasz  <email@mathrick.org>
+
+	* docs/reference/gtk/tmpl/gtkentry.sgml:
+	Point to GtkTextView instead of GtkText. Fixes bug #305535
+
+2005-05-26  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdrawable-win32.c (_gdk_win32_blit): If blitting
+	from the root window, take the multi-monitor offset into
+	account. (#305511)
+
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/clipboard.c: Demonstrate image copy-and-paste
+	and drag-and-drop.
+
+	* demos/gtk-demo/appwindow.c (do_appwindow): Set the window
+	icon by name.
+
+	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): Draw the 
+	background of rows insensitive when the treeview is insensitive.
+	(pointed out by Billy Biggs)
+
+	* gtk/gtkselection.c (gtk_target_list_add_image_targets): 
+	Make sure png comes first, otherwise dnd may use bmp by
+	default, loosing transparency.
+
+2005-05-25  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtktextview.c (blink_cb): block the text_layout's "changed"
+	handler when changing cursor visibility because it would expose
+	the whole paragraph where the cursor is. Instead, expose the
+	cursors' areas manually. (#173047).
+
+	(text_window_invalidate_cursors): new function which exposes the
+	cursors.
+
+	* gtk/gtkstyle.c (draw_insertion_cursor): added comment that the
+	same cursor size calculation is in text_window_invalidate_cursors().
+
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/editable_cells.c (create_items_model): Also
+	demonstrate GtkCellRendererProgress.
+
+	* demos/gtk-demo/Makefile.am (demos): 
+	* demos/gtk-demo/combobox.c: Add a demo showing combo box 
+	variations.
+
+	* demos/gtk-demo/Makefile.am (demos): 
+	* demos/gtk-demo/pickers.c: Add a demo showing all picker widgets.
+
+2005-05-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init):
+	Revert an accidental commit.
+
+	* gtk/gtkfilechooserdefault.c (filter_create): Don't grab
+	the focus away from the file list when operating the filter
+	combo with the pointer.  (#304844, Sven Neumann)
+
+2005-05-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (handle_special): Map VK_APPS to
+	GDK_Menu. (#172383, Ivan Wong)
+
+	* gdk/win32/gdkkeys-win32.c (handle_dead): If the keysym isn't one
+	of the special cases this function takes care of, use it as
+	such. This takes care of for instance the Bengali Virama, see bug
+	#165723.
+
+2005-05-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkimcontextsimple.c (check_table): Avoid a possible
+	buffer overrun.  (#142444, Leonard Michlmayr)
+
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): 
+	Use the correct function to conver the uri to a path.  (#304565,
+	Ismael Juma)
+
+	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the
+	Cancel button properly.  (#304234, Sven Neumann)
+
+	* gtk/gtkwidget.c (gtk_widget_add_events): Try harder to set
+	the event masks of descendent windows.  (#169821, Tommi Komulainen)
+
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkproperty-x11.c (gdk_property_get): Warn if
+	length overflows.  (#161520, Ian Wienand)
+
+2005-05-18  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkkeys-win32.c
+	* gdk/win32/gdkprivate-win32.h: Check the KF_EXTENDED bit in
+	lParam of WM_KEY* messages to distinguish between left and right
+	Control and Alt keys. Unfortunately, the right Shift key doesnt
+	set KF_EXTENDED, so to distinguish between left and right Shift
+	keys, check the scan code. (#304584)
+
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkscale.c (gtk_scale_class_init): Fix the default
+	values of draw-value and value-pos to be the values we
+	actually use in _init. (#304547, Mikael Hallendal)
+
+2005-05-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (cursor_blinks): Don't blink the cursor
+	if the text view is not editable.  
+
+	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
+	the popup posted if the button is released over the cellview.
+	This matches the behaviour of other combo box implementations.  
+	(#171378)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up 
+	and GDK_Page_Down twice.  (#168333, Hazael Maldonado Torres)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
+	the entry is not editable.  (#304171,Nikos Kouremenos)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
+	Make sure the action of the button and the dialog are in sync,
+	when the dialog is provided by the app.  (#303987, David A Knight)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkpango.c (gdk_pango_renderer_get_default): Fix a typo
+	in the docs.  (#303940, Masao Mutoh)
+
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktoggleaction.c (connect_proxy): Be more careful when
+	casting.  (#304089, Philip Langdale)
+
+	* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only shrink
+	the label if we need to.  (#169390, Felix Riemann)
+
+2005-05-10  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Check
+	that GDK_IS_SCREEN(screen) (like the X11 backend does), not screen
+	== gdk_screen_get_default(), as that might return NULL when this
+	function is called.
+
+2005-05-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the
+	padding in RTL mode.  (#303572, Maciej Katafiasz)
+
+2005-05-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_get_width_mm) 
+	(gdk_screen_get_height_mm): Fix typos in the docs. (#303389,
+	Masao Mutoh)
+
+2005-05-06  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilesystemunix.c (fill_in_mime_type): Don't fill the mime
+	types if this is an AFS directory.
+	(fill_in_names): If we are in an AFS directory, set the MIME type
+	blindly to "x-directory/normal".
+
+2005-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always
+	initialize child-visible to FALSE, otherwise we may end up
+	with the wrong page visible initially.  (#302283, Patrik Fimml)
+
+	* gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders
+	appear insensitive in insensitive treeviews. 
+
+2005-05-04  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c gdk/x11/gdkwindow-x11.h: Fix a bug
+	in focus tracking when we move between has_pointer_focus and 
+	has_focus_window directly. (#109246, Billy Biggs, Niko Tyni 
+	and others)
+
+	* gdk/x11/gdkevents-x11.c: Also fix some extremely confusion
+	that could happen in the case of no window manager + keyboard grabs,
+	by moving to a more consistent model of when we pay attention
+	to mode=NotifyGrab/NotifyUngrab events.
+
+2005-05-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* tests/testfilechooser.c: Oops, remove mtrace() stuff.
+
+	Fixes #301068:
+
+	* gtk/gtkfilesystemunix.c (struct _GtkFileSystemUnix): Add fields
+	to store struct stat for /afs and /net, and boolean fields to say
+	whether these are valid.
+	(struct _GtkFileFolderUnix): Added a boolean is_network_dir field.
+	(gtk_file_system_unix_get_folder): Fill in the is_network_dir
+	field of the folder structure.
+	(fill_in_names): If the folder is a network directory, create a
+	fake struct stat for its entries.
+	(fill_in_stats): Don't stat() the children of network directories.
+
+	* gtk/gtkfilechooserdefault.c (list_mtime_data_func): If the mtime
+	is 0, use "Unknown" for the cell's displayed text.
+
+2005-05-02  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkmain.c (do_post_parse_initialization): return silently if
+	"gtk_initialized" is TRUE. Re-enables calling GTK's init functions
+	multiple times when using gtk_get_option_group(), just as one can
+	call gtk_init() multiple times without doing any harm.
+
+2005-05-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_expose_event): Propagate
+	the event to unanchored children in the text window.  
+	(#302494, Stephen Kennedy)
+
+2005-04-30  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Take
+	multi-monitor offset into account. (#302525)
+
+2005-04-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this
+	function, instead show the bin_window when it is created.
+
+	* gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't 
+	grab focus to unrealized widgets.  (#302240, Philip Langdale)
+
+	* gtk/gtktreeview.c (gtk_tree_view_state_changed): Set
+	background upon state changes.  (#301651, Billy Biggs)
+	(gtk_tree_view_get_path_at_pos): Take RTL into account
+	when iterating over the columns.  (#302163)
+
+	* configure.in: Check for nm.
+
+	* gtk/Makefile.am: Use $(NM), not nm directly. (#301299, 
+	Nguyen Thai Ngoc Duy)
+
+	* gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use
+	the internal unselect_all function, since we need the unselection
+	to happen even in browse mode.  (#300995, Mathias Hasselmann)
+
+	* gtk/gtkuimanager.c (update_node): Use g_object_notify() instead
+	of triggering a ::notify by re-setting the property.  (#300982,
+	Sven Neumann)
+
+	* gtk/gtkaction.c (connect_proxy): Use gtk_action_sync_tooltip().
+
+	* gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Also
+	scroll horizontally when necessary, and keep the northwest
+	corner of the item visible.  (#300913, Mathias Hasselmann)
+
+	* tests/testiconview.c: Add some more tests.
+
+	* gtk/gtkiconview.c (gtk_icon_view_select_path): Don't crash
+	if the path does not point to a row in the model.  (#300909,
+	Mathias Hasselmann)
+	(gtk_icon_view_rows_reordered): Re-layout here.  (#301009, 
+	Mathias Hasselmann)
+
+	* tests/testtext.c: Add some more attribute tests.
+
+	* gtk/gtktexttag.c (gtk_text_tag_class_init): Correct the documentation
+	of the rise property. String change, but it is more important to
+	be correct than to be translated.  (#301740)
+
+2005-04-25  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkfilesystemwin32.c
+	(gtk_file_system_win32_volume_get_display_name): Get volume name
+	also on Win9x. (#301798, Daniel Atallah)
+	(canonicalize_filename): Add explicit braces to silence compiler
+	warning.
+
+2005-04-24  Hans Breuer  <hans@breuer.org>
+
+	* gtk/stock-icons/makefile.msc : updated
+
+2005-04-22  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkmain.c: Initailize gettext before use. Calling
+	bindtextdomain() and bind_textdomain_codeset() in
+	do_post_parse_initialization() is too late. Put the calls in a new
+	function gettext_initialization(), and call that from
+	gtk_init_with_args() and gtk_parse_args(). Fixes #170948 for
+	GTK+'s part, but the same problem occurs also at least in
+	atk. Thanks to Robert Ögren, Daniel Atallah and Kevin Stange.
+
+2005-04-19  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match
+	character height instead of cell height. Fix #301228.
+
+2005-04-18  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove
+	obsolete assertion that the selected row can't be a volume; this
+	is handled by the "removable" column now.  Fixes #301017.
+
+2005-04-15  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
+	Patch from Christian Neumair <chris@gnome-de.org>; only select the
+	first row if we are in OPEN mode.  The only other case we were
+	letting pass through was SELECT_FOLDER, but selecting the first
+	row when changing folders confuses people when folders are
+	actually being selected.  Fixes #171885.
+
+2005-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.6.7 ====
+
+	* gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+	Revert the fix for #170727, since it causes problems
+	with user-specified accelerators. 
+
+	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+	Revert the changes to display broken images, since there
+	are applications which rely on the old behaviour.
+
+2005-04-11  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	Fix #300218:
+
+	* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Fix
+	C99ism.
+
+	* gtk/updateiconcache.c: Guard inclusion of unistd.h and
+	utime.h.
+
+2005-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version.
+
+2005-04-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.6 ===
+
+	* gdk/abicheck.sh: Handle duplicate symbols.
+
+	* NEWS: Updates
+
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkinput-xfree.c:
+	* gdk/x11/gdkinput-none.c:
+	* gdk/gtk.symbols: Some more fixes necessary to 
+	make building with gcc 4 work.
+
+	Add 16x16 versions of the zoom icons and of 
+	GTK_STOCK_INDEX. Some of the images were taken from 
+	the hicolor icon theme, and were originally created 
+	by Jakub Steiner and Tuomas Kuosmanen. 	(#167515, 
+	Vincent Noel)
+	
+	* gtk/stock-icons/stock_index_16.png:
+	* gtk/stock-icons/stock_zoom_1_16.png:
+	* gtk/stock-icons/stock_zoom_fit_16.png:
+	* gtk/stock-icons/stock_zoom_in_16.png:
+	* gtk/stock-icons/stock_zoom_out_16.png: New images.
+	
+	* gtk/stock-icons/Makefile.am: Add the new images. 
+
+	* gtk/gtkiconfactory.c (get_default_icons): Add the new 
+	images. 
+
+	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+	Don't display too many broken images.  (#169870, Roman
+	Kagan, patch by Ivan Wong)
+
+	* gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+	output.  (#300013, Tommi Komulainen)
+
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
 	* === Released 2.6.5 ===
 
 	* NEWS: Updates
@@ -53,7 +944,7 @@
 	* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): 
 	Ignore regions which fall completely outside the line.  
 	(#165862, Felipe Heidrich)
-	
+
 2005-04-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g, 

INSTALL

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

NEWS

@@ -1,3 +1,97 @@
+Overview of Changes from GTK+ 2.6.9 to GTK+ 2.6.10
+==================================================
+* Fix an crasher bug when using submenus together
+  with window groups. This bug affected epiphany.
+* Fix bug that can lead to segfaults when icon 
+  themes are updated.
+* Updated translations (et,ne)
+
+Overview of Changes from GTK+ 2.6.8 to GTK+ 2.6.9
+=================================================
+* GtkFileChooser
+ - Don't leave a "trail" when then current folder
+   is explicitly set [Jonathan Blandford]
+ - Accept file drops on the file list [Sven Neumann]
+* Accept GTK+ 2.8 .gtk-bookmarks files [Matthias]
+* Make paragraph up/down keynav in GtkTextView
+  symmetric [Behnam Esfahbod]
+* Win32 
+ - Bug fixes [Tor Lillqvist, Kazuki Iwamoto, Peter
+   Zelezny, Tim Evans, Hans Breuer]
+ - Improve and simply line segment rendering [Tor]
+ - Fix handling of Aiptek tablets [Robert  Ögren]
+* Other bug fixes [Billy Biggs, Vincent Noel, 
+  Georg Schwarz, Markku Vire, Dan Winship, Morten 
+  Welinder, Matthias, Euan MacGregor, David Saxton, 
+  Padraig Brady, Paul Cornett, Mark McLoughlin, 
+  Hans Oesterholt, Arkady L. Shane, Tommi Komulainen, 
+  Peter S. Mazinger, Dan Winship, Peter Zelezny,
+  Alex Graveley]
+* Documentation improvements [Steve Chaplin, Matthias]
+* New and updated translations (cs,cy,da,de,en_CA,es,et,
+  fr,gl,gu,hu,hy,ja,ko,nl,sq,sr,sr@Latn,sv,zh_CN,zh_TW)
+
+Overview of Changes from GTK+ 2.6.7 to GTK+ 2.6.8
+=================================================
+* GtkFileChooser
+ - Don't select first row in SELECT_FOLDER mode [Christian Neumair]
+ - Improve autocompletion behaviour; fix CREATE_FOLDER mode [Federico 
+   Mena Quintero]
+ - Don't stat children of /afs or /net network directories [Federico]
+ - Fix set_current_name() and unselect_all() in the light of asynchronous 
+   selections [Federico]
+ - GtkFileChooserButton fixes [David A. Knight]
+ - Miscellaneous fixes [Federico, Sven Neumann, Kjartan Maraas]
+* GtkIconView
+ - Many fixes for scrolling and selection handling [Mathias Hasselmann]
+* GtkTreeView
+ - Fix insensitive appearance [Billy Biggs, Matthias Clasen]
+* GtkEntry 
+ - Don't blink the cursor if the entry is not editable [Nikos Kouremenos]
+* GtkTextView 
+ - Optimize cursor blinking [Michael Natterer]
+ - Don't blink the cursor if the entry is not editable [Nikos]
+* GtkAlignment
+ - Flip padding in RTL mode [Maciej Katafiasz]
+* Fix a bug in focus tracking that lead to problems between some
+  window managers and GTK+ applications. [Owen Taylor, Billy Biggs,
+  Niko Tyni]
+* gtk-demo
+ - Add demos for 2.6 features [Matthias]
+* Win32 changes
+ - Initialize gettext before use [Robert Ögren, Daniel Atallah, 
+   Kevin Stange]
+ - Fix DND on multi-monitor systems [Tor Lillqvist]
+ - Improve handling of special and dead keys [Tor, Ivan Wong Yat Cheung]
+ - Improve rendering of insensitive icons [Tim Evans]
+ - Support RGBA cursors [Tim]
+ - Bug fixes [Ivan, Hans Breuer, Tor, Daniel]
+* Other bug fixes [Federico, Sven Neumann, Nguyen Thai Ngoc Duy, 
+  Philip Langdale, Stephen Kennedy, Michael, Pattrick Fimml, 
+  Felix Riemann, David A. Knight, Hazael Maldonado Torres, 
+  Mikael Hallendal, Ian Wienand, Tommi Komulainen, Ismael Juma, 
+  Leonard Michlmayr, Matthias, Gary Kramlich, Peter Wainwright, 
+  Dom Lachowicz, Kjartan Maraas, Victor Osadci, Olaf Vitters, 
+  Morten Welinder, Alexander Hunziker, Elijah Newren, Frederic 
+  Crozat, Joerg Sonnenberger, John Ehresman]
+* Documentation improvements [Matthias, Masao Mutoh, Maciej,
+  Richard Hult, Ghorban M. Tavakoly]
+* New and updated translations (cs,cy,da,de,en_GB,et,eu,fr,gu,hu,id,
+  nn,ru,sv,th,xh,zh_CN)
+
+Overview of Changes from GTK+ 2.6.6 to GTK+ 2.6.7
+=================================================
+* Revert two fixes from 2.6.5 which were causing
+  problems  [Crispin Flowerday]
+* New and updated translations (bg,ja,ko,ca)
+
+Overview of Changes from GTK+ 2.6.5 to GTK+ 2.6.6
+=================================================
+* Add 16x16 versions for some stock icons [Vincent Noel]
+* Bug fixes [Tommi Komulainen, Roman Kagan, Ivan Wong,
+  Matthias Clasen, Jakub Jelinek, Arjan van de Ven]
+* New and improved translations (pl)
+
 Overview of Changes from GTK+ 2.6.4 to GTK+ 2.6.5
 =================================================
 * Fix compilation with gcc 4.0 [Matthias Clasen]

README

@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.6.5. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.6.10. 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.

configure.in

@@ -12,10 +12,10 @@ AC_PREREQ(2.54)
 
 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [6])
-m4_define([gtk_micro_version], [5])
+m4_define([gtk_micro_version], [10])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [5])
+m4_define([gtk_interface_age], [10])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 # This is the X.Y used in -lgtk-FOO-X.Y
@@ -150,6 +150,7 @@ AM_PROG_LIBTOOL
 AC_SYS_LARGEFILE
 
 AM_PROG_AS
+AC_PATH_PROG(NM, nm, nm)
 
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
@@ -418,7 +419,7 @@ fi
 # sure that both po/ and po-properties/ have .po files that correspond
 # to your language.  If you only add one to po/, the build will break
 # in po-properties/.
-ALL_LINGUAS="af am ar az az_IR be bg bn br bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu ia id is it ja ko li lt lv mi mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tk tr uk uz uz@Latn vi wa xh yi zh_CN zh_TW"
+ALL_LINGUAS="af am ar az az_IR be bg bn br bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu hy ia id is it ja ko li lt lv mi mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tk tr uk uz uz@Latn vi wa xh yi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
 AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
@@ -462,6 +463,20 @@ case $host in
   ;;
 esac
 
+#
+# see bug 162979
+#
+AC_MSG_CHECKING(for HP-UX)
+case $host_os in
+  hpux9* | hpux10* | hpux11*)
+    AC_MSG_RESULT(yes)
+    CFLAGS="$CFLAGS -DHPPEX -DSHMLINK"
+  ;;
+  *)
+    AC_MSG_RESULT(no)
+  ;;
+esac
+
 dnl NeXTStep cc seems to need this
 AC_MSG_CHECKING([for extra flags for POSIX compliance])
 AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,3 +1,23 @@
+2005-08-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.10 ===
+
+2005-08-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.9 ===
+
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.8 ===
+
+2005-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Releases 2.6.7 ====
+
+2005-04-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.6 ===
+
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.6.5 ===

demos/gtk-demo/Makefile.am

@@ -10,6 +10,7 @@ demos =						\
 	changedisplay.c				\
 	clipboard.c				\
 	colorsel.c				\
+	combobox.c				\
 	dialog.c				\
 	drawingarea.c				\
 	editable_cells.c			\
@@ -21,6 +22,7 @@ demos =						\
 	list_store.c				\
 	menus.c					\
 	panes.c					\
+	pickers.c				\
 	pixbufs.c				\
 	rotated_text.c				\
 	sizegroup.c				\

demos/gtk-demo/appwindow.c

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

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,8 +33,8 @@ copy_button_clicked (GtkWidget *button,
 
 void
 paste_received (GtkClipboard *clipboard,
-		const gchar  *text,
-		gpointer      user_data)
+                const gchar  *text,
+                gpointer      user_data)
 {
   GtkWidget *entry;
 
@@ -41,7 +46,7 @@ paste_received (GtkClipboard *clipboard,
 
 void
 paste_button_clicked (GtkWidget *button,
-		     gpointer   user_data)
+                     gpointer   user_data)
 {
   GtkWidget *entry;
   GtkClipboard *clipboard;
@@ -50,13 +55,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 +198,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 +226,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 +243,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/combobox.c

@@ -0,0 +1,371 @@
+/* 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_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");
+}
+
+GtkWidget *
+do_combobox (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *vbox, *frame, *box, *combo;
+  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 
+     */
+    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);
+    
+  }
+
+  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,46 @@ 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] = { '0' + i, '\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 +146,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 +180,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 +222,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 +256,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 +317,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 +367,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/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;
+}

docs/reference/ChangeLog

@@ -1,3 +1,46 @@
+2005-08-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.10 ===
+
+2005-08-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.9 ===
+
+2005-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/images/file-button.png: Update the image
+
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.8 ===
+
+2005-05-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/migrating-GtkAction.sgml: Fix an example.  (#304808,
+	Ghorban M. Tavakoly)
+
+2005-05-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/tmpl/visuals.sgml: Fix a typo (#303473, Masao Mutoh)
+
+2005-05-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/tmpl/pango_interaction.sgml: Fix a reference.
+	(#303403, Masao Mutoh)
+
+2005-04-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkuimanager.sgml: Refer to the correct
+	property. (#301115, Richard Hult)
+
+2005-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Releases 2.6.7 ====
+
+2005-04-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.6 ===
+
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.6.5 ===

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

@@ -20,6 +20,9 @@ Animated images.
     #GdkPixbufLoader
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
   <para>
     This object describes an animation.

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>
 

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>
 

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

@@ -14,6 +14,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-unused.sgml

@@ -22,6 +22,10 @@ Getting parts of a drawable's image data into a pixbuf.
 Drawables to Pixbufs
 
 
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-unused.sgml:Stability_Level ##### -->
+
+
+
 <!-- ##### SECTION ./tmpl/gnome-canvas-pixbuf.sgml:Long_Description ##### -->
   <para>
     This canvas item displays #GdkPixbuf images.  It handles full
@@ -567,10 +571,6 @@ End:
   </para>
 
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-
 <!-- ##### FUNCTION gdk_pixbuf_new_from_stream ##### -->
 <para>
 

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.

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

@@ -14,6 +14,9 @@ Functions for inlined pixbuf handling.
 
   </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>
 

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

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

docs/reference/gdk/tmpl/colors.sgml

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

docs/reference/gdk/tmpl/cursors.sgml

@@ -14,6 +14,9 @@ Standard and pixmap cursors
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkCursor ##### -->
 <para>
 A <type>GdkCursor</type> structure represents a cursor.

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>

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,

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.

docs/reference/gdk/tmpl/fonts.sgml

@@ -261,6 +261,9 @@ here).
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkFont ##### -->
 <para>
 The <structname>GdkFont</structname> structure represents a font or fontset. It

docs/reference/gdk/tmpl/gcs.sgml

@@ -30,6 +30,9 @@ be set by the latter method.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkGC ##### -->
 <para>
 The #GdkGC structure represents a graphics context.

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

@@ -23,6 +23,10 @@ routines for allocating colors (deprecated).
 Color Contexts
 
 
+<!-- ##### SECTION ./tmpl/gdk-unused.sgml:Stability_Level ##### -->
+
+
+
 <!-- ##### SECTION ./tmpl/input_contexts.sgml:Long_Description ##### -->
 <para>
 A #GdkIC input context is used for each user interface element which supports
@@ -453,10 +457,6 @@ status information, so the application does not need to do anything.
 @GDK_PIXBUF_ALPHA_BILEVEL: 
 @GDK_PIXBUF_ALPHA_FULL: 
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-
 <!-- ##### FUNCTION gdk_color_context_add_palette ##### -->
 <para>
 

docs/reference/gdk/tmpl/gdkdisplay.sgml

@@ -28,6 +28,9 @@ Controls the keyboard/mouse pointer grabs and a set of <type>GdkScreen</type>s
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkDisplay ##### -->
 <para>
 The <structname>GdkDisplay</structname> struct is the GDK representation

docs/reference/gdk/tmpl/gdkdisplaymanager.sgml

@@ -16,6 +16,9 @@ changes.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkDisplayManager ##### -->
 <para>
 The <structname>GdkDisplayManager</structname> struct has no interesting 

docs/reference/gdk/tmpl/gdkscreen.sgml

@@ -22,6 +22,9 @@ form a large screen area.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkScreen ##### -->
 <para>
 This is a currently just a placeholder typedef for the first argument of 

docs/reference/gdk/tmpl/general.sgml

@@ -15,6 +15,9 @@ utility functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_init ##### -->
 <para>
 Initializes the GDK library and connects to the X server.

docs/reference/gdk/tmpl/images.sgml

@@ -55,6 +55,9 @@ displays.
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkImage ##### -->
 <para>
 The #GdkImage struct contains information on the image and the pixel data.

docs/reference/gdk/tmpl/input.sgml

@@ -31,6 +31,9 @@ callbacks.</para></listitem>
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_input_add_full ##### -->
 <para>
 Establish a callback when a condition becomes true on

docs/reference/gdk/tmpl/input_devices.sgml

@@ -89,6 +89,9 @@ and <structfield>ytilt</structfield>.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkDevice ##### -->
 <para>
 A <structname>GdkDevice</structname> structure contains

docs/reference/gdk/tmpl/keys.sgml

@@ -80,6 +80,9 @@ gdk_keymap_translate_keyboard_state() just to get the keyval.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkKeymap ##### -->
 <para>
 A <structname>GdkKeymap</structname> defines the translation from keyboard state

docs/reference/gdk/tmpl/pango_interaction.sgml

@@ -14,7 +14,7 @@ stippling and embossing.
 <para>
 Creating a #PangoLayout object is the first step in rendering text,
 and requires getting a handle to a #PangoContext. For GTK+ programs,
-you'll usually want to use gtk_widget_get_context(), or
+you'll usually want to use gtk_widget_get_pango_context(), or
 gtk_widget_create_pango_layout(), rather than using the lowlevel
 gdk_pango_context_get_for_screen(). Once you have a #PangoLayout, you
 can set the text and attributes of it with Pango functions like
@@ -129,6 +129,9 @@ g_object_unref (gc);
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPangoRenderer ##### -->
 <para>
 

docs/reference/gdk/tmpl/pixbufs.sgml

@@ -14,6 +14,9 @@ Functions for rendering pixbufs on drawables
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
 <para>
 

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -18,6 +18,9 @@ pixel can be either on or off).
 <para>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable.

docs/reference/gdk/tmpl/properties.sgml

@@ -42,6 +42,9 @@ data commonly stored in X window properties.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkAtom ##### -->
 <para>
 An opaque type representing a string as an index into a table
@@ -252,15 +255,14 @@ and %GDK_NONE will be stored in @actual_property_type.
 </para>
 <note>
 <para>
-The <function>XGetWindowProperty()</function>
-function that gdk_property_get()
-uses has a very confusing and complicated set of semantics.
+The XGetWindowProperty() function that gdk_property_get()
+uses has a very confusing and complicated set of semantics.  
 Unfortunately, gdk_property_get() makes the situation
 worse instead of better (the semantics should be considered
 undefined), and also prints warnings to stderr in cases where it
 should return a useful error to the program. You are advised to use 
-<function>XGetWindowProperty()</function>
-directly until a replacement function for gdk_property_get()
+XGetWindowProperty() directly until a replacement function for 
+gdk_property_get()
 is provided. 
 </para>
 </note>
@@ -273,18 +275,24 @@ is provided.
        be filled in, a warning will be printed to stderr
        and no data will be returned.
 @offset: the offset into the property at which to begin
-         retrieving data. (in 4 byte units!)
-@length: the length of the data to delete. (in bytes, but
-         the actual retrieved length will be the next
-         integer multiple multiple of four greater than 
-         this!)
+         retrieving data, in 4 byte units.
+@length: the length of the data to retrieve in bytes.  Data is
+         considered to be retrieved in 4 byte chunks, so @length 
+         will be rounded up to the next highest 4 byte boundary 
+         (so be careful not to pass a value that might overflow 
+          when rounded up).
 @pdelete: if %TRUE, delete the property after retrieving the
           data.
 @actual_property_type: location to store the actual type of 
                        the property.
-@actual_format: location to store the actual format of the data.
-@actual_length: location to store the length of the retrieved
-                data, in bytes.
+@actual_format: location to store the actual return format of the
+                data; either 8, 16 or 32 bits.
+@actual_length: location to store the length of the retrieved data, in
+                bytes.  Data returned in the 32 bit format is stored
+                in a long variable, so the actual number of 32 bit
+                elements should be be calculated via
+                @actual_length/sizeof(glong) to ensure portability to
+                64 bit systems.
 @data: location to store a pointer to the data. The retrieved
        data should be freed with g_free() when you are finished
        using it.

docs/reference/gdk/tmpl/regions.sgml

@@ -33,6 +33,9 @@ It can be intersected to regions by using gdk_region_spans_intersect_foreach().
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPoint ##### -->
 <para>
 Defines the x and y coordinates of a point.

docs/reference/gdk/tmpl/rgb.sgml

@@ -115,6 +115,9 @@ colors.</para></listitem>
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_rgb_init ##### -->
 <para>
 This function no longer does anything at all. It's completely useless

docs/reference/gdk/tmpl/selections.sgml

@@ -47,6 +47,9 @@ to the X Inter-client Communication Conventions Manual
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### TYPEDEF GdkSelection ##### -->
 <para>
 The #GdkSelection enumeration contains predefined 

docs/reference/gdk/tmpl/threads.sgml

@@ -241,6 +241,9 @@ int main (int argc, char *argv[])
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO GDK_THREADS_ENTER ##### -->
 <para>
 This macro marks the beginning of a critical section in which GDK and GTK+

docs/reference/gdk/tmpl/visuals.sgml

@@ -51,6 +51,9 @@ then %GDK_VISUAL_STATIC_GRAY.
 #GdkImage, #GdkColormap, #GdkRGB
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkVisual ##### -->
 <para>
 The <type>GdkVisual</type> structure contains information about
@@ -129,7 +132,7 @@ values for display.
    <structfield>blue_mask</structfield> fields of the #GdkVisual
    structure describe how the components are assembled into a pixel value.
 @GDK_VISUAL_DIRECT_COLOR: Each pixel value contains red, green, and blue
-   components as for %GDK_TRUE_COLOR, but the components are mapped via a 
+   components as for %GDK_VISUAL_TRUE_COLOR, but the components are mapped via a 
    color table into the final output table instead of being converted directly.
 
 <!-- ##### ENUM GdkByteOrder ##### -->

docs/reference/gdk/tmpl/windows.sgml

@@ -18,6 +18,9 @@ For example, each #GtkButton has a #GdkWindow associated with it.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkWindow ##### -->
 <para>
 An opaque structure representing an onscreen drawable.

docs/reference/gdk/tmpl/x_interaction.sgml

@@ -14,6 +14,9 @@ X backend-specific functions
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO GDK_ROOT_WINDOW ##### -->
 <para>
 Obtains the Xlib window id of the root window of the current screen. 

docs/reference/gtk/compiling.sgml

@@ -22,7 +22,8 @@ find the GTK+ header files and libraries. This is done with the
 </para>
 <para>
 The following interactive shell session demonstrates how
-<literal>pkg-config</literal> is used:
+<literal>pkg-config</literal> is used (the actual output on your 
+system may be different):
 <programlisting>
 $ pkg-config --cflags gtk+-2.0
  -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/atk-1.0  

docs/reference/gtk/migrating-GtkAction.sgml

@@ -286,7 +286,7 @@ static GtkActionEntry entries[] = {
   { "FileMenu", NULL, "_File" },
   { "ViewMenu", NULL, "_View" },
   { "Open", GTK_STOCK_OPEN, "_Open", "<control>O", "Open a file", open_action_callback },
-  { "Exit", GTK_STOCK_OPEN, "E_xit", "<control>Q", "Exit the program", exit_action_callback },
+  { "Exit", GTK_STOCK_QUIT, "E_xit", "<control>Q", "Exit the program", exit_action_callback },
   { "ZoomIn", GTK_STOCK_ZOOM_IN, "Zoom _In", "plus", "Zoom into the image", zoom_in_action_callback },
   { "ZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "minus", "Zoom away from the image", zoom_out_action_callback },
 };

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

@@ -1,3 +1,7 @@
+<!-- ##### SECTION ./tmpl/gtk-unused.sgml:Stability_Level ##### -->
+
+
+
 <!-- ##### SECTION ./tmpl/gtkarg.sgml:Long_Description ##### -->
 <para>
 All the functions in here are marked a Non-public.
@@ -1466,34 +1470,6 @@ If the window shrinks automatically when widgets within it shrink.
 </para>
 
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-
-<!-- ##### FUNCTION gtk_about_dialog_get_artists ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_about_dialog_get_authors ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_about_dialog_get_documenters ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
 <!-- ##### FUNCTION gtk_accel_group_add ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkaboutdialog.sgml

@@ -34,6 +34,9 @@ and keeps it around so that it can be shown again.
 #GTK_STOCK_ABOUT
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAboutDialog ##### -->
 <para>
 The <structname>GtkAboutDialog</structname> struct contains
@@ -245,6 +248,15 @@ only private fields and should not be directly accessed.
 @website_label: 
 
 
+<!-- ##### FUNCTION gtk_about_dialog_get_authors ##### -->
+<para>
+
+</para>
+
+@about: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_about_dialog_set_authors ##### -->
 <para>
 
@@ -254,6 +266,15 @@ only private fields and should not be directly accessed.
 @authors: 
 
 
+<!-- ##### FUNCTION gtk_about_dialog_get_artists ##### -->
+<para>
+
+</para>
+
+@about: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_about_dialog_set_artists ##### -->
 <para>
 
@@ -263,6 +284,15 @@ only private fields and should not be directly accessed.
 @artists: 
 
 
+<!-- ##### FUNCTION gtk_about_dialog_get_documenters ##### -->
+<para>
+
+</para>
+
+@about: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_about_dialog_set_documenters ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkaccelgroup.sgml

@@ -31,6 +31,9 @@ gtk_window_add_accel_group(), gtk_accel_map_change_entry(),
 gtk_item_factory_new(), gtk_label_new_with_mnemonic()
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAccelGroup ##### -->
 <para>
 An object representing and maintaining a group of accelerators.

docs/reference/gtk/tmpl/gtkaccellabel.sgml

@@ -78,6 +78,9 @@ though it is almost always used to display just one accelerator key.
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAccelLabel ##### -->
 <para>
 The #GtkAccelLabel-struct struct contains private data only, and

docs/reference/gtk/tmpl/gtkaccelmap.sgml

@@ -14,6 +14,9 @@ Loadable keyboard accelerator specifications
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAccelMap ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkaccessible.sgml

@@ -14,6 +14,9 @@ Accessibility support for widgets
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAccessible ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkaction.sgml

@@ -48,6 +48,9 @@ activate its action.
 #GtkActionGroup, #GtkUIManager
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAction ##### -->
 <para>
 The <structname>GtkAction</structname> struct contains only private members

docs/reference/gtk/tmpl/gtkactiongroup.sgml

@@ -33,6 +33,9 @@ sure that the correct shortcut is displayed next to the menu item.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkActionGroup ##### -->
 <para>
 The <structname>GtkActionGroup</structname> struct contains only private 

docs/reference/gtk/tmpl/gtkadjustment.sgml

@@ -28,6 +28,9 @@ after changing the value and its bounds. This results in the emission of the
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAdjustment ##### -->
 <para>
 The #GtkAdjustment-struct struct contains the following fields.

docs/reference/gtk/tmpl/gtkalignment.sgml

@@ -27,6 +27,9 @@ have no effect.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAlignment ##### -->
 <para>
 The #GtkAlignment-struct struct contains private data only, and should

docs/reference/gtk/tmpl/gtkarrow.sgml

@@ -34,6 +34,9 @@ style of an arrow can be changed after creation by using gtk_arrow_set().
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkArrow ##### -->
 <para>
 The #GtkArrow-struct containes the following fields.

docs/reference/gtk/tmpl/gtkaspectframe.sgml

@@ -20,6 +20,9 @@ a frame around the child. The frame will be
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAspectFrame ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkbbox.sgml

@@ -48,6 +48,9 @@ behaves as if homogeneous was %TRUE.
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkButtonBox ##### -->
 <para>
 This is a read-only struct; no members should be modified directly.

docs/reference/gtk/tmpl/gtkbin.sgml

@@ -20,6 +20,9 @@ Many GTK+ widgets are subclasses of #GtkBin, including #GtkWindow, #GtkButton,
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkBin ##### -->
 <para>
 The #GtkBin-struct struct contains the following fields.

docs/reference/gtk/tmpl/gtkbindings.sgml

@@ -14,6 +14,9 @@ Key bindings for individual widgets
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkBindingSet ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkbox.sgml

@@ -100,6 +100,9 @@ layouts.</para></listitem>
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkBox ##### -->
 <para>
 The #GtkBox-struct describes an instance of GtkBox and contains the following fields.

docs/reference/gtk/tmpl/gtkbutton.sgml

@@ -21,6 +21,9 @@ the #GtkLabel.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkButton ##### -->
 <para>
 This should not be accessed directly.  Use the accessor functions below.

docs/reference/gtk/tmpl/gtkcalendar.sgml

@@ -38,6 +38,9 @@ gtk_calendar_thaw().
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCalendar ##### -->
 <para>
 <structfield>num_marked_dates</structfield> is an integer containing the

docs/reference/gtk/tmpl/gtkcelleditable.sgml

@@ -15,6 +15,9 @@ to be usable when editing the contents of a #GtkTreeView cell.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellEditable ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcelllayout.sgml

@@ -16,6 +16,9 @@ attributes and data funcs.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellLayout ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellrenderer.sgml

@@ -48,6 +48,9 @@ respectively.
 #GtkCellRendererText,#GtkCellRendererPixbuf,#GtkCellRendererToggle
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM GtkCellRendererState ##### -->
 <para>
 Tells how a cell is to be rendererd.

docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml

@@ -25,6 +25,9 @@ cell renderers can be added in a handler for the editing-started signal.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererCombo ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml

@@ -30,6 +30,9 @@ property is set to a pixbuf, it renders that one.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererPixbuf ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml

@@ -14,6 +14,9 @@ Renders numbers as progress bars
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererProgress ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellrenderertext.sgml

@@ -22,6 +22,9 @@ the #GtkCellRendererText allows to edit its text using an entry.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererText ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml

@@ -17,6 +17,9 @@ property. When activated, it emits the toggled signal.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererToggle ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellview.sgml

@@ -17,6 +17,9 @@ and drag and drop.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellView ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcheckbutton.sgml

@@ -34,6 +34,9 @@ The important signal ('toggled') is also inherited from #GtkToggleButton.
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCheckButton ##### -->
 <para>
 <structfield>toggle_button</structfield> is a #GtkToggleButton representing the actual toggle button that composes the check button.

docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml

@@ -22,6 +22,9 @@ toggles the value.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCheckMenuItem ##### -->
 <para>
 The #GtkCheckMenuItem-struct struct contains the following fields.

docs/reference/gtk/tmpl/gtkclipboard.sgml

@@ -84,6 +84,9 @@ Storing data on clipboards
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkClipboard ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkclist.sgml

@@ -20,6 +20,9 @@ in newly written code. Use #GtkTreeView instead.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCList ##### -->
 <para>
 This is the embodiment of the #GtkCList widget.  This structure contains

docs/reference/gtk/tmpl/gtkcolorbutton.sgml

@@ -15,6 +15,9 @@ selection dialog to change the color. It is suitable widget for selecting a colo
 #GtkColorSelectionDialog, #GtkFontButton
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkColorButton ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcolorsel.sgml

@@ -18,6 +18,9 @@ color selection dialog box #GtkColorSelectionDialog.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkColorSelection ##### -->
 <para>
 The #GtkColorSelection-struct struct contains private data only, 

docs/reference/gtk/tmpl/gtkcolorseldlg.sgml

@@ -16,6 +16,9 @@ provides a standard dialog for file selection.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkColorSelectionDialog ##### -->
 <para>
 The #GtkColorSelectionDialog-struct struct contains the following fields.

docs/reference/gtk/tmpl/gtkcombo.sgml

@@ -83,6 +83,9 @@ items.</title>
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCombo ##### -->
 <para>
 The #GtkFixedChild-struct struct contains the following fields.

docs/reference/gtk/tmpl/gtkcombobox.sgml

@@ -39,6 +39,9 @@ gtk_combo_box_get_active_text().
 #GtkComboBoxEntry, #GtkTreeModel, #GtkCellRenderer
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkComboBox ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcomboboxentry.sgml

@@ -29,6 +29,9 @@ with gtk_combo_box_entry_new_text().
 #GtkComboBox
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkComboBoxEntry ##### -->
 <para>