+2002-01-16 Padraig O'Briain <padraig.obriain@sun.com>
+
+ * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+ Avoid unexpected warning message when navigating menu (#68517)
+
+2002-01-15 Jody Goldberg <jody@gnome.org>
+
+ * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a
+ GtkLayout may have been scrolled _before_ it was realized.
+
+Tue Jan 15 18:10:24 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkspinbutton.c (gtk_spin_button_grab_notify): Stop
+ the timer on destroy, or when we are notified that we are
+ shadowed by a modal dialog.
+
+ * gtk/gtkspinbutton.c: Remove explicit gtk_grab_add()/remove() -
+ not needed any more.
+
+ * gtk/gtkmain.c (gtk_grab_notify): Fix problem where notifications
+ weren't sent out for the default grab group.
+
+ * gtk/gtkmain.c (gtk_grab_notify): Fix notification of widgets that
+ were getting events because they were part of the previous grab.
+
+Tue Jan 15 12:23:33 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtknotebook.c (gtk_notebook_mnemonic_activate_switch_page):
+ focus the activated tab, not the page. (#53612)
+
+ * gtk/gtknotebook.c (gtk_notebook_set_focus_child): Track
+ the last focus descendant of the page.
+
+ * gtk/gtknotebook.c (gtk_notebook_real_switch_page): If the focus
+ was on the previous page, move it to the last focused widget /
+ first element on the new page, if possible, or if not, to the
+ notebook itself. (#68224, reported by Jonathan Blandford)
+
+ * gtk/gtknotebook.c (focus_tabs_in): Don't focus tabs
+ tabs aren't visible. (#65462, Damon Chaplin, fixed based
+ on patch from Anders Carlsson)
+
+2002-01-15 Vitaly Tishkov <tvv@sparc.spb.su>
+
+ * gtk/gtkstyle.c
+ a misprint in documentation for gtk_style_render_icon () is fixed
+
+Mon Jan 14 23:21:47 2002 Tim Janik <timj@gtk.org>
+
+ * gtk/gtkmenuitem.c (gtk_menu_item_map): map event_window after
+ mapping child, so we don't loose events.
+
+2002-01-15 Sven Neumann <sven@gimp.org>
+
+ * gtk/gtkaccellabel.h
+ * gtk/gtkitemfactory.c: fixed documentation by syncing the parameter
+ names used in headers and code.
+
+2002-01-14 jacob berkman <jacob@ximian.com>
+
+ * gtk/gtkrc.c (gtk_rc_get_im_module_path): close a comment block
+
+Tue Jan 15 01:13:51 2002 Kristian Rietveld <kris@gtk.org>
+
+ * gtk/gtktreemodelsort.c: fix a load of open line ends,
+ (gtk_tree_model_sort_set_model): only free root level if it's
+ !NULL
+
+2002-01-14 Matthias Clasen <matthiasc@poet.de>
+
+ * gtk/gtkoldeditable.c, gtk/gtkrc.c,
+ gtk/gtkstyle.c: Documentation additions.
+
+ * gtk/gtkmenu.c (gtk_menu_set_accel_path),
+ gtk/gtkmenuitem.c (gtk_menu_item_set_accel_path),
+ gtk/gtkwidget.c (gtk_widget_add_accelerator): Typo and markup fixes.
+
+ * gtk/gtkitemfactory.c (gtk_item_factory_add_foreign): Document.
+
+ * gtk/gtkaccelmap.c (gtk_accel_map_add_filter): Explain intended use.
+
+Mon Jan 14 17:14:13 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkselection-x11.c (sanitize_utf8): Don't
+ mangle sequences of consecutive \n or \r.
+
+Mon Jan 14 17:42:28 2002 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreeview.c (gtk_tree_view_stop_editing): allow cancel to
+ happen.
+
+ * gtk/gtktreeview.c (install_presize_handler): only install the
+ handler if we're realized, #68056
+
Mon Jan 14 16:35:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Unset
initial_pos_set after the first configure request.
+2002-01-13 Jody Goldberg <jody@gnome.org>
+
+ * gtk/gtktexttag.c (get_color_arg) : set_boxed will copy the color
+ and will use a mem_chunk to do it. Avoid an unnecessary copy, a
+ leak, and confusion.
+
Sun Jan 13 23:23:22 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_compute_hints): Fix problem where
2000-11-02 Havoc Pennington <hp@redhat.com>
-<<<<<<< ChangeLog
* gtk/gtkfilesel.h, gtk/gtkfilesel.c: Derive from GtkDialog, and
use stock buttons. Should be 100% source compatible, appropriate
(gtk_dialog_run): block waiting for the dialog, return
the response. Override normal delete_event behavior, so that
delete_event does nothing inside gtk_dialog_run().
-=======
->>>>>>> 1.2802
-
-<<<<<<< ChangeLog
* gtk/gtkdialog.h, gtk/gtkdialog.c: Add "response" signal
emitted when an action widget is clicked or the dialog gets
delete_event
new one.
* configure.in: set gtk+ version to 1.3.0.
-=======
+
* gtk/gtkfilesel.h, gtk/gtkfilesel.c: Derive from GtkDialog,
->>>>>>> 1.2802