From f9e685e5c082e4d7b0d02bba5a813b9ece97bdad Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Sat, 8 Jan 2011 17:25:39 +0100 Subject: [PATCH] [Doc] gtk_symbolic_color_resolve()'s props arg can be NULL Document this behavior and add annotations. --- gtk/gtksymboliccolor.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/gtksymboliccolor.c b/gtk/gtksymboliccolor.c index 2345cfa396..ee7b714550 100644 --- a/gtk/gtksymboliccolor.c +++ b/gtk/gtksymboliccolor.c @@ -465,7 +465,8 @@ _shade_color (GdkRGBA *color, /** * gtk_symbolic_color_resolve: * @color: a #GtkSymbolicColor - * @props: #GtkStyleProperties to use when resolving named colors + * @props: (allow-none): #GtkStyleProperties to use when resolving + * named colors, or %NULL * @resolved_color: (out): return location for the resolved color * * If @color is resolvable, @resolved_color will be filled in @@ -473,6 +474,9 @@ _shade_color (GdkRGBA *color, * if @color can't be resolved, it is due to it being defined on * top of a named color that doesn't exist in @props. * + * @props must be non-%NULL if @color was created using + * gtk_symbolic_color_named_new(), but can be omitted in other cases. + * * Returns: %TRUE if the color has been resolved * * Since: 3.0