2.6.4

Fix prelighting. (#157392 , Vincent Noel, patch by Christian Persch)
2005-03-01 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Fix prelighting. (#157392, Vincent Noel, patch by Christian Persch)
2005-03-01 17:41:11 +00:00 · 2005-03-01 15:50:03 +00:00 · 2005-03-01 15:16:29 +00:00 · 2005-03-01 14:50:33 +00:00 · 2005-03-01 06:42:44 +00:00 · 2005-03-01 06:28:56 +00:00
482 changed files with 27589 additions and 32132 deletions
--- a/549
+++ b/549
@@ -1,22 +1,217 @@
-2005-02-11  Owen Taylor  <otaylor@redhat.com>
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkwindow.c (gtk_window_size_allocate): Don't queue
-	a redraw if the size didn't change. queue a shallow redraw.
+	* === Released 2.6.4 ===

-2005-02-10  Owen Taylor  <otaylor@redhat.com>
+	* NEWS: Updates

-	* gtk/gtkwindow.c: Add a resizable-background style property
-	that, if set, causes the entire widget to be queued for
-	redraw on ::size-allocate.
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>

-2005-02-10  Owen Taylor  <otaylor@redhat.com>
+	* gtk/gtkmenutoolbutton.c (button_state_changed_cb): 
+	Fix prelighting.  (#157392, Vincent Noel, patch by
+	Christian Persch)

-	* gtk/gtkwidget.c: Add a draw-border style property to allow
-	themes to draw outside the widget's allocation.
+	* gtk/gtkicontheme.c (theme_lookup_icon): Make 
+	icon data caching work again.  (#168851, Alexander Larsson)

-	* gdk/x11/gdkevents-x11.c: Hack out Net/ThemeName to 
-	allow easier testing of theme stuff without having
-	to change global GNOME configuration.
+	* gdk-pixbuf/gdk-pixbuf.c:
+	* gdk-pixbuf/gdk-pixbuf-features.h.in:
+	* gtk/xdgmime/xdgmime.[hc]:
+	Revert the previous change, since it breaks
+	bin compat.
+
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkkeyuni.c
+	* gdk/gdkpixbuf-drawable.c
+	* gdk/gdkrgb.c
+	* gdk/x11/gdkdnd-x11.c
+	* gdk/x11/gdkevents-x11.c
+	* gdk/x11/gdkproperty-x11.c
+	* gdk/x11/gdkvisual-x11.c
+	* gdk-pixbuf/gdk-pixbuf.c
+	* gdk-pixbuf/gdk-pixbuf-features.h.in
+	* gtk/gtkaction.c
+	* gtk/gtkbindings.c
+	* gtk/gtkcolorbutton.c
+	* gtk/gtkcombo.c
+	* gtk/gtkcontainer.c
+	* gtk/gtkfilechooserdefault.c
+	* gtk/gtkfilesel.c
+	* gtk/gtkgamma.c
+	* gtk/gtkiconview.c
+	* gtk/gtkinputdialog.c
+	* gtk/gtkitemfactory.c
+	* gtk/gtkmenu.c
+	* gtk/gtktextview.c
+	* gtk/gtktooltips.c
+	* gtk/gtktreedatalist.c
+	* gtk/gtkuimanager.c
+	* gtk/tree_minus.xpm
+	* gtk/tree_plus.xpm
+	* gtk/xdgmime/xdgmime.c
+	* gtk/xdgmime/xdgmime.h: 
+	Move constant data to .rodata.
+
+2005-02-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.6.3 ===
+
+	* NEWS: Updates.
+
+2005-02-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaction.c (connect_proxy): Improve the handling
+	of buttons as action proxys.  (#165534, Milosz Derezynski)
+
+	* gtk/gtklabel.c (gtk_label_size_request): Fix a typo.  
+	(#168646, Vincent Untz)
+
+	* gtk/gtkfilechooserdefault.c (save_folder_combo_create): 
+	Unset "focus-on-click" for the save folder combo.  (#168688,
+	Sven Neumann)
+
+2005-02-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/testpixbuf.c (main): Remove a C++ comment.  (#168531, 
+	Paul Cornett)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level): Don't leak a 
+	path here.  (#168443, Morten Welinder)
+
+2005-02-24  Robert Ögren  <gtk@roboros.com>
+
+	Implement better handling of Wintab tablet context overlap on
+	Win32. (#167298)
+
+	* gdk/win32/gdkinput-win32.c (_gdk_input_set_tablet_active): New
+	function that brings any tablet contexts to the top of the overlap
+	order.
+	* gdk/win32/gdkinput-win32.h: Declare _gdk_input_set_tablet_active ()
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate):
+	Call _gdk_input_set_tablet_active when a window is activated (on
+	WM_ACTIVATE)
+
+2005-02-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates.
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_path): 
+	Don't leak parent_path.  (#168435, Morten Welinder)
+
+	* gtk/gtkcombobox.c: Consistently use gtk_tree_row_reference_valid().
+	(gtk_combo_box_model_row_deleted): Update the displayed row in 
+	the cell_view.  (#167842, Gustavo Carneiro)
+
+2005-02-24  Matthias Clasen  <mclasen@redhat.com>
+
+	Fix #167259, reported by  Christian Persch:
+	
+	* gtk/gtkwidget.c (gtk_widget_unparent): Unmap the reparented 
+	widget, even if we avoid the unrealizing. 
+	(gtk_widget_reparent_subwindows): Make reparenting work for
+	!NO_WINDOW widgets which have other windows which are siblings
+	of widget->window (as e.g. GtkSpinButton).
+
+2005-02-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): 
+	Don't emit a warning if a parent node is filtered out. (#164726,
+	Olivier Sessink)
+
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_style_set): Revert the last 
+	change, since gtk_widget_set_style_internal() already
+	queues a resize.
+
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_style_set): Queue a resize, since
+	fonts may have changed.  (#164128, Phil Blundell)
+
+	* gtk/gtkaboutdialog.c (gtk_about_dialog_init) 
+	(gtk_about_dialog_new): Move initialization code from _new to 
+	_init.  (#168249, Murray Cumming)
+
+Wed Feb 23 17:34:01 2005  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_node_queue_redraw): Patch from
+	jorn@nl.linux.org (Jorn Baayen) to notice changes to fixed-height
+	widgets.
+
+2005-02-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap): Workaround for bug in
+	MapVirtualKey(VK_DIVIDE, 0) in some Windows versions. (#142998)
+
+Tue Feb 22 13:49:09 2005  Manish Singh  <yosh@gimp.org>
+
+        * gtk/updateiconcache.c: #include <config.h>
+
+2005-02-22  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #164940, patch by Ben Maurer and Tommi Komulainen.
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_565_d): Constify the "dmp" variable.
+	(gdk_rgb_convert_565_d): Likewise.
+	(DM_565): Made a static const precomputed array to avoid
+	allocating it at runtime.
+	(gdk_rgb_preprocess_dm_565): #ifdef out.
+
+2005-02-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkclipboard.c: Fix freedesktop.org links in the docs.
+
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): 
+	Set have_render_with_trapezoids to GDK_YES when we have 
+	a new enough Render extension.  (#167965,Billy Biggs) 
+
+	* gdk/x11/gdkx.h: 
+	* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time_libgtk_only):
+	Add libgtk_only api to obtain the user_time of the display. 
+	This function will become generally available api in 2.8.
+
+	* gtk/gtkwindow.c (gtk_window_present): Use the timestamp of
+	the last user interaction when focusing the window.  (#166379, 
+	Elijah Newren)
+
+Thu Feb 17 14:52:57 2005  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.
+
+2005-02-16  Matthias Clasen  <mclasen@redhat.com>
+
+	Fixes for #143829, Tommi Komulainen, Christian Persch:
+	
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): Remove the
+	typeselect_flush_timeout when destroying the widgets
+	it is operating on.  
+	(gtk_tree_view_ensure_interactive_directory): Add the 
+	popup to the window group of the toplevel it belongs to.
+
+	* gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget) 
+	(gtk_combo_box_popup): Do the same here. 
+
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkpathbar.c (gtk_path_bar_finalize): Stop scrolling 
+	when the pathbar goes away.  (#167094, Rodney Dawes)
+	(change_icon_theme): Use GTK_ICON_SIZE_MENU here as 
+	well  (Vincent Noel)
+
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Complete the fix for #165770, Vincent Noel:
+	
+	* gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
+	fallback size be 16, to be equal to the default for
+	GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
+	(gtk_file_chooser_button_init):
+	(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+	GTK_ICON_SIZE_SMALL_TOOLBAR. 

 2005-02-09  Matthias Clasen  <mclasen@redhat.com>

@@ -27,47 +222,13 @@

 	* configure.in: Added "xh" to ALL_LINGUAS.

-2005-02-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkuimanager.c (start_element_handler): Accept 
-	the "expand" attribute and set a flag in the node if it
-	is set to "true".
-	(update_node): If the expand flag is set, make separator
-	toolitems non-drawn and expanding.  (#166489, Christian Persch)
-
-2005-02-05  Hans Breuer  <hans@breuer.org>
-
-	* gdk/makefile.msc gdk/win32/makefile.msc gtk/makefile.msc.in :
-	build with Cairo dependency. The patch to acually use Cairo
-	on win32 will be on gtk-devel-list soon.
-	* tests/makefile.msc : add testcairo building
-
-	* gtk/stock-icons/makefile.msc : split command line into two to
-	work with the shells default
-
-Fri Feb  4 14:16:31 2005  Manish Singh  <yosh@gimp.org>
-
-	* gtk/gtkaccelgroup.c (substitute_underscores): remove unused
-	function.
-
-	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
-	Add some extra parens for bitop order of operations disambiguiation.
-
-	* gtk/gtkstock.c: Fix const confusion, make our own copy of the 
-	domain when setting a translate function.
-
-	* tests/testcombo.c: removed unused variable.
-
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain
-	being NULL.  (#166179, Diego Gonzalez)
+	* configure.in: Post-release version bump.

-2005-02-04  Owen Taylor  <otaylor@redhat.com>
+	* === Released 2.6.2 ===

-	* configure.in: Revert gtk_binary_version to 2.4.0. Fix
-	up comment to talk only about backwards compat, not
-	forward/backwards compat. (#166293, reported by Vincent Noel)
+	* NEWS: Updates

 2005-02-04  Matthias Clasen  <mclasen@redhat.com>

@@ -75,59 +236,36 @@ Fri Feb  4 14:16:31 2005  Manish Singh  <yosh@gimp.org>
 	when there is not enough space. This avoids a nasty size
 	allocation loop in the file chooser.  (#154007, reported 
 	by Milosz Derezynski, patch by Robert Ögren)
-
+	
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
 	selection of RTL direction if the widget does not have 
 	focus.  (#164125, Frederic Crozat)

-Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
-
-	* gdk/x11/gdkdrawable-x11.c: #include cairo-xlib.h
-
-2005-02-03  Owen Taylor  <otaylor@redhat.com>
-
-	* gdk/gdkdrawable.[ch] gdkpixmap.c gdkwindow.c: Add
-	gdk_drawable_set_cairo_target().
-
-	* tests/testtreeflow.c (enum): Use grand not rand as a variable
-	name because one of the cairo headers is pulling in stdlib.h.
-
-	* tests/testcairo.c tests/Makefile.am: Add a simple cairo based
-	example.
-
-	* configure.in: Bump release to 2.7.0, gtk_binary_version to 2.7.0.
-
- 	* Require libpangocairo for all backends.
-
 2005-02-03  Tor Lillqvist  <tml@novell.com>

 	* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
 	wide character version of ImmGetCompositionString() here,
 	too. (#165278, Takuro Ashie)

+2005-02-03  Mark McLoughlin  <mark@skynet.ie>
+
+	* gtk/gtkicontheme.c: (load_themes): remove debug spew.
+
 2005-02-03  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do
 	one roundtrip per motion event.  (#166173, pointed out
 	by Chris Lee, patch by Søren Sandmann)

-	* gtk/gtk.symbols: 
-	* gtk/gtkstock.h: 
-	* gtk/gtkstock.c (gtk_stock_set_translate_func): 
-	New function which allows to change the function used for
-	translation stock labels, on a per-domain basis. Use this
-	functionality to switch the GTK+ stock items to use Q_()
-	prefixed msgids.  (#166179, Funda Wang)
-	
+2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+
 	* gdk/gdkkeynames.c: Make the gdk_key array const (#166075,
 	Tommi Komulainen)

 2005-02-02  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
 	Don't select the first row if the chooser is not mapped.  This
 	happens when it's acting on behalf of GtkFileChooserButton.  Also,
@@ -162,6 +300,10 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
 	of a single window so that gtk_clipboard_request_contents() can be
 	called inside a GtkClipboardReceivedFunc(). (#163844)

+2005-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
 2005-02-01  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
@@ -169,23 +311,19 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>

 	* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
 	to NULL after freeing it.  (#165800, Damon Chaplin)
-
-2005-02-01  Michael Natterer  <mitch@gimp.org>
-
-	* configure.in: depend on stable pango-1.8, not unstable 1.7
-
+	
 2005-02-01  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c
 	(browse_files_model_finished_loading_cb): Don't
 	g_assert_not_reached() if we are in any other state.  Another code
 	path may have triggered a folder reload.  Fixes #165556.

-2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+2005-02-01  Michael Natterer  <mitch@gimp.org>

-	Merged from gtk-2-6:
+	* configure.in: depend on stable pango-1.8, not unstable 1.7
+
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>

 	Fix #165770:

@@ -197,6 +335,9 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>

 2005-02-01  Matthias Clasen  <mclasen@redhat.com>

+	* gtk/gtktreeview.c (gtk_tree_view_adjustment_changed): 
+	Remove debug printf.  (#165877, Carlos Garnacho Parro)
+
 	* */*.c: Fix many instances of "the the" in docs and
 	comments.  (#165815, Masao Mutoh)

@@ -224,19 +365,12 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
 	* modules/input/gtkimcontextxim.c: Use NULL, not 0 to terminate 
 	NULL-terminated va lists.  (#165683)

-2005-01-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkseparatortoolitem.c (gtk_separator_tool_item_set_draw): 
-	Typo fix.  (#165581, Masao Mutoh)
-
 Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 	* README.cvs-commits: update ancient IRC info.

 2005-01-27  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c
 	(gtk_file_chooser_default_select_path): Oops, don't assert that we
 	can't reach the end of the function; this happens if we are still
@@ -244,9 +378,6 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 2005-01-27  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): 
-	Make wrapping work in RTL mode.  
-
 	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
 	obey HIG spacing a bit more, add a hand cursor when over the
 	link button.  (#163979, Jorn Baayen)
@@ -275,7 +406,7 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 	* gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Fix 
 	docs.  (#165163, Jeff Franks)
-	
+
 	* gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
 	for a string GValue.  (#165203, Damon Chaplin)

@@ -291,8 +422,6 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 2005-01-24  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	Fix #147785 and clean up the loading code:

 	* gtk/gtkfilechooserdefault.c (LoadState): Make the set of states
@@ -340,22 +469,11 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	* tests/testfilechooser.c (main): Add a button to the command
 	window to unmap and remap the file chooser.

-2005-01-24  Matthias Clasen  <mclasen@redhat.com>
-
-	* docs/tutorial/gtk-tut.sgml:
-	* docs/tutorial/gtk_tut.sgml:
-	* docs/reference/gtk/tmpl/gtkliststore.sgml:
-	* gtk/gtkactiongroup.c:
-	* gtk/gtksizegroup.c:
-	* gtk/gtksizegroup.h:
-	* gtk/gtktogglebutton.c: Replace "effect" by "affect" where
-	appropriate.  (#165108, Dan Winship)
-
 2005-01-24  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkwidget.c (gtk_widget_class_init): Document 
 	GtkWidget::style-set.  (#164222, Alex Graveley)
-	
+
 2005-01-22  Matthias Clasen  <mclasen@redhat.com>

 	* gdk/gdkdisplay.h (gdk_display_add_client_message_filter_full): 
@@ -365,6 +483,25 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	* gtk/gtktreeview.c (gtk_tree_view_leave_notify): Avoid spurious
 	drags.  (#164884)

+2005-01-23  Tor Lillqvist  <tml@novell.com>
+
+	Merged from HEAD:
+
+	Fix for #162790, by Iwan Wong:
+	
+	* gdk/win32/gdkdrawable-win32.c: Implement dashed lines
+	correctly. Simplify the interface to render_line_horizontal() and
+	render_line_vertical(). Need to draw lines "manually" also on
+	NT-based Windowses if we have a dash offset or are drawing
+	double-dashed lines.
+
+	* gdk/win32/gdkprivate-win32.h: Keep also the dash offset,
+	double-dash flag, and a brush for the background colour (used by
+	the odd dashes in the double-dash line style) in the GdkGCWin32
+	struct.
+
+	* gdk/win32/gdkgc-win32.c: Set up above new fields.
+
 2005-01-23  Tor Lillqvist  <tml@novell.com>

 	* gdk/win32/gdkkeys-win32.c (update_keymap): Handle Greek tonos
@@ -383,8 +520,6 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	connected or not, so it's easier to just not try getting the
 	volume name for them. See the bug report for discussion.

-	Make volume name display formats translatable.
-
 	Fix for #163702, from Ivan Wong: 
 	
 	* gdk/win32/gdkprivate-win32.h 
@@ -401,47 +536,15 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	(gdk_selection_send_notify_for_display): Remove the artifical
 	GDK_SELECTION_CLEAR event generation.

-2005-01-21  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkwidget.c (gtk_widget_get_accessible): More details
-	provided by Bill Haneman.
-
 2005-01-20  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkwidget.c (gtk_widget_get_accessible): Add docs.  (#164725,
-	George Kraft IV)
-
 	* gtk/gtkdialog.c (gtk_dialog_map): Don't loop forever
 	here, even if the only focusable widgets are labels.

-2005-01-20  Matthias Clasen  <mclasen@redhat.com>
-
-	Support tinting in GtkCellRendererPixbuf (#162903, Jorn Baayen):
-	
-	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_class_init) 
-	Add a follow-state property which when TRUE causes the pixbuf
-	to be tinted according to state.
-
-	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): 
-	Use follow-state and colorize the pixbuf when appropriate.	
-	
-2005-01-20  Matthias Clasen  <mclasen@redhat.com>
-
-	Support wrapping in GtkCellRendererText  (#163608):
-	
-	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): 
-	Add wrap-mode and wrap-width properties which cause a 
-	text cell to break to a specified width when set.
-
-	* gtk/gtkcellrenderertext.c (get_layout): Use wrap-mode
-	and wrap-width when they are set.
-
-2005-01-20  Matthias Clasen  <mclasen@redhat.com>
-
 	* gtk/gtkmodules.c (load_module): Don't reverse the order
 	of modules when putting them in gtk_modules.  (#162676, Dennis
 	Cranston, patch by Remus Draica)
-
+	
 	* gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash 
 	if the tree is empty.  (#164669, Priit Laes)

@@ -476,12 +579,6 @@ Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>

 	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): 
 	Support _NET_VIRTUAL_ROOTS.  (#163910, Carsten Haitzler)
-	
-	* gdk/gdk.symbols: 
-	* gdk/x11/gdkx.h: 
-	* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time): 
-	Add a function to obtain the last user interaction 
-	time.  (#163119, Elijah Newren)

 Tue Jan 18 13:56:09 2005  Manish Singh  <yosh@gimp.org>

@@ -495,22 +592,11 @@ Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org>

 2005-01-18  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
 	operation to select the first file if we are in SAVE or
 	CREATE_FOLDER modes.  Executing that operation would overwrite the
 	contents of the save-name entry.

-2005-01-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdkdisplay.h: 
-	* gdk/x11/gdkwindow-x11.c (gdk_display_warp_pointer): 
-	* gdk/win32/gdkwindow-win32.c (gdk_display_warp_pointer): Add
-	pointer warping to GDK.  (#160437)
-
-	* gtk/gtkcolorsel.c (key_press): Use gdk_display_warp_pointer.
-
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkstyle.c (gtk_default_draw_check) 
@@ -545,102 +631,9 @@ Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>

 	* gtk/gtkiconview.c: Remove debug output. (#164376, Jens Finke)

-Mon Jan 17 16:44:36 2005  Jonathan Blandford  <jrb@redhat.com>
+2005-01-17  Federico Mena Quintero  <federico@ximian.com>

-	* docs/Makefile.am (EXTRA_DIST): add tree-column-sizing.png to
-	dist.
-
-2005-01-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_add_bookmarks): Save
-	and restore the selected row in the bookmark list and the
-	save folder combo.  (#164290)
-
-2005-01-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_new_with_backend):
-	Fix argument order in docs.  
-
-2005-01-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtktextview.c (gtk_text_view_check_keymap_direction): 
-	* gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL 
-	if the keymap is neutral.  (#164125, Phil Blundell)
-
-2005-01-14  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtktreeview.c (gtk_tree_view_set_search_column): Allow to
-	reset the property to its default value -1. 
-	(gtk_tree_view_get_search_column): Return the default value in
-	the g_return_val_if_fail() check.  (#163864, Richard Hult)
-
-	* gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_value): 
-	Add a translator hint.  (#163889)
-
-	* configure.in: Check for _NL_TIME_FIRST_WEEKDAY too, since it
-	is an enum value, not a define. Pointed out by Tommi Komulainen.
-	* gtk/gtkcalendar.c (gtk_calendar_init): Adapt.
-
-2005-01-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* configure.in: Check for nl_langinfo()
-	* gtk/gtkcalendar.c (gtk_calendar_init): Use nl_langinfo() when it's
-	available to determine first day of week   (#163842, Vincent Untz)
-
-	* gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Add hints about 
-	the lifecycle of widgets.  (#159503, Christian Persch)
-
-	* demos/gtk-demo/main.c (create_text): Use monospace for the 
-	source code view.  (#163526, Theerud Lawtrakul)
-
-	* gtk/gtkaboutdialog.c (gtk_about_dialog_init): Use R as mnemonic
-	for the Credits button to avoid duplicate.  (#163465, Tim-Philipp 
-	Müller)
-	
-	* configure.in: Add an OS_LINUX conditional.
-
-	* gdk/Makefile.am (TESTS):
-	* gdk-pixbuf/Makefile.am (TESTS):
-	* gtk/Makefile.am (TESTS): Only run abicheck on Linux.  (#163917,
-	Roger Leigh)
-
-2005-01-13  Matthias Clasen <mclasen@redhat.com>
-
-	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
-	(gtk_tree_view_set_headers_clickable): Make the headers-visible
-	property readwrite instead of just writable, and remove the
-	g_return_if_fail check that there is a model when setting this
-	property. Also improve the blurb.  (#163851, Richard Hult)
-
-2005-01-12  Owen Taylor <otaylor@redhat.com>
-
-	* configure.in: Remove GLIB_DIVERT_BEFORE_HELP() on
-	initialization of gdktarget, that was causing it to be
-	evaluated before host was set. Simplify --with-gdktarget help
-	message.
-
-	* gtk/Makefile.am: Use grep | head -n 1 instead of grep -m 1 
-	which doesn't work with slightly older versions of GNU grep 
-	in install-libtool-import-lib rule.
-	
-2005-01-12  Tor Lillqvist  <tlillqvist@novell.com>
-
-	Fix for #162790, by Iwan Wong:
-	
-	* gdk/win32/gdkdrawable-win32.c: Implement dashed lines
-	correctly. Simplify the interface to render_line_horizontal() and
-	render_line_vertical(). Need to draw lines "manually" also on
-	NT-based Windowses if we have a dash offset or are drawing
-	double-dashed lines.
-
-	* gdk/win32/gdkprivate-win32.h: Keep also the dash offset,
-	double-dash flag, and a brush for the background colour (used by
-	the odd dashes in the double-dash line style) in the GdkGCWin32
-	struct.
-
-	* gdk/win32/gdkgc-win32.c: Set up above new fields.
-
-2005-01-10  Federico Mena Quintero  <federico@ximian.com>
+	Merged from HEAD:

 	Fix #162617.

@@ -662,6 +655,40 @@ Mon Jan 17 16:44:36 2005  Jonathan Blandford  <jrb@redhat.com>
 	(fill_in_mime_type): Don't return an error.  Don't do anything if
 	we don't have the stat info.

+2005-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_add_bookmarks): Save
+	and restore the selected row in the bookmark list and the
+	save folder combo.  (#164290)
+
+2005-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_new_with_backend):
+	Fix argument order in docs.  
+
+2005-01-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_check_keymap_direction): 
+	* gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL 
+	if the keymap is neutral.  (#164125, Phil Blundell)
+
+2005-01-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* gdk/Makefile.am (TESTS):
+	* gdk-pixbuf/Makefile.am (TESTS):
+	* gtk/Makefile.am (TESTS): Only run abicheck on Linux.  (#163917,
+	Roger Leigh)
+
+2005-01-13  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
+	(gtk_tree_view_set_headers_clickable): Make the headers-visible
+	property readwrite instead of just writable, and remove the
+	g_return_if_fail check that there is a model when setting this
+	property.  (#163851, Richard Hult)
+
 2005-01-10  Owen Taylor  <otaylor@redhat.com>

 	* Makefile.am (EXTRA_DIST): Adding missing ChangeLog.pre*
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,22 +1,217 @@
-2005-02-11  Owen Taylor  <otaylor@redhat.com>
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkwindow.c (gtk_window_size_allocate): Don't queue
-	a redraw if the size didn't change. queue a shallow redraw.
+	* === Released 2.6.4 ===

-2005-02-10  Owen Taylor  <otaylor@redhat.com>
+	* NEWS: Updates

-	* gtk/gtkwindow.c: Add a resizable-background style property
-	that, if set, causes the entire widget to be queued for
-	redraw on ::size-allocate.
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>

-2005-02-10  Owen Taylor  <otaylor@redhat.com>
+	* gtk/gtkmenutoolbutton.c (button_state_changed_cb): 
+	Fix prelighting.  (#157392, Vincent Noel, patch by
+	Christian Persch)

-	* gtk/gtkwidget.c: Add a draw-border style property to allow
-	themes to draw outside the widget's allocation.
+	* gtk/gtkicontheme.c (theme_lookup_icon): Make 
+	icon data caching work again.  (#168851, Alexander Larsson)

-	* gdk/x11/gdkevents-x11.c: Hack out Net/ThemeName to 
-	allow easier testing of theme stuff without having
-	to change global GNOME configuration.
+	* gdk-pixbuf/gdk-pixbuf.c:
+	* gdk-pixbuf/gdk-pixbuf-features.h.in:
+	* gtk/xdgmime/xdgmime.[hc]:
+	Revert the previous change, since it breaks
+	bin compat.
+
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkkeyuni.c
+	* gdk/gdkpixbuf-drawable.c
+	* gdk/gdkrgb.c
+	* gdk/x11/gdkdnd-x11.c
+	* gdk/x11/gdkevents-x11.c
+	* gdk/x11/gdkproperty-x11.c
+	* gdk/x11/gdkvisual-x11.c
+	* gdk-pixbuf/gdk-pixbuf.c
+	* gdk-pixbuf/gdk-pixbuf-features.h.in
+	* gtk/gtkaction.c
+	* gtk/gtkbindings.c
+	* gtk/gtkcolorbutton.c
+	* gtk/gtkcombo.c
+	* gtk/gtkcontainer.c
+	* gtk/gtkfilechooserdefault.c
+	* gtk/gtkfilesel.c
+	* gtk/gtkgamma.c
+	* gtk/gtkiconview.c
+	* gtk/gtkinputdialog.c
+	* gtk/gtkitemfactory.c
+	* gtk/gtkmenu.c
+	* gtk/gtktextview.c
+	* gtk/gtktooltips.c
+	* gtk/gtktreedatalist.c
+	* gtk/gtkuimanager.c
+	* gtk/tree_minus.xpm
+	* gtk/tree_plus.xpm
+	* gtk/xdgmime/xdgmime.c
+	* gtk/xdgmime/xdgmime.h: 
+	Move constant data to .rodata.
+
+2005-02-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.6.3 ===
+
+	* NEWS: Updates.
+
+2005-02-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaction.c (connect_proxy): Improve the handling
+	of buttons as action proxys.  (#165534, Milosz Derezynski)
+
+	* gtk/gtklabel.c (gtk_label_size_request): Fix a typo.  
+	(#168646, Vincent Untz)
+
+	* gtk/gtkfilechooserdefault.c (save_folder_combo_create): 
+	Unset "focus-on-click" for the save folder combo.  (#168688,
+	Sven Neumann)
+
+2005-02-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/testpixbuf.c (main): Remove a C++ comment.  (#168531, 
+	Paul Cornett)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level): Don't leak a 
+	path here.  (#168443, Morten Welinder)
+
+2005-02-24  Robert Ögren  <gtk@roboros.com>
+
+	Implement better handling of Wintab tablet context overlap on
+	Win32. (#167298)
+
+	* gdk/win32/gdkinput-win32.c (_gdk_input_set_tablet_active): New
+	function that brings any tablet contexts to the top of the overlap
+	order.
+	* gdk/win32/gdkinput-win32.h: Declare _gdk_input_set_tablet_active ()
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate):
+	Call _gdk_input_set_tablet_active when a window is activated (on
+	WM_ACTIVATE)
+
+2005-02-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates.
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_path): 
+	Don't leak parent_path.  (#168435, Morten Welinder)
+
+	* gtk/gtkcombobox.c: Consistently use gtk_tree_row_reference_valid().
+	(gtk_combo_box_model_row_deleted): Update the displayed row in 
+	the cell_view.  (#167842, Gustavo Carneiro)
+
+2005-02-24  Matthias Clasen  <mclasen@redhat.com>
+
+	Fix #167259, reported by  Christian Persch:
+	
+	* gtk/gtkwidget.c (gtk_widget_unparent): Unmap the reparented 
+	widget, even if we avoid the unrealizing. 
+	(gtk_widget_reparent_subwindows): Make reparenting work for
+	!NO_WINDOW widgets which have other windows which are siblings
+	of widget->window (as e.g. GtkSpinButton).
+
+2005-02-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): 
+	Don't emit a warning if a parent node is filtered out. (#164726,
+	Olivier Sessink)
+
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_style_set): Revert the last 
+	change, since gtk_widget_set_style_internal() already
+	queues a resize.
+
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_style_set): Queue a resize, since
+	fonts may have changed.  (#164128, Phil Blundell)
+
+	* gtk/gtkaboutdialog.c (gtk_about_dialog_init) 
+	(gtk_about_dialog_new): Move initialization code from _new to 
+	_init.  (#168249, Murray Cumming)
+
+Wed Feb 23 17:34:01 2005  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_node_queue_redraw): Patch from
+	jorn@nl.linux.org (Jorn Baayen) to notice changes to fixed-height
+	widgets.
+
+2005-02-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap): Workaround for bug in
+	MapVirtualKey(VK_DIVIDE, 0) in some Windows versions. (#142998)
+
+Tue Feb 22 13:49:09 2005  Manish Singh  <yosh@gimp.org>
+
+        * gtk/updateiconcache.c: #include <config.h>
+
+2005-02-22  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #164940, patch by Ben Maurer and Tommi Komulainen.
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_565_d): Constify the "dmp" variable.
+	(gdk_rgb_convert_565_d): Likewise.
+	(DM_565): Made a static const precomputed array to avoid
+	allocating it at runtime.
+	(gdk_rgb_preprocess_dm_565): #ifdef out.
+
+2005-02-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkclipboard.c: Fix freedesktop.org links in the docs.
+
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): 
+	Set have_render_with_trapezoids to GDK_YES when we have 
+	a new enough Render extension.  (#167965,Billy Biggs) 
+
+	* gdk/x11/gdkx.h: 
+	* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time_libgtk_only):
+	Add libgtk_only api to obtain the user_time of the display. 
+	This function will become generally available api in 2.8.
+
+	* gtk/gtkwindow.c (gtk_window_present): Use the timestamp of
+	the last user interaction when focusing the window.  (#166379, 
+	Elijah Newren)
+
+Thu Feb 17 14:52:57 2005  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.
+
+2005-02-16  Matthias Clasen  <mclasen@redhat.com>
+
+	Fixes for #143829, Tommi Komulainen, Christian Persch:
+	
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): Remove the
+	typeselect_flush_timeout when destroying the widgets
+	it is operating on.  
+	(gtk_tree_view_ensure_interactive_directory): Add the 
+	popup to the window group of the toplevel it belongs to.
+
+	* gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget) 
+	(gtk_combo_box_popup): Do the same here. 
+
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkpathbar.c (gtk_path_bar_finalize): Stop scrolling 
+	when the pathbar goes away.  (#167094, Rodney Dawes)
+	(change_icon_theme): Use GTK_ICON_SIZE_MENU here as 
+	well  (Vincent Noel)
+
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Complete the fix for #165770, Vincent Noel:
+	
+	* gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
+	fallback size be 16, to be equal to the default for
+	GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
+	(gtk_file_chooser_button_init):
+	(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+	GTK_ICON_SIZE_SMALL_TOOLBAR. 

 2005-02-09  Matthias Clasen  <mclasen@redhat.com>

@@ -27,47 +222,13 @@

 	* configure.in: Added "xh" to ALL_LINGUAS.

-2005-02-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkuimanager.c (start_element_handler): Accept 
-	the "expand" attribute and set a flag in the node if it
-	is set to "true".
-	(update_node): If the expand flag is set, make separator
-	toolitems non-drawn and expanding.  (#166489, Christian Persch)
-
-2005-02-05  Hans Breuer  <hans@breuer.org>
-
-	* gdk/makefile.msc gdk/win32/makefile.msc gtk/makefile.msc.in :
-	build with Cairo dependency. The patch to acually use Cairo
-	on win32 will be on gtk-devel-list soon.
-	* tests/makefile.msc : add testcairo building
-
-	* gtk/stock-icons/makefile.msc : split command line into two to
-	work with the shells default
-
-Fri Feb  4 14:16:31 2005  Manish Singh  <yosh@gimp.org>
-
-	* gtk/gtkaccelgroup.c (substitute_underscores): remove unused
-	function.
-
-	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
-	Add some extra parens for bitop order of operations disambiguiation.
-
-	* gtk/gtkstock.c: Fix const confusion, make our own copy of the 
-	domain when setting a translate function.
-
-	* tests/testcombo.c: removed unused variable.
-
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain
-	being NULL.  (#166179, Diego Gonzalez)
+	* configure.in: Post-release version bump.

-2005-02-04  Owen Taylor  <otaylor@redhat.com>
+	* === Released 2.6.2 ===

-	* configure.in: Revert gtk_binary_version to 2.4.0. Fix
-	up comment to talk only about backwards compat, not
-	forward/backwards compat. (#166293, reported by Vincent Noel)
+	* NEWS: Updates

 2005-02-04  Matthias Clasen  <mclasen@redhat.com>

@@ -75,59 +236,36 @@ Fri Feb  4 14:16:31 2005  Manish Singh  <yosh@gimp.org>
 	when there is not enough space. This avoids a nasty size
 	allocation loop in the file chooser.  (#154007, reported 
 	by Milosz Derezynski, patch by Robert Ögren)
-
+	
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
 	selection of RTL direction if the widget does not have 
 	focus.  (#164125, Frederic Crozat)

-Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
-
-	* gdk/x11/gdkdrawable-x11.c: #include cairo-xlib.h
-
-2005-02-03  Owen Taylor  <otaylor@redhat.com>
-
-	* gdk/gdkdrawable.[ch] gdkpixmap.c gdkwindow.c: Add
-	gdk_drawable_set_cairo_target().
-
-	* tests/testtreeflow.c (enum): Use grand not rand as a variable
-	name because one of the cairo headers is pulling in stdlib.h.
-
-	* tests/testcairo.c tests/Makefile.am: Add a simple cairo based
-	example.
-
-	* configure.in: Bump release to 2.7.0, gtk_binary_version to 2.7.0.
-
- 	* Require libpangocairo for all backends.
-
 2005-02-03  Tor Lillqvist  <tml@novell.com>

 	* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
 	wide character version of ImmGetCompositionString() here,
 	too. (#165278, Takuro Ashie)

+2005-02-03  Mark McLoughlin  <mark@skynet.ie>
+
+	* gtk/gtkicontheme.c: (load_themes): remove debug spew.
+
 2005-02-03  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do
 	one roundtrip per motion event.  (#166173, pointed out
 	by Chris Lee, patch by Søren Sandmann)

-	* gtk/gtk.symbols: 
-	* gtk/gtkstock.h: 
-	* gtk/gtkstock.c (gtk_stock_set_translate_func): 
-	New function which allows to change the function used for
-	translation stock labels, on a per-domain basis. Use this
-	functionality to switch the GTK+ stock items to use Q_()
-	prefixed msgids.  (#166179, Funda Wang)
-	
+2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+
 	* gdk/gdkkeynames.c: Make the gdk_key array const (#166075,
 	Tommi Komulainen)

 2005-02-02  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
 	Don't select the first row if the chooser is not mapped.  This
 	happens when it's acting on behalf of GtkFileChooserButton.  Also,
@@ -162,6 +300,10 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
 	of a single window so that gtk_clipboard_request_contents() can be
 	called inside a GtkClipboardReceivedFunc(). (#163844)

+2005-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
 2005-02-01  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
@@ -169,23 +311,19 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>

 	* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
 	to NULL after freeing it.  (#165800, Damon Chaplin)
-
-2005-02-01  Michael Natterer  <mitch@gimp.org>
-
-	* configure.in: depend on stable pango-1.8, not unstable 1.7
-
+	
 2005-02-01  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c
 	(browse_files_model_finished_loading_cb): Don't
 	g_assert_not_reached() if we are in any other state.  Another code
 	path may have triggered a folder reload.  Fixes #165556.

-2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+2005-02-01  Michael Natterer  <mitch@gimp.org>

-	Merged from gtk-2-6:
+	* configure.in: depend on stable pango-1.8, not unstable 1.7
+
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>

 	Fix #165770:

@@ -197,6 +335,9 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>

 2005-02-01  Matthias Clasen  <mclasen@redhat.com>

+	* gtk/gtktreeview.c (gtk_tree_view_adjustment_changed): 
+	Remove debug printf.  (#165877, Carlos Garnacho Parro)
+
 	* */*.c: Fix many instances of "the the" in docs and
 	comments.  (#165815, Masao Mutoh)

@@ -224,19 +365,12 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
 	* modules/input/gtkimcontextxim.c: Use NULL, not 0 to terminate 
 	NULL-terminated va lists.  (#165683)

-2005-01-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkseparatortoolitem.c (gtk_separator_tool_item_set_draw): 
-	Typo fix.  (#165581, Masao Mutoh)
-
 Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 	* README.cvs-commits: update ancient IRC info.

 2005-01-27  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c
 	(gtk_file_chooser_default_select_path): Oops, don't assert that we
 	can't reach the end of the function; this happens if we are still
@@ -244,9 +378,6 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 2005-01-27  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): 
-	Make wrapping work in RTL mode.  
-
 	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
 	obey HIG spacing a bit more, add a hand cursor when over the
 	link button.  (#163979, Jorn Baayen)
@@ -275,7 +406,7 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 	* gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Fix 
 	docs.  (#165163, Jeff Franks)
-	
+
 	* gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
 	for a string GValue.  (#165203, Damon Chaplin)

@@ -291,8 +422,6 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 2005-01-24  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	Fix #147785 and clean up the loading code:

 	* gtk/gtkfilechooserdefault.c (LoadState): Make the set of states
@@ -340,22 +469,11 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	* tests/testfilechooser.c (main): Add a button to the command
 	window to unmap and remap the file chooser.

-2005-01-24  Matthias Clasen  <mclasen@redhat.com>
-
-	* docs/tutorial/gtk-tut.sgml:
-	* docs/tutorial/gtk_tut.sgml:
-	* docs/reference/gtk/tmpl/gtkliststore.sgml:
-	* gtk/gtkactiongroup.c:
-	* gtk/gtksizegroup.c:
-	* gtk/gtksizegroup.h:
-	* gtk/gtktogglebutton.c: Replace "effect" by "affect" where
-	appropriate.  (#165108, Dan Winship)
-
 2005-01-24  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkwidget.c (gtk_widget_class_init): Document 
 	GtkWidget::style-set.  (#164222, Alex Graveley)
-	
+
 2005-01-22  Matthias Clasen  <mclasen@redhat.com>

 	* gdk/gdkdisplay.h (gdk_display_add_client_message_filter_full): 
@@ -365,6 +483,25 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	* gtk/gtktreeview.c (gtk_tree_view_leave_notify): Avoid spurious
 	drags.  (#164884)

+2005-01-23  Tor Lillqvist  <tml@novell.com>
+
+	Merged from HEAD:
+
+	Fix for #162790, by Iwan Wong:
+	
+	* gdk/win32/gdkdrawable-win32.c: Implement dashed lines
+	correctly. Simplify the interface to render_line_horizontal() and
+	render_line_vertical(). Need to draw lines "manually" also on
+	NT-based Windowses if we have a dash offset or are drawing
+	double-dashed lines.
+
+	* gdk/win32/gdkprivate-win32.h: Keep also the dash offset,
+	double-dash flag, and a brush for the background colour (used by
+	the odd dashes in the double-dash line style) in the GdkGCWin32
+	struct.
+
+	* gdk/win32/gdkgc-win32.c: Set up above new fields.
+
 2005-01-23  Tor Lillqvist  <tml@novell.com>

 	* gdk/win32/gdkkeys-win32.c (update_keymap): Handle Greek tonos
@@ -383,8 +520,6 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	connected or not, so it's easier to just not try getting the
 	volume name for them. See the bug report for discussion.

-	Make volume name display formats translatable.
-
 	Fix for #163702, from Ivan Wong: 
 	
 	* gdk/win32/gdkprivate-win32.h 
@@ -401,47 +536,15 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	(gdk_selection_send_notify_for_display): Remove the artifical
 	GDK_SELECTION_CLEAR event generation.

-2005-01-21  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkwidget.c (gtk_widget_get_accessible): More details
-	provided by Bill Haneman.
-
 2005-01-20  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkwidget.c (gtk_widget_get_accessible): Add docs.  (#164725,
-	George Kraft IV)
-
 	* gtk/gtkdialog.c (gtk_dialog_map): Don't loop forever
 	here, even if the only focusable widgets are labels.

-2005-01-20  Matthias Clasen  <mclasen@redhat.com>
-
-	Support tinting in GtkCellRendererPixbuf (#162903, Jorn Baayen):
-	
-	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_class_init) 
-	Add a follow-state property which when TRUE causes the pixbuf
-	to be tinted according to state.
-
-	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): 
-	Use follow-state and colorize the pixbuf when appropriate.	
-	
-2005-01-20  Matthias Clasen  <mclasen@redhat.com>
-
-	Support wrapping in GtkCellRendererText  (#163608):
-	
-	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): 
-	Add wrap-mode and wrap-width properties which cause a 
-	text cell to break to a specified width when set.
-
-	* gtk/gtkcellrenderertext.c (get_layout): Use wrap-mode
-	and wrap-width when they are set.
-
-2005-01-20  Matthias Clasen  <mclasen@redhat.com>
-
 	* gtk/gtkmodules.c (load_module): Don't reverse the order
 	of modules when putting them in gtk_modules.  (#162676, Dennis
 	Cranston, patch by Remus Draica)
-
+	
 	* gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash 
 	if the tree is empty.  (#164669, Priit Laes)

@@ -476,12 +579,6 @@ Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>

 	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): 
 	Support _NET_VIRTUAL_ROOTS.  (#163910, Carsten Haitzler)
-	
-	* gdk/gdk.symbols: 
-	* gdk/x11/gdkx.h: 
-	* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time): 
-	Add a function to obtain the last user interaction 
-	time.  (#163119, Elijah Newren)

 Tue Jan 18 13:56:09 2005  Manish Singh  <yosh@gimp.org>

@@ -495,22 +592,11 @@ Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org>

 2005-01-18  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
 	operation to select the first file if we are in SAVE or
 	CREATE_FOLDER modes.  Executing that operation would overwrite the
 	contents of the save-name entry.

-2005-01-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdkdisplay.h: 
-	* gdk/x11/gdkwindow-x11.c (gdk_display_warp_pointer): 
-	* gdk/win32/gdkwindow-win32.c (gdk_display_warp_pointer): Add
-	pointer warping to GDK.  (#160437)
-
-	* gtk/gtkcolorsel.c (key_press): Use gdk_display_warp_pointer.
-
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkstyle.c (gtk_default_draw_check) 
@@ -545,102 +631,9 @@ Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>

 	* gtk/gtkiconview.c: Remove debug output. (#164376, Jens Finke)

-Mon Jan 17 16:44:36 2005  Jonathan Blandford  <jrb@redhat.com>
+2005-01-17  Federico Mena Quintero  <federico@ximian.com>

-	* docs/Makefile.am (EXTRA_DIST): add tree-column-sizing.png to
-	dist.
-
-2005-01-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_add_bookmarks): Save
-	and restore the selected row in the bookmark list and the
-	save folder combo.  (#164290)
-
-2005-01-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_new_with_backend):
-	Fix argument order in docs.  
-
-2005-01-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtktextview.c (gtk_text_view_check_keymap_direction): 
-	* gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL 
-	if the keymap is neutral.  (#164125, Phil Blundell)
-
-2005-01-14  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtktreeview.c (gtk_tree_view_set_search_column): Allow to
-	reset the property to its default value -1. 
-	(gtk_tree_view_get_search_column): Return the default value in
-	the g_return_val_if_fail() check.  (#163864, Richard Hult)
-
-	* gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_value): 
-	Add a translator hint.  (#163889)
-
-	* configure.in: Check for _NL_TIME_FIRST_WEEKDAY too, since it
-	is an enum value, not a define. Pointed out by Tommi Komulainen.
-	* gtk/gtkcalendar.c (gtk_calendar_init): Adapt.
-
-2005-01-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* configure.in: Check for nl_langinfo()
-	* gtk/gtkcalendar.c (gtk_calendar_init): Use nl_langinfo() when it's
-	available to determine first day of week   (#163842, Vincent Untz)
-
-	* gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Add hints about 
-	the lifecycle of widgets.  (#159503, Christian Persch)
-
-	* demos/gtk-demo/main.c (create_text): Use monospace for the 
-	source code view.  (#163526, Theerud Lawtrakul)
-
-	* gtk/gtkaboutdialog.c (gtk_about_dialog_init): Use R as mnemonic
-	for the Credits button to avoid duplicate.  (#163465, Tim-Philipp 
-	Müller)
-	
-	* configure.in: Add an OS_LINUX conditional.
-
-	* gdk/Makefile.am (TESTS):
-	* gdk-pixbuf/Makefile.am (TESTS):
-	* gtk/Makefile.am (TESTS): Only run abicheck on Linux.  (#163917,
-	Roger Leigh)
-
-2005-01-13  Matthias Clasen <mclasen@redhat.com>
-
-	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
-	(gtk_tree_view_set_headers_clickable): Make the headers-visible
-	property readwrite instead of just writable, and remove the
-	g_return_if_fail check that there is a model when setting this
-	property. Also improve the blurb.  (#163851, Richard Hult)
-
-2005-01-12  Owen Taylor <otaylor@redhat.com>
-
-	* configure.in: Remove GLIB_DIVERT_BEFORE_HELP() on
-	initialization of gdktarget, that was causing it to be
-	evaluated before host was set. Simplify --with-gdktarget help
-	message.
-
-	* gtk/Makefile.am: Use grep | head -n 1 instead of grep -m 1 
-	which doesn't work with slightly older versions of GNU grep 
-	in install-libtool-import-lib rule.
-	
-2005-01-12  Tor Lillqvist  <tlillqvist@novell.com>
-
-	Fix for #162790, by Iwan Wong:
-	
-	* gdk/win32/gdkdrawable-win32.c: Implement dashed lines
-	correctly. Simplify the interface to render_line_horizontal() and
-	render_line_vertical(). Need to draw lines "manually" also on
-	NT-based Windowses if we have a dash offset or are drawing
-	double-dashed lines.
-
-	* gdk/win32/gdkprivate-win32.h: Keep also the dash offset,
-	double-dash flag, and a brush for the background colour (used by
-	the odd dashes in the double-dash line style) in the GdkGCWin32
-	struct.
-
-	* gdk/win32/gdkgc-win32.c: Set up above new fields.
-
-2005-01-10  Federico Mena Quintero  <federico@ximian.com>
+	Merged from HEAD:

 	Fix #162617.

@@ -662,6 +655,40 @@ Mon Jan 17 16:44:36 2005  Jonathan Blandford  <jrb@redhat.com>
 	(fill_in_mime_type): Don't return an error.  Don't do anything if
 	we don't have the stat info.

+2005-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_add_bookmarks): Save
+	and restore the selected row in the bookmark list and the
+	save folder combo.  (#164290)
+
+2005-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_new_with_backend):
+	Fix argument order in docs.  
+
+2005-01-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_check_keymap_direction): 
+	* gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL 
+	if the keymap is neutral.  (#164125, Phil Blundell)
+
+2005-01-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* gdk/Makefile.am (TESTS):
+	* gdk-pixbuf/Makefile.am (TESTS):
+	* gtk/Makefile.am (TESTS): Only run abicheck on Linux.  (#163917,
+	Roger Leigh)
+
+2005-01-13  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
+	(gtk_tree_view_set_headers_clickable): Make the headers-visible
+	property readwrite instead of just writable, and remove the
+	g_return_if_fail check that there is a model when setting this
+	property.  (#163851, Richard Hult)
+
 2005-01-10  Owen Taylor  <otaylor@redhat.com>

 	* Makefile.am (EXTRA_DIST): Adding missing ChangeLog.pre*
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,22 +1,217 @@
-2005-02-11  Owen Taylor  <otaylor@redhat.com>
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkwindow.c (gtk_window_size_allocate): Don't queue
-	a redraw if the size didn't change. queue a shallow redraw.
+	* === Released 2.6.4 ===

-2005-02-10  Owen Taylor  <otaylor@redhat.com>
+	* NEWS: Updates

-	* gtk/gtkwindow.c: Add a resizable-background style property
-	that, if set, causes the entire widget to be queued for
-	redraw on ::size-allocate.
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>

-2005-02-10  Owen Taylor  <otaylor@redhat.com>
+	* gtk/gtkmenutoolbutton.c (button_state_changed_cb): 
+	Fix prelighting.  (#157392, Vincent Noel, patch by
+	Christian Persch)

-	* gtk/gtkwidget.c: Add a draw-border style property to allow
-	themes to draw outside the widget's allocation.
+	* gtk/gtkicontheme.c (theme_lookup_icon): Make 
+	icon data caching work again.  (#168851, Alexander Larsson)

-	* gdk/x11/gdkevents-x11.c: Hack out Net/ThemeName to 
-	allow easier testing of theme stuff without having
-	to change global GNOME configuration.
+	* gdk-pixbuf/gdk-pixbuf.c:
+	* gdk-pixbuf/gdk-pixbuf-features.h.in:
+	* gtk/xdgmime/xdgmime.[hc]:
+	Revert the previous change, since it breaks
+	bin compat.
+
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkkeyuni.c
+	* gdk/gdkpixbuf-drawable.c
+	* gdk/gdkrgb.c
+	* gdk/x11/gdkdnd-x11.c
+	* gdk/x11/gdkevents-x11.c
+	* gdk/x11/gdkproperty-x11.c
+	* gdk/x11/gdkvisual-x11.c
+	* gdk-pixbuf/gdk-pixbuf.c
+	* gdk-pixbuf/gdk-pixbuf-features.h.in
+	* gtk/gtkaction.c
+	* gtk/gtkbindings.c
+	* gtk/gtkcolorbutton.c
+	* gtk/gtkcombo.c
+	* gtk/gtkcontainer.c
+	* gtk/gtkfilechooserdefault.c
+	* gtk/gtkfilesel.c
+	* gtk/gtkgamma.c
+	* gtk/gtkiconview.c
+	* gtk/gtkinputdialog.c
+	* gtk/gtkitemfactory.c
+	* gtk/gtkmenu.c
+	* gtk/gtktextview.c
+	* gtk/gtktooltips.c
+	* gtk/gtktreedatalist.c
+	* gtk/gtkuimanager.c
+	* gtk/tree_minus.xpm
+	* gtk/tree_plus.xpm
+	* gtk/xdgmime/xdgmime.c
+	* gtk/xdgmime/xdgmime.h: 
+	Move constant data to .rodata.
+
+2005-02-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.6.3 ===
+
+	* NEWS: Updates.
+
+2005-02-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaction.c (connect_proxy): Improve the handling
+	of buttons as action proxys.  (#165534, Milosz Derezynski)
+
+	* gtk/gtklabel.c (gtk_label_size_request): Fix a typo.  
+	(#168646, Vincent Untz)
+
+	* gtk/gtkfilechooserdefault.c (save_folder_combo_create): 
+	Unset "focus-on-click" for the save folder combo.  (#168688,
+	Sven Neumann)
+
+2005-02-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/testpixbuf.c (main): Remove a C++ comment.  (#168531, 
+	Paul Cornett)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level): Don't leak a 
+	path here.  (#168443, Morten Welinder)
+
+2005-02-24  Robert Ögren  <gtk@roboros.com>
+
+	Implement better handling of Wintab tablet context overlap on
+	Win32. (#167298)
+
+	* gdk/win32/gdkinput-win32.c (_gdk_input_set_tablet_active): New
+	function that brings any tablet contexts to the top of the overlap
+	order.
+	* gdk/win32/gdkinput-win32.h: Declare _gdk_input_set_tablet_active ()
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate):
+	Call _gdk_input_set_tablet_active when a window is activated (on
+	WM_ACTIVATE)
+
+2005-02-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates.
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_path): 
+	Don't leak parent_path.  (#168435, Morten Welinder)
+
+	* gtk/gtkcombobox.c: Consistently use gtk_tree_row_reference_valid().
+	(gtk_combo_box_model_row_deleted): Update the displayed row in 
+	the cell_view.  (#167842, Gustavo Carneiro)
+
+2005-02-24  Matthias Clasen  <mclasen@redhat.com>
+
+	Fix #167259, reported by  Christian Persch:
+	
+	* gtk/gtkwidget.c (gtk_widget_unparent): Unmap the reparented 
+	widget, even if we avoid the unrealizing. 
+	(gtk_widget_reparent_subwindows): Make reparenting work for
+	!NO_WINDOW widgets which have other windows which are siblings
+	of widget->window (as e.g. GtkSpinButton).
+
+2005-02-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): 
+	Don't emit a warning if a parent node is filtered out. (#164726,
+	Olivier Sessink)
+
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_style_set): Revert the last 
+	change, since gtk_widget_set_style_internal() already
+	queues a resize.
+
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_style_set): Queue a resize, since
+	fonts may have changed.  (#164128, Phil Blundell)
+
+	* gtk/gtkaboutdialog.c (gtk_about_dialog_init) 
+	(gtk_about_dialog_new): Move initialization code from _new to 
+	_init.  (#168249, Murray Cumming)
+
+Wed Feb 23 17:34:01 2005  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_node_queue_redraw): Patch from
+	jorn@nl.linux.org (Jorn Baayen) to notice changes to fixed-height
+	widgets.
+
+2005-02-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap): Workaround for bug in
+	MapVirtualKey(VK_DIVIDE, 0) in some Windows versions. (#142998)
+
+Tue Feb 22 13:49:09 2005  Manish Singh  <yosh@gimp.org>
+
+        * gtk/updateiconcache.c: #include <config.h>
+
+2005-02-22  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #164940, patch by Ben Maurer and Tommi Komulainen.
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_565_d): Constify the "dmp" variable.
+	(gdk_rgb_convert_565_d): Likewise.
+	(DM_565): Made a static const precomputed array to avoid
+	allocating it at runtime.
+	(gdk_rgb_preprocess_dm_565): #ifdef out.
+
+2005-02-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkclipboard.c: Fix freedesktop.org links in the docs.
+
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): 
+	Set have_render_with_trapezoids to GDK_YES when we have 
+	a new enough Render extension.  (#167965,Billy Biggs) 
+
+	* gdk/x11/gdkx.h: 
+	* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time_libgtk_only):
+	Add libgtk_only api to obtain the user_time of the display. 
+	This function will become generally available api in 2.8.
+
+	* gtk/gtkwindow.c (gtk_window_present): Use the timestamp of
+	the last user interaction when focusing the window.  (#166379, 
+	Elijah Newren)
+
+Thu Feb 17 14:52:57 2005  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.
+
+2005-02-16  Matthias Clasen  <mclasen@redhat.com>
+
+	Fixes for #143829, Tommi Komulainen, Christian Persch:
+	
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): Remove the
+	typeselect_flush_timeout when destroying the widgets
+	it is operating on.  
+	(gtk_tree_view_ensure_interactive_directory): Add the 
+	popup to the window group of the toplevel it belongs to.
+
+	* gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget) 
+	(gtk_combo_box_popup): Do the same here. 
+
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkpathbar.c (gtk_path_bar_finalize): Stop scrolling 
+	when the pathbar goes away.  (#167094, Rodney Dawes)
+	(change_icon_theme): Use GTK_ICON_SIZE_MENU here as 
+	well  (Vincent Noel)
+
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Complete the fix for #165770, Vincent Noel:
+	
+	* gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
+	fallback size be 16, to be equal to the default for
+	GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
+	(gtk_file_chooser_button_init):
+	(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+	GTK_ICON_SIZE_SMALL_TOOLBAR. 

 2005-02-09  Matthias Clasen  <mclasen@redhat.com>

@@ -27,47 +222,13 @@

 	* configure.in: Added "xh" to ALL_LINGUAS.

-2005-02-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkuimanager.c (start_element_handler): Accept 
-	the "expand" attribute and set a flag in the node if it
-	is set to "true".
-	(update_node): If the expand flag is set, make separator
-	toolitems non-drawn and expanding.  (#166489, Christian Persch)
-
-2005-02-05  Hans Breuer  <hans@breuer.org>
-
-	* gdk/makefile.msc gdk/win32/makefile.msc gtk/makefile.msc.in :
-	build with Cairo dependency. The patch to acually use Cairo
-	on win32 will be on gtk-devel-list soon.
-	* tests/makefile.msc : add testcairo building
-
-	* gtk/stock-icons/makefile.msc : split command line into two to
-	work with the shells default
-
-Fri Feb  4 14:16:31 2005  Manish Singh  <yosh@gimp.org>
-
-	* gtk/gtkaccelgroup.c (substitute_underscores): remove unused
-	function.
-
-	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
-	Add some extra parens for bitop order of operations disambiguiation.
-
-	* gtk/gtkstock.c: Fix const confusion, make our own copy of the 
-	domain when setting a translate function.
-
-	* tests/testcombo.c: removed unused variable.
-
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain
-	being NULL.  (#166179, Diego Gonzalez)
+	* configure.in: Post-release version bump.

-2005-02-04  Owen Taylor  <otaylor@redhat.com>
+	* === Released 2.6.2 ===

-	* configure.in: Revert gtk_binary_version to 2.4.0. Fix
-	up comment to talk only about backwards compat, not
-	forward/backwards compat. (#166293, reported by Vincent Noel)
+	* NEWS: Updates

 2005-02-04  Matthias Clasen  <mclasen@redhat.com>

@@ -75,59 +236,36 @@ Fri Feb  4 14:16:31 2005  Manish Singh  <yosh@gimp.org>
 	when there is not enough space. This avoids a nasty size
 	allocation loop in the file chooser.  (#154007, reported 
 	by Milosz Derezynski, patch by Robert Ögren)
-
+	
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
 	selection of RTL direction if the widget does not have 
 	focus.  (#164125, Frederic Crozat)

-Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
-
-	* gdk/x11/gdkdrawable-x11.c: #include cairo-xlib.h
-
-2005-02-03  Owen Taylor  <otaylor@redhat.com>
-
-	* gdk/gdkdrawable.[ch] gdkpixmap.c gdkwindow.c: Add
-	gdk_drawable_set_cairo_target().
-
-	* tests/testtreeflow.c (enum): Use grand not rand as a variable
-	name because one of the cairo headers is pulling in stdlib.h.
-
-	* tests/testcairo.c tests/Makefile.am: Add a simple cairo based
-	example.
-
-	* configure.in: Bump release to 2.7.0, gtk_binary_version to 2.7.0.
-
- 	* Require libpangocairo for all backends.
-
 2005-02-03  Tor Lillqvist  <tml@novell.com>

 	* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
 	wide character version of ImmGetCompositionString() here,
 	too. (#165278, Takuro Ashie)

+2005-02-03  Mark McLoughlin  <mark@skynet.ie>
+
+	* gtk/gtkicontheme.c: (load_themes): remove debug spew.
+
 2005-02-03  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do
 	one roundtrip per motion event.  (#166173, pointed out
 	by Chris Lee, patch by Søren Sandmann)

-	* gtk/gtk.symbols: 
-	* gtk/gtkstock.h: 
-	* gtk/gtkstock.c (gtk_stock_set_translate_func): 
-	New function which allows to change the function used for
-	translation stock labels, on a per-domain basis. Use this
-	functionality to switch the GTK+ stock items to use Q_()
-	prefixed msgids.  (#166179, Funda Wang)
-	
+2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+
 	* gdk/gdkkeynames.c: Make the gdk_key array const (#166075,
 	Tommi Komulainen)

 2005-02-02  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
 	Don't select the first row if the chooser is not mapped.  This
 	happens when it's acting on behalf of GtkFileChooserButton.  Also,
@@ -162,6 +300,10 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
 	of a single window so that gtk_clipboard_request_contents() can be
 	called inside a GtkClipboardReceivedFunc(). (#163844)

+2005-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
 2005-02-01  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
@@ -169,23 +311,19 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>

 	* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
 	to NULL after freeing it.  (#165800, Damon Chaplin)
-
-2005-02-01  Michael Natterer  <mitch@gimp.org>
-
-	* configure.in: depend on stable pango-1.8, not unstable 1.7
-
+	
 2005-02-01  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c
 	(browse_files_model_finished_loading_cb): Don't
 	g_assert_not_reached() if we are in any other state.  Another code
 	path may have triggered a folder reload.  Fixes #165556.

-2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+2005-02-01  Michael Natterer  <mitch@gimp.org>

-	Merged from gtk-2-6:
+	* configure.in: depend on stable pango-1.8, not unstable 1.7
+
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>

 	Fix #165770:

@@ -197,6 +335,9 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>

 2005-02-01  Matthias Clasen  <mclasen@redhat.com>

+	* gtk/gtktreeview.c (gtk_tree_view_adjustment_changed): 
+	Remove debug printf.  (#165877, Carlos Garnacho Parro)
+
 	* */*.c: Fix many instances of "the the" in docs and
 	comments.  (#165815, Masao Mutoh)

@@ -224,19 +365,12 @@ Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
 	* modules/input/gtkimcontextxim.c: Use NULL, not 0 to terminate 
 	NULL-terminated va lists.  (#165683)

-2005-01-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkseparatortoolitem.c (gtk_separator_tool_item_set_draw): 
-	Typo fix.  (#165581, Masao Mutoh)
-
 Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 	* README.cvs-commits: update ancient IRC info.

 2005-01-27  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c
 	(gtk_file_chooser_default_select_path): Oops, don't assert that we
 	can't reach the end of the function; this happens if we are still
@@ -244,9 +378,6 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 2005-01-27  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): 
-	Make wrapping work in RTL mode.  
-
 	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
 	obey HIG spacing a bit more, add a hand cursor when over the
 	link button.  (#163979, Jorn Baayen)
@@ -275,7 +406,7 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 	* gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Fix 
 	docs.  (#165163, Jeff Franks)
-	
+
 	* gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
 	for a string GValue.  (#165203, Damon Chaplin)

@@ -291,8 +422,6 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>

 2005-01-24  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	Fix #147785 and clean up the loading code:

 	* gtk/gtkfilechooserdefault.c (LoadState): Make the set of states
@@ -340,22 +469,11 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	* tests/testfilechooser.c (main): Add a button to the command
 	window to unmap and remap the file chooser.

-2005-01-24  Matthias Clasen  <mclasen@redhat.com>
-
-	* docs/tutorial/gtk-tut.sgml:
-	* docs/tutorial/gtk_tut.sgml:
-	* docs/reference/gtk/tmpl/gtkliststore.sgml:
-	* gtk/gtkactiongroup.c:
-	* gtk/gtksizegroup.c:
-	* gtk/gtksizegroup.h:
-	* gtk/gtktogglebutton.c: Replace "effect" by "affect" where
-	appropriate.  (#165108, Dan Winship)
-
 2005-01-24  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkwidget.c (gtk_widget_class_init): Document 
 	GtkWidget::style-set.  (#164222, Alex Graveley)
-	
+
 2005-01-22  Matthias Clasen  <mclasen@redhat.com>

 	* gdk/gdkdisplay.h (gdk_display_add_client_message_filter_full): 
@@ -365,6 +483,25 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	* gtk/gtktreeview.c (gtk_tree_view_leave_notify): Avoid spurious
 	drags.  (#164884)

+2005-01-23  Tor Lillqvist  <tml@novell.com>
+
+	Merged from HEAD:
+
+	Fix for #162790, by Iwan Wong:
+	
+	* gdk/win32/gdkdrawable-win32.c: Implement dashed lines
+	correctly. Simplify the interface to render_line_horizontal() and
+	render_line_vertical(). Need to draw lines "manually" also on
+	NT-based Windowses if we have a dash offset or are drawing
+	double-dashed lines.
+
+	* gdk/win32/gdkprivate-win32.h: Keep also the dash offset,
+	double-dash flag, and a brush for the background colour (used by
+	the odd dashes in the double-dash line style) in the GdkGCWin32
+	struct.
+
+	* gdk/win32/gdkgc-win32.c: Set up above new fields.
+
 2005-01-23  Tor Lillqvist  <tml@novell.com>

 	* gdk/win32/gdkkeys-win32.c (update_keymap): Handle Greek tonos
@@ -383,8 +520,6 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	connected or not, so it's easier to just not try getting the
 	volume name for them. See the bug report for discussion.

-	Make volume name display formats translatable.
-
 	Fix for #163702, from Ivan Wong: 
 	
 	* gdk/win32/gdkprivate-win32.h 
@@ -401,47 +536,15 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 	(gdk_selection_send_notify_for_display): Remove the artifical
 	GDK_SELECTION_CLEAR event generation.

-2005-01-21  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkwidget.c (gtk_widget_get_accessible): More details
-	provided by Bill Haneman.
-
 2005-01-20  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtkwidget.c (gtk_widget_get_accessible): Add docs.  (#164725,
-	George Kraft IV)
-
 	* gtk/gtkdialog.c (gtk_dialog_map): Don't loop forever
 	here, even if the only focusable widgets are labels.

-2005-01-20  Matthias Clasen  <mclasen@redhat.com>
-
-	Support tinting in GtkCellRendererPixbuf (#162903, Jorn Baayen):
-	
-	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_class_init) 
-	Add a follow-state property which when TRUE causes the pixbuf
-	to be tinted according to state.
-
-	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): 
-	Use follow-state and colorize the pixbuf when appropriate.	
-	
-2005-01-20  Matthias Clasen  <mclasen@redhat.com>
-
-	Support wrapping in GtkCellRendererText  (#163608):
-	
-	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): 
-	Add wrap-mode and wrap-width properties which cause a 
-	text cell to break to a specified width when set.
-
-	* gtk/gtkcellrenderertext.c (get_layout): Use wrap-mode
-	and wrap-width when they are set.
-
-2005-01-20  Matthias Clasen  <mclasen@redhat.com>
-
 	* gtk/gtkmodules.c (load_module): Don't reverse the order
 	of modules when putting them in gtk_modules.  (#162676, Dennis
 	Cranston, patch by Remus Draica)
-
+	
 	* gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash 
 	if the tree is empty.  (#164669, Priit Laes)

@@ -476,12 +579,6 @@ Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>

 	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): 
 	Support _NET_VIRTUAL_ROOTS.  (#163910, Carsten Haitzler)
-	
-	* gdk/gdk.symbols: 
-	* gdk/x11/gdkx.h: 
-	* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time): 
-	Add a function to obtain the last user interaction 
-	time.  (#163119, Elijah Newren)

 Tue Jan 18 13:56:09 2005  Manish Singh  <yosh@gimp.org>

@@ -495,22 +592,11 @@ Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org>

 2005-01-18  Federico Mena Quintero  <federico@ximian.com>

-	Merged from gtk-2-6:
-
 	* gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
 	operation to select the first file if we are in SAVE or
 	CREATE_FOLDER modes.  Executing that operation would overwrite the
 	contents of the save-name entry.

-2005-01-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdkdisplay.h: 
-	* gdk/x11/gdkwindow-x11.c (gdk_display_warp_pointer): 
-	* gdk/win32/gdkwindow-win32.c (gdk_display_warp_pointer): Add
-	pointer warping to GDK.  (#160437)
-
-	* gtk/gtkcolorsel.c (key_press): Use gdk_display_warp_pointer.
-
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkstyle.c (gtk_default_draw_check) 
@@ -545,102 +631,9 @@ Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>

 	* gtk/gtkiconview.c: Remove debug output. (#164376, Jens Finke)

-Mon Jan 17 16:44:36 2005  Jonathan Blandford  <jrb@redhat.com>
+2005-01-17  Federico Mena Quintero  <federico@ximian.com>

-	* docs/Makefile.am (EXTRA_DIST): add tree-column-sizing.png to
-	dist.
-
-2005-01-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_add_bookmarks): Save
-	and restore the selected row in the bookmark list and the
-	save folder combo.  (#164290)
-
-2005-01-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_new_with_backend):
-	Fix argument order in docs.  
-
-2005-01-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtktextview.c (gtk_text_view_check_keymap_direction): 
-	* gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL 
-	if the keymap is neutral.  (#164125, Phil Blundell)
-
-2005-01-14  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtktreeview.c (gtk_tree_view_set_search_column): Allow to
-	reset the property to its default value -1. 
-	(gtk_tree_view_get_search_column): Return the default value in
-	the g_return_val_if_fail() check.  (#163864, Richard Hult)
-
-	* gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_value): 
-	Add a translator hint.  (#163889)
-
-	* configure.in: Check for _NL_TIME_FIRST_WEEKDAY too, since it
-	is an enum value, not a define. Pointed out by Tommi Komulainen.
-	* gtk/gtkcalendar.c (gtk_calendar_init): Adapt.
-
-2005-01-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* configure.in: Check for nl_langinfo()
-	* gtk/gtkcalendar.c (gtk_calendar_init): Use nl_langinfo() when it's
-	available to determine first day of week   (#163842, Vincent Untz)
-
-	* gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Add hints about 
-	the lifecycle of widgets.  (#159503, Christian Persch)
-
-	* demos/gtk-demo/main.c (create_text): Use monospace for the 
-	source code view.  (#163526, Theerud Lawtrakul)
-
-	* gtk/gtkaboutdialog.c (gtk_about_dialog_init): Use R as mnemonic
-	for the Credits button to avoid duplicate.  (#163465, Tim-Philipp 
-	Müller)
-	
-	* configure.in: Add an OS_LINUX conditional.
-
-	* gdk/Makefile.am (TESTS):
-	* gdk-pixbuf/Makefile.am (TESTS):
-	* gtk/Makefile.am (TESTS): Only run abicheck on Linux.  (#163917,
-	Roger Leigh)
-
-2005-01-13  Matthias Clasen <mclasen@redhat.com>
-
-	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
-	(gtk_tree_view_set_headers_clickable): Make the headers-visible
-	property readwrite instead of just writable, and remove the
-	g_return_if_fail check that there is a model when setting this
-	property. Also improve the blurb.  (#163851, Richard Hult)
-
-2005-01-12  Owen Taylor <otaylor@redhat.com>
-
-	* configure.in: Remove GLIB_DIVERT_BEFORE_HELP() on
-	initialization of gdktarget, that was causing it to be
-	evaluated before host was set. Simplify --with-gdktarget help
-	message.
-
-	* gtk/Makefile.am: Use grep | head -n 1 instead of grep -m 1 
-	which doesn't work with slightly older versions of GNU grep 
-	in install-libtool-import-lib rule.
-	
-2005-01-12  Tor Lillqvist  <tlillqvist@novell.com>
-
-	Fix for #162790, by Iwan Wong:
-	
-	* gdk/win32/gdkdrawable-win32.c: Implement dashed lines
-	correctly. Simplify the interface to render_line_horizontal() and
-	render_line_vertical(). Need to draw lines "manually" also on
-	NT-based Windowses if we have a dash offset or are drawing
-	double-dashed lines.
-
-	* gdk/win32/gdkprivate-win32.h: Keep also the dash offset,
-	double-dash flag, and a brush for the background colour (used by
-	the odd dashes in the double-dash line style) in the GdkGCWin32
-	struct.
-
-	* gdk/win32/gdkgc-win32.c: Set up above new fields.
-
-2005-01-10  Federico Mena Quintero  <federico@ximian.com>
+	Merged from HEAD:

 	Fix #162617.

@@ -662,6 +655,40 @@ Mon Jan 17 16:44:36 2005  Jonathan Blandford  <jrb@redhat.com>
 	(fill_in_mime_type): Don't return an error.  Don't do anything if
 	we don't have the stat info.

+2005-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_add_bookmarks): Save
+	and restore the selected row in the bookmark list and the
+	save folder combo.  (#164290)
+
+2005-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_new_with_backend):
+	Fix argument order in docs.  
+
+2005-01-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_check_keymap_direction): 
+	* gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL 
+	if the keymap is neutral.  (#164125, Phil Blundell)
+
+2005-01-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* gdk/Makefile.am (TESTS):
+	* gdk-pixbuf/Makefile.am (TESTS):
+	* gtk/Makefile.am (TESTS): Only run abicheck on Linux.  (#163917,
+	Roger Leigh)
+
+2005-01-13  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
+	(gtk_tree_view_set_headers_clickable): Make the headers-visible
+	property readwrite instead of just writable, and remove the
+	g_return_if_fail check that there is a model when setting this
+	property.  (#163851, Richard Hult)
+
 2005-01-10  Owen Taylor  <otaylor@redhat.com>

 	* Makefile.am (EXTRA_DIST): Adding missing ChangeLog.pre*
--- a/4
+++ b/4
@@ -18,8 +18,8 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================

-  % gzip -cd gtk+-2.6.1.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.6.1			   # change to the toplevel directory
+  % gzip -cd gtk+-2.6.4.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.6.4			   # change to the toplevel directory
  % ./configure				   # run the `configure' script
  % make				   # build GTK
  [ Become root if necessary ]
--- a/63
+++ b/63
@@ -1,3 +1,66 @@
+Overview of Changes from GTK+ 2.6.3 to GTK+ 2.6.4
+=================================================
+* Move a lot of const data to the .rodata section [Matthias Clasen]
+* Make caching of .icon files work again [Alexander Larsson]
+* Fix many translations of our single Q_() message 
+  to not include the prefix [Christian Persch]
+
+Overview of Changes from GTK+ 2.6.2 to GTK+ 2.6.3
+=================================================
+* GtkAction
+ - Improve the handling of buttons as action 
+   proxys [Milosz Derezynski]
+* gtk_window_present(): Use the timestamp of the last 
+  user interaction when focusing the window.  [Elijah Newren]
+* Icon theme
+ - Avoid scaling icons in the file chooser [Vincent Noel]
+ - Make icon theme caching work on ppc64 [Manish Singh]
+* Win32 
+ - Bug fixes [Tor Lillqvist]
+ - Improve tablet handling [Robert Ögren]
+* Other bug fixes [Rodney Dawes, Tommi Komulainen,
+  Christian Persch, Manish Singh, Billy Biggs, Ben Maurer,
+  Jorn Baayen, Jonathan Blandford, Murray Cumming, 
+  Olivier Sessink, Matthias, Gustavo Carneiro, Morten
+  Welinder, Samuel Hym, Doug Morgan, Ivan Wong, Paul
+  Cornett, Sven Neumann, Vincent Untz]
+* Documentation improvements [Matthias, Torsten Schoenfeld]
+* New and improved translations (ar,be,bg,ca,cy,el,en_GB,fa,gu,ja,hu,pt_BR,th,uk,xh)
+
+Overview of Changes from GTK+ 2.6.1 to GTK+ 2.6.2
+=================================================
+* Speed up size allocation of labels, progress bars and
+  text cell renderers [Anders Carlsson]
+* Add a --quiet option to gtk-update-icon-cache [Matthias]
+* GtkFileChooser
+ - Bug fixes [Federico Mena Quintero]
+ - Don't overwrite the contents of the name entry 
+   when changing folders in save mode.  [Federico]
+ - Don't return nonexisting folders in save mode [Jean Marie Favreau]
+ - Fix a size allocation loop [Milosz Derezynski, Robert Ögren]
+* GtkAboutDialog
+ - Better HIG compliance [Jorn Baayen]
+* GDK
+ - Work with Xservers implementing old versions
+   of the Render extension [Albert Chin]
+ - Respect _NET_VIRTUAL_ROOTS [Carsten Haitzler]
+* Win32
+ - Bug fixes [Tor Lillqvist, Ivan Wong, David Neary, Daniel Atallah,
+   Takuro Ashie]
+ - Make keyboard input work in Indic languages [Tor]
+ - Initialize extended input devices lazily  [Robert Ögren]
+* Other bug fixes [Owen Taylor, Richard Hult, Phil Blundell,
+  Jens Finke, Michael Natterer, Manish Singh, Kjartan Maraas,
+  Priit Laes, Dennis Cranston, Remus Draica, Matthias,
+  Jeff Franks, Elijah Newren, Damon Chaplin, Vincent Ladeuil,
+  Carlos Garnacho Parro, Thomas Zajic, Crispin Flowerday,
+  Tommi Komulainen, Søren Sandmann, Chris Lee, Mark McLoughlin]
+* Documentation improvements [Murray Cumming, Matthias, Alex Graveley,
+  Jeff Franks, Christian Rose, Masao Mutoh, Karel Kulhavy, Roger 
+  Light]
+* New and improved translations (bg,ca,cs,cy,da,de,el,en_CA,es,et,hu,it,
+  ja,ko,lt,nb,nl,nn,no,pl,pt,pt_BR,sk,sq,sv,zh_CN)
+
 Overview of Changes from GTK+ 2.6.0 to GTK+ 2.6.1
 =================================================
 * GtkFileChooser
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 General Information
 ===================

-This is GTK+ version 2.6.1. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.6.4. 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.
--- a/configure.in
+++ b/configure.in
@@ -11,21 +11,19 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [7])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_minor_version], [6])
+m4_define([gtk_micro_version], [4])
 m4_define([gtk_version],
          [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_interface_age], [4])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 # This is the X.Y used in -lgtk-FOO-X.Y
 m4_define([gtk_api_version], [2.0])

 # Define a string for the earliest version that this release has
-# backwards binary compatibility with for all interfaces a module
-# might. Unless we add module-only API with lower stability
-# guarantees, this should be unchanged until we break binary compat
-# for GTK+.
+# forward/backwards binary compatibility with. This is used for module
+# locations. (Should this be backwards-compat instead?)
 #
 #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
 m4_define([gtk_binary_version], [2.4.0])
@@ -215,13 +213,15 @@ AC_ARG_WITH(ie55,
            [AC_HELP_STRING([--with-ie55=DIRECTORY],
                            [IE5.5 libs and headers (for Active IMM)])])

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

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

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

 AC_CHECK_FUNCS(lstat mkstemp flockfile)

-# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
-AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
-AC_TRY_LINK([#include <langinfo.h>], [
-char c;
-c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
-], gtk_ok=yes, gtk_ok=no)
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
-	    [Define if _NL_TIME_FIRST_WEEKDAY is available])
-fi
-
 # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
 AC_MSG_CHECKING(for sigsetjmp)
 AC_TRY_LINK([#include <setjmp.h>], [
@@ -1405,7 +1393,7 @@ fi
 #

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

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

--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.4 ===
+
+2005-02-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.3 ===
+
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>

 	* === Released 2.6.1 ===
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -666,7 +666,7 @@ create_text (GtkTextBuffer **buffer,
  
  if (is_source)
    {
-      font_desc = pango_font_description_from_string ("monospace");
+      font_desc = pango_font_description_from_string ("Courier 12");
      gtk_widget_modify_font (text_view, font_desc);
      pango_font_description_free (font_desc);

--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -525,7 +525,7 @@ main (int argc, char **argv)

 	gtk_init (&argc, &argv);

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

 	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());

--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,11 +1,28 @@
-2005-02-08  Matthias Clasen  <mclasen@redhat.com>
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>

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

-2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+2005-02-28  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/gtk-sections.txt: Add gtk_stock_set_translate_func.
+	* === Released 2.6.3 ===
+
+2005-02-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtktreeselection.sgml:
+	* gtk/tmpl/gtktreeview.sgml:
+	* gtk/tmpl/gtktreeviewcolumn.sgml: Fix typos
+	in see also lists.  (# 168698, Torsten Schoenfeld)
+
+	* gtk/tmpl/gtktreemodel.sgml: Fix stack vs heap 
+	confusion.  (#168690, Torsten Schoenfeld)
+
+2005-02-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkcalendar.sgml: Some additions. 
+
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===

 2005-02-02  Matthias Clasen  <mclasen@redhat.com>

@@ -20,22 +37,10 @@

 2005-01-25  Matthias Clasen  <mclasen@redhat.com>

-	* gtk/tmpl/gtksocket.sgml:
+	* gtk/tmpl/gtksocket.sgml: 
 	* gtk/tmpl/gtkplug.sgml: Add note on limited
 	availability.  (#164347, Roger Light)
-
-2005-01-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk/gdk-sections.txt: Add gdk_x11_display_get_user_time.
-
-2005-01-18  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk-docs.sgml: Add an index for 2.8 symbols.
-
-	* gdk/gdk-docs.sgml: Add an index for 2.8 symbols.
-
-	* gdk/gdk-sections.txt: Add gdk_display_warp_pointer.
-
+	
 2005-01-15  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/building.sgml: Some updates.  (#164147, #164108, 
--- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml
+++ b/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.
--- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml
+++ b/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>

--- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
+++ b/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>

--- a/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
+++ b/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>

--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
+++ b/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
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml
+++ b/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>

--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml
+++ b/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>

--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml
+++ b/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>

--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml
+++ b/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.
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
+++ b/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;
--- a/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
+++ b/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.
--- a/docs/reference/gdk-pixbuf/tmpl/inline.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/inline.sgml
@@ -14,6 +14,9 @@ Functions for inlined pixbuf handling.

  </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixdata ##### -->
  <para>

--- a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
+++ b/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>

--- a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
+++ b/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>

--- a/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
+++ b/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
--- a/docs/reference/gdk-pixbuf/tmpl/util.sgml
+++ b/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>

--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -100,8 +100,5 @@
  <index role="2.6">
    <title>Index of new symbols in 2.6</title>
  </index>  
-  <index role="2.6">
-    <title>Index of new symbols in 2.8</title>
-  </index>  

 </book>
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -142,7 +142,6 @@ gdk_display_get_pointer
 gdk_display_get_window_at_pointer
 GdkDisplayPointerHooks
 gdk_display_set_pointer_hooks
-gdk_display_warp_pointer
 gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
@@ -1240,7 +1239,6 @@ gdk_x11_screen_supports_net_wm_hint
 gdk_x11_screen_get_window_manager_name
 gdk_x11_screen_lookup_visual
 gdk_x11_window_set_user_time
-gdk_x11_display_get_user_time
 gdk_x11_colormap_foreign_new
 gdk_x11_colormap_get_xcolormap
 gdk_x11_colormap_get_xdisplay
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/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 
--- a/docs/reference/gdk/tmpl/cursors.sgml
+++ b/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.
--- a/docs/reference/gdk/tmpl/dnd.sgml
+++ b/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>
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/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
--- a/docs/reference/gdk/tmpl/event_structs.sgml
+++ b/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,
--- a/docs/reference/gdk/tmpl/events.sgml
+++ b/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.
--- a/docs/reference/gdk/tmpl/fonts.sgml
+++ b/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
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/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.
--- a/docs/reference/gdk/tmpl/gdkdisplay.sgml
+++ b/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
@@ -278,17 +281,6 @@ Applications should never have any reason to use this facility
@Returns: 


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

--- a/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
+++ b/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 
--- a/docs/reference/gdk/tmpl/gdkscreen.sgml
+++ b/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 
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/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.
--- a/docs/reference/gdk/tmpl/images.sgml
+++ b/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.
--- a/docs/reference/gdk/tmpl/input.sgml
+++ b/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
--- a/docs/reference/gdk/tmpl/input_devices.sgml
+++ b/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
--- a/docs/reference/gdk/tmpl/keys.sgml
+++ b/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
--- a/docs/reference/gdk/tmpl/pango_interaction.sgml
+++ b/docs/reference/gdk/tmpl/pango_interaction.sgml
@@ -129,6 +129,9 @@ g_object_unref (gc);

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPangoRenderer ##### -->
 <para>

--- a/docs/reference/gdk/tmpl/pixbufs.sgml
+++ b/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>

--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/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.
--- a/docs/reference/gdk/tmpl/properties.sgml
+++ b/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
--- a/docs/reference/gdk/tmpl/regions.sgml
+++ b/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.
--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/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
--- a/docs/reference/gdk/tmpl/selections.sgml
+++ b/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 
--- a/docs/reference/gdk/tmpl/threads.sgml
+++ b/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+
--- a/docs/reference/gdk/tmpl/visuals.sgml
+++ b/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
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/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.
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/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. 
@@ -440,15 +443,6 @@ Since: 2.2
@timestamp: 


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

--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -178,7 +178,7 @@ How to compile GTK+ itself
 	  <ulink url="http://www.pango.org">Pango</ulink> is a library
 	  for internationalized text handling. It is available from
 	  the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP
-	  site.</ulink>. 
+	  site.</ulink>. GTK+ 2.6 requires Pango 1.8.
 	</para>
      </listitem>
      <listitem>
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -606,8 +606,5 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
  <index role="2.6">
    <title>Index of new symbols in 2.6</title>
  </index>  
-  <index role="2.8">
-    <title>Index of new symbols in 2.8</title>
-  </index>  

 </book>
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -5363,7 +5363,6 @@ gtk_stock_item_copy
 gtk_stock_item_free
 gtk_stock_list_ids
 gtk_stock_lookup
-gtk_stock_set_translate_func
 <SUBSECTION Stock IDs>
 GTK_STOCK_ABOUT
 GTK_STOCK_ADD
--- a/docs/reference/gtk/tmpl/gtkaboutdialog.sgml
+++ b/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
--- a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml
+++ b/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
--- a/docs/reference/gtk/tmpl/gtkaccelmap.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccelmap.sgml
@@ -14,6 +14,9 @@ Loadable keyboard accelerator specifications

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAccelMap ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkaccessible.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccessible.sgml
@@ -14,6 +14,9 @@ Accessibility support for widgets

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkAccessible ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkaction.sgml
+++ b/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
--- a/docs/reference/gtk/tmpl/gtkactiongroup.sgml
+++ b/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 
--- a/docs/reference/gtk/tmpl/gtkadjustment.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkalignment.sgml
+++ b/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
--- a/docs/reference/gtk/tmpl/gtkarrow.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkaspectframe.sgml
+++ b/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>

--- a/docs/reference/gtk/tmpl/gtkbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbbox.sgml
@@ -46,6 +46,9 @@ used to spread the buttons in a button box across the container, respectively.
 </variablelist>
 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkButtonBox ##### -->
 <para>
 This is a read-only struct; no members should be modified directly.
--- a/docs/reference/gtk/tmpl/gtkbin.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkbindings.sgml
+++ b/docs/reference/gtk/tmpl/gtkbindings.sgml
@@ -14,6 +14,9 @@ Key bindings for individual widgets

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkBindingSet ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkbox.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkcalendar.sgml
+++ b/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
@@ -255,8 +258,8 @@ Obtains the selected date from a #GtkCalendar.

@calendar: a #GtkCalendar.
@year: location to store the year number.
-@month: location to store the month number.
-@day: location to store the day number.
+@month: location to store the month number (between 0 and 11).
+@day: location to store the day number (between 1 and 31).


 <!-- ##### FUNCTION gtk_calendar_freeze ##### -->
--- a/docs/reference/gtk/tmpl/gtkcelleditable.sgml
+++ b/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>

--- a/docs/reference/gtk/tmpl/gtkcelllayout.sgml
+++ b/docs/reference/gtk/tmpl/gtkcelllayout.sgml
@@ -16,6 +16,9 @@ attributes and data funcs.

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellLayout ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml
+++ b/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>

--- a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
@@ -30,17 +30,15 @@ property is set to a pixbuf, it renders that one.

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererPixbuf ##### -->
 <para>

 </para>


-<!-- ##### ARG GtkCellRendererPixbuf:follow-state ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCellRendererPixbuf:pixbuf ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml
@@ -14,6 +14,9 @@ Renders numbers as progress bars

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererProgress ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
+++ b/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>

@@ -237,16 +240,6 @@ the #GtkCellRendererText allows to edit its text using an entry.

 </para>

-<!-- ##### ARG GtkCellRendererText:wrap-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:wrap-width ##### -->
-<para>
-
-</para>
-
 <!-- ##### FUNCTION gtk_cell_renderer_text_new ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
+++ b/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>

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

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCellView ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkclipboard.sgml
+++ b/docs/reference/gtk/tmpl/gtkclipboard.sgml
@@ -84,6 +84,9 @@ Storing data on clipboards
 </variablelist>
 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkClipboard ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkclist.sgml
+++ b/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
--- a/docs/reference/gtk/tmpl/gtkcolorbutton.sgml
+++ b/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>

--- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml
+++ b/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, 
--- a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkcombo.sgml
+++ b/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.
--- a/docs/reference/gtk/tmpl/gtkcombobox.sgml
+++ b/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>

--- a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
+++ b/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>

--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -96,6 +96,9 @@ changes, use gtk_widget_child_notify().

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkContainer ##### -->
 <para>

--- a/docs/reference/gtk/tmpl/gtkctree.sgml
+++ b/docs/reference/gtk/tmpl/gtkctree.sgml
@@ -33,6 +33,9 @@ in newly written code. Use #GtkTreeView instead.

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCTree ##### -->
 <para>
 The #GtkCTree-struct contains the following user-accessible fields.
--- a/docs/reference/gtk/tmpl/gtkcurve.sgml
+++ b/docs/reference/gtk/tmpl/gtkcurve.sgml
@@ -41,6 +41,9 @@ draw the points of the curve freely, and they are not connected at all.

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkCurve ##### -->
 <para>
 The #GtkCurve-struct struct contains private data only, and
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -124,6 +124,9 @@ response from the user.</para></listitem>
 </variablelist>
 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GtkDialog ##### -->
 <para>
 <structfield>vbox</structfield> is a #GtkVBox - the main part of the
--- a/docs/reference/gtk/tmpl/gtkdnd.sgml
+++ b/docs/reference/gtk/tmpl/gtkdnd.sgml
@@ -24,6 +24,9 @@ in the #GtkWidget class.

 </para>

+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM GtkDestDefaults ##### -->
 <para>
 The #GtkDestDefaults enumeration specifies the various
--- a/Show More
+++ b/Show More