diff --git a/ChangeLog b/ChangeLog index a9153fa833..d1dcfdbc31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon May 31 02:39:32 2004 Matthias Clasen + + * gtk/gtkimage.c (gtk_image_new_from_pixmap): Fix typo in + docs. (#142892, Tommi Komulainen) + Mon May 31 02:16:37 2004 Matthias Clasen * gtk/gtkhandlebox.c: Make detached handleboxes work when their diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a9153fa833..d1dcfdbc31 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon May 31 02:39:32 2004 Matthias Clasen + + * gtk/gtkimage.c (gtk_image_new_from_pixmap): Fix typo in + docs. (#142892, Tommi Komulainen) + Mon May 31 02:16:37 2004 Matthias Clasen * gtk/gtkhandlebox.c: Make detached handleboxes work when their diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a9153fa833..d1dcfdbc31 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon May 31 02:39:32 2004 Matthias Clasen + + * gtk/gtkimage.c (gtk_image_new_from_pixmap): Fix typo in + docs. (#142892, Tommi Komulainen) + Mon May 31 02:16:37 2004 Matthias Clasen * gtk/gtkhandlebox.c: Make detached handleboxes work when their diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a9153fa833..d1dcfdbc31 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon May 31 02:39:32 2004 Matthias Clasen + + * gtk/gtkimage.c (gtk_image_new_from_pixmap): Fix typo in + docs. (#142892, Tommi Komulainen) + Mon May 31 02:16:37 2004 Matthias Clasen * gtk/gtkhandlebox.c: Make detached handleboxes work when their diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index eab67c7c47..24708d53ea 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -402,7 +402,7 @@ gtk_image_get_property (GObject *object, * @mask: a #GdkBitmap, or %NULL * * Creates a #GtkImage widget displaying @pixmap with a @mask. - * A #GdkImage is a server-side image buffer in the pixel format of the + * A #GdkPixmap is a server-side image buffer in the pixel format of the * current display. The #GtkImage does not assume a reference to the * pixmap or mask; you still need to unref them if you own references. * #GtkImage will add its own reference rather than adopting yours.