diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-02 13:58:02 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-02 13:58:02 +0900 |
| commit | 03a72118add37e6df51c12dba6c62298e810d41a (patch) | |
| tree | 200a88ad09d55a5e0a207d0f7275de146e8b337c /gtk/gtkcellrenderertext.c | |
| parent | a9fd00a4358f0ff73280bfeb51164872aea50e9b (diff) | |
| parent | dd678ac323b81e67bb1dea488f2123efee7e3500 (diff) | |
| download | gtk+-03a72118add37e6df51c12dba6c62298e810d41a.tar.gz | |
Merge branch 'master' into treeview-refactor
Conflicts:
tests/Makefile.am
Diffstat (limited to 'gtk/gtkcellrenderertext.c')
| -rw-r--r-- | gtk/gtkcellrenderertext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 120100a52e..31ddd304c7 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1201,7 +1201,7 @@ gtk_cell_renderer_text_set_property (GObject *object, if (!g_value_get_string (value)) set_bg_color (celltext, NULL); /* reset to background_set to FALSE */ - else if (gdk_rgba_parse (g_value_get_string (value), &rgba)) + else if (gdk_rgba_parse (&rgba, g_value_get_string (value))) set_bg_color (celltext, &rgba); else g_warning ("Don't know color `%s'", g_value_get_string (value)); @@ -1216,7 +1216,7 @@ gtk_cell_renderer_text_set_property (GObject *object, if (!g_value_get_string (value)) set_fg_color (celltext, NULL); /* reset to foreground_set to FALSE */ - else if (gdk_rgba_parse (g_value_get_string (value), &rgba)) + else if (gdk_rgba_parse (&rgba, g_value_get_string (value))) set_fg_color (celltext, &rgba); else g_warning ("Don't know color `%s'", g_value_get_string (value)); |