diff --git a/ChangeLog b/ChangeLog
index 24cee1cfa7..4c1f183b7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkstatusicon.c (gtk_status_icon_get_size): Add
+	a note about being embedded.  (#340107, Christian Persch)
+
 2007-04-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkdnd.[hc]: Add GTK_TARGET_OTHER_{APP,WIDGET} to
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 418db4a435..bce5124179 100755
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -1503,6 +1503,9 @@ gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon)
  * if the size of the notification area changes. For other
  * storage types, the size-changed signal can be used to
  * react to size changes.
+ *
+ * Note that the returned size is only meaningful while the 
+ * status icon is embedded (see gtk_status_icon_is_embedded()).
  * 
  * Return value: the size that is available for the image
  *