+2008-05-24 Björn Lindqvist <bjourne@gmail.com>
+
+ * gdk/gdkcolor.c (gdk_color_parse): Update docstring to match
+ pango_color_parse, do not reference XParseColor forms (#434991).
+
2008-05-24 James Sharpe <jsharpe@gnome.org>
* gdk/gdk.symbols: Remove duplicate
* @spec: the string specifying the color.
* @color: the #GdkColor to fill in
*
- * Parses a textual specification of a color and fill in
- * the <structfield>red</structfield>,
- * <structfield>green</structfield>, and
- * <structfield>blue</structfield> fields of a
- * #GdkColor structure. The color is <emphasis>not</emphasis>
- * allocated, you must call gdk_colormap_alloc_color() yourself.
- * The text string can be in any of the forms accepted
- * by <function>XParseColor</function>; these include
- * name for a color from <filename>rgb.txt</filename>, such as
- * <literal>DarkSlateGray</literal>, or a hex specification
- * such as <literal>#3050b2</literal> or <literal>#35b</literal>.
+ * Parses a textual specification of a color and fill in the
+ * <structfield>red</structfield>, <structfield>green</structfield>,
+ * and <structfield>blue</structfield> fields of a #GdkColor
+ * structure. The color is <emphasis>not</emphasis> allocated, you
+ * must call gdk_colormap_alloc_color() yourself. The string can
+ * either one of a large set of standard names. (Taken from the X11
+ * <filename>rgb.txt</filename> file), or it can be a hex value in the
+ * form '#rgb' '#rrggbb' '#rrrgggbbb' or
+ * '#rrrrggggbbbb' where 'r', 'g' and 'b' are hex digits of the
+ * red, green, and blue components of the color, respectively. (White
+ * in the four forms is '#fff' '#ffffff' '#fffffffff' and
+ * '#ffffffffffff')
*
* Return value: %TRUE if the parsing succeeded.
**/