Typo fix. (#162219, Masao Mutoh)

[~andy/gtk] / ChangeLog.pre-2-8

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 90cd56e70480ad69f87584bdf67da9cb6991057e..fab2d2fe5899002170cc337ea5d838f593fe2bfe 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+2004-12-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooser.c (gtk_file_chooser_set_action): 
+       Typo fix.  (#162219, Masao Mutoh)
+       (gtk_file_chooser_set_preview_widget_active): 
+       Another typo.  (#162218, Masao Mutoh)
+
+2004-12-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_iter_children): 
+       Return TRUE if there are children.  (#162134, Iñigo Serna,
+       patch by John Finlay)
+
+       * gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): 
+       Transfer state from the button to the cell view to get
+       prelighting right.  (#156327, Ricardo Veguilla)
+
 Wed Dec 22 14:22:19 2004  Søren Sandmann  <sandmann@redhat.com>
 
        * tests/testtoolbar.c (timeout_cb): Add sensitivity-changing
@@ -90,7 +107,6 @@ Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
        (gtk_about_dialog_init): Add missing initializations.  (#161646,
        Torsten Schoenfeld)
 
->>>>>>> 1.6233
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version