summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <rburton@src.gnome.org>2006-02-09 15:51:21 +0000
committerRoss Burton <rburton@src.gnome.org>2006-02-09 15:51:21 +0000
commite13264939d66b609504452d480d4c3c062c419f0 (patch)
tree83a6459d37bb9d58c129fb9665715e69a1ff1e28
parent8dee85c78f4f8740805efac2349403abaaa05251 (diff)
downloadgdk-pixbuf-e13264939d66b609504452d480d4c3c062c419f0.tar.gz
Doc fixes
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--gtk/gtkwindow.c4
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b728bfbbc..0c9d180e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-09 Ross Burton <ross@burtonini.com>
+
+ Merged from HEAD:
+
+ * gtk/gtkwindow.c: Documentation fixes (#324815).
+
2006-02-09 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkevents-win32.c (gdk_event_translate)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b728bfbbc..0c9d180e1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-02-09 Ross Burton <ross@burtonini.com>
+
+ Merged from HEAD:
+
+ * gtk/gtkwindow.c: Documentation fixes (#324815).
+
2006-02-09 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkevents-win32.c (gdk_event_translate)
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 0e330de88..cf1439a74 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6027,7 +6027,7 @@ gtk_window_set_frame_dimensions (GtkWindow *window,
* where the user can see it.
*
* If you are calling this function in response to a user interaction,
- * it is preferable to use gdk_window_present_with_time().
+ * it is preferable to use gtk_window_present_with_time().
*
**/
void
@@ -7592,7 +7592,7 @@ _gtk_window_set_has_toplevel_focus (GtkWindow *window,
* @setting: %TRUE to automatically do startup notification
*
* By default, after showing the first #GtkWindow for each #GdkScreen,
- * GTK+ calls gdk_screen_notify_startup_complete(). Call this
+ * GTK+ calls gdk_notify_startup_complete(). Call this
* function to disable the automatic startup notification. You might
* do this if your first window is a splash screen, and you want to
* delay notification until after your real main window has been