+2005-04-29 Matthias Clasen <mclasen@redhat.com>
+
+ * tests/testtext.c: Add some more attribute tests.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): Correct the documentation
+ of the rise property. String change, but it is more important to
+ be correct than to be translated. (#301740)
+
+2005-04-25 Tor Lillqvist <tml@novell.com>
+
+ * gtk/gtkfilesystemwin32.c
+ (gtk_file_system_win32_volume_get_display_name): Get volume name
+ also on Win9x. (#301798, Daniel Atallah)
+ (canonicalize_filename): Add explicit braces to silence compiler
+ warning.
+
+2005-04-22 Tor Lillqvist <tml@novell.com>
+
+ * gtk/gtkmain.c: Initailize gettext before use. Calling
+ bindtextdomain() and bind_textdomain_codeset() in
+ do_post_parse_initialization() is too late. Put the calls in a new
+ function gettext_initialization(), and call that from
+ gtk_init_with_args() and gtk_parse_args(). Fixes #170948 for
+ GTK+'s part, but the same problem occurs also at least in
+ atk. Thanks to Robert Ă–gren, Daniel Atallah and Kevin Stange.
+
+2005-04-19 Ivan, Wong Yat Cheung <email@ivanwong.info>
+
+ * gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match
+ character height instead of cell height. Fix #301228.
+
+2005-04-18 Federico Mena Quintero <federico@ximian.com>
+
+ Merged from gtk-2-6:
+
+ * gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove
+ obsolete assertion that the selected row can't be a volume; this
+ is handled by the "removable" column now. Fixes #301017.
+
+2005-04-18 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkstyle.c gtk/gtkcolorsel.c gtk/gtkhsv.c gtk/gtkiconview.c
+ * gdk/gdkcolor.c gdk/gdkwindow.c gdk/gdkpixbuf-render.c
+ gdk/gdkpango.c tests/testcairo.c: Update to new Cairo API for
+ setting color and opacity. (#301066, Vincent Noel)
+
+2005-04-15 Federico Mena Quintero <federico@ximian.com>
+
+ Merged from gtk-2-6:
+
+ * gtk/gtkfilechooserdefault.c (pending_select_paths_process):
+ Patch from Christian Neumair <chris@gnome-de.org>; only select the
+ first row if we are in OPEN mode. The only other case we were
+ letting pass through was SELECT_FOLDER, but selecting the first
+ row when changing folders confuses people when folders are
+ actually being selected. Fixes #171885.
+
+2005-04-13 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
+ Revert the fix for #169870, adjust the documentation instead.
+
+ * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel):
+ Revert the fix for #170727.
+
+2005-04-11 Ivan, Wong Yat Cheung <email@ivanwong.info>
+
+ Fix #300218:
+
+ * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Fix
+ C99ism.
+
+ * gtk/updateiconcache.c: Guard inclusion of unistd.h and
+ utime.h.
+
+2005-04-09 Matthias Clasen <mclasen@redhat.com>
+
+ * gdk/x11/gdkinput-xfree.c:
+ * gdk/x11/gdkinput-none.c:
+ * gdk/gtk.symbols: Some more fixes necessary to
+ make building with gcc 4 work.
+
+ Add 16x16 versions of the zoom icons and of
+ GTK_STOCK_INDEX. Some of the images were taken from
+ the hicolor icon theme, and were originally created
+ by Jakub Steiner and Tuomas Kuosmanen. (#167515,
+ Vincent Noel)
+
+ * gtk/stock-icons/stock_index_16.png:
+ * gtk/stock-icons/stock_zoom_1_16.png:
+ * gtk/stock-icons/stock_zoom_fit_16.png:
+ * gtk/stock-icons/stock_zoom_in_16.png:
+ * gtk/stock-icons/stock_zoom_out_16.png: New images.
+
+ * gtk/stock-icons/Makefile.am: Add the new images.
+
+ * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
+ Don't display too many broken images. (#169870, Roman
+ Kagan, patch by Ivan Wong)
+
+ * gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+ output. (#300013, Tommi Komulainen)
+
+2005-04-08 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkimage.c (gtk_image_expose, gtk_image_calc_size):
+ If a stock_id is unknown, display the missing image. (#169870,
+ Steven Walter)
+
+ * gtk/gtkiconcache.c (icon_name_hash): Use the same function
+ as in updateiconcache.c. (spotted by Morten Welinder)
+
+2005-04-08 Carl Worth <cworth@cworth.org>
+
+ * gdk/gdkpango.c: (emboss_context): Simplify matrix manipulation
+ now that cairo exposes the cairo_matrix_t structure.
+
+ * gdk/gdkpixbuf-render.c: (gdk_pixbuf_set_as_cairo_source): Track
+ cairo API change in signedness of data argument.
+
+2005-04-08 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
+ work when called from gtk_combo_box_destroy(). (#172999,
+ Christian Persch)
+
+2005-04-08 Matthias Clasen <mclasen@redhat.com>
+
+ Fix double-click to autosize treeview columns. This was
+ probably broken since 2.2 ! (#169675)
+
+ * gtk/gtktreeview.c (gtk_tree_view_button_press): Leave the
+ "user-resized" state of the column on a double-click to
+ autosize.
+ (gtk_tree_view_button_press, gtk_tree_view_motion_resize_column):
+ Enter the "user-resized" state of the column only if a drag
+ actually changes the column width, not on any click.
+
+>>>>>>> 1.6531
2005-04-07 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background
+ images on menus. (#169532, Benjamin Otte)
+
+ * gtk/updateiconcache.c (write_card16, write_card32): Avoid
+ unaligned access. (#172947)
+
+ * gtk/gtkfilechooserdefault.c (file_list_build_popup_menu):
+ Consistently use the term "Bookmarks" in the UI. (#166906,
+ Sebastian Bacher)
+
Some fixes from Morten Welinder (#172947):
* gtk/updateiconcache.c (icon_name_hash): Make this compiler-