From 46703032760e6f4094d65749e8de1b4d63f3177e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 18 May 2007 15:32:54 +0000 Subject: [PATCH] Fix a typo svn path=/trunk/; revision=17864 --- ChangeLog | 6 ++++++ gtk/gtkwindow.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fee42cbf8..7a24b1dae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-05-18 Matthias Clasen + + * gtk/gtkwindow.c (gtk_window_set_transient_for): Fix + doc typo. (#438100, Vincent Untz) + 2007-05-18 Michael J. Chudobiak * INSTALL.in: @@ -83,6 +88,7 @@ #425138 (Reported by Michail Crayson). Some code simplifications. (gtk_notebook_draw_arrow): code style fix. +>>>>>>> .r17863 2007-05-16 Matthias Clasen * gtk/gtkpathbar.c: Add ATK names to the Up, Down, and Root diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index a7140aafbb..b1943d7ec8 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2029,9 +2029,8 @@ gtk_window_unset_transient_for (GtkWindow *window) * functions in GTK+ will sometimes call * gtk_window_set_transient_for() on your behalf. * - * On Windows, this function will and put the child window - * on top of the parent, much as the window manager would have - * done on X. + * On Windows, this function puts the child window on top of the parent, + * much as the window manager would have done on X. * **/ void