[murrine/dec09-new-features] The previous commit broke everything...

[Andrea Cimitan <acimitan src gnome org>]

commit 4049fd1b4117a591acea4734a37d3c000defd95c
Author: Andrea Cimitan <andrea cimitan gmail com>
Date:   Tue Dec 8 02:45:25 2009 +0100

    The previous commit broke everything...

 src/murrine_draw.c      |   12 ++++++------
 src/murrine_draw_rgba.c |   10 +++++-----
 src/murrine_style.c     |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index af4de48..d7137e6 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -155,7 +155,7 @@ murrine_draw_button (cairo_t *cr,
 	MurrineRGB border = colors->shade[!widget->disabled ? 6 : 5];
 	MurrineRGB fill = colors->bg[widget->state_type];
 
-	get_fill_color (&fill, &mrn_gradient_new);
+	murrine_get_fill_color (&fill, &mrn_gradient_new);
 
 	if (widget->disabled)
 	{
@@ -676,7 +676,7 @@ murrine_draw_progressbar_fill (cairo_t *cr,
 	MurrineRGB effect;
 	MurrineRGB fill = colors->spot[1];
 
-	get_fill_color (&fill, &widget->mrn_gradient);
+	murrine_get_fill_color (&fill, &widget->mrn_gradient);
 	murrine_shade (&fill, murrine_get_contrast(0.65, widget->contrast), &effect);
 
 	/* progressbar->orientation < 2 == boolean is_horizontal */
@@ -1528,7 +1528,7 @@ murrine_draw_menuitem (cairo_t *cr,
 	MurrineRGB border = colors->spot[2];
 	MurrineRGB fill = colors->spot[1];
 
-	get_fill_color (&fill, &mrn_gradient_new);
+	murrine_get_fill_color (&fill, &mrn_gradient_new);
 
 	cairo_translate (cr, x, y);
 	murrine_rounded_rectangle_closed (cr, 0, 0, width, height, widget->roundness, widget->corners);
@@ -1657,7 +1657,7 @@ murrine_draw_scrollbar_stepper (cairo_t *cr,
 	MurrineRGB border;
 	MurrineRGB fill  = colors->bg[widget->state_type];
 
-	get_fill_color (&fill, &mrn_gradient_new);
+	murrine_get_fill_color (&fill, &mrn_gradient_new);
 	murrine_shade (&colors->shade[6], 0.95, &border);
 
 	mrn_gradient_new.border_shades[0] = border_stop_mid;
@@ -1703,7 +1703,7 @@ murrine_draw_scrollbar_slider (cairo_t *cr,
 	MurrineRGB border;
 	uint8 corners = widget->corners;
 
-	get_fill_color (&fill, &mrn_gradient_new);
+	murrine_get_fill_color (&fill, &mrn_gradient_new);
 
 	if (scrollbar->stepperstyle != 1)
 	{
@@ -1961,7 +1961,7 @@ murrine_draw_tooltip (cairo_t *cr,
 	double highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
 
 	murrine_shade (&fill, murrine_get_contrast(0.6, widget->contrast), &border);
-	get_fill_color (&fill, &mrn_gradient_new);
+	murrine_get_fill_color (&fill, &mrn_gradient_new);
 
 	cairo_save (cr);
 
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index 9ee165b..b98a156 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -155,7 +155,7 @@ murrine_rgba_draw_button (cairo_t *cr,
 	MurrineRGB border = colors->shade[!widget->disabled ? 8 : 6];
 	MurrineRGB fill = colors->bg[widget->state_type];
 
-	get_fill_color (&fill, &mrn_gradient_new);
+	murrine_get_fill_color (&fill, &mrn_gradient_new);
 
 	if (widget->disabled)
 	{
@@ -560,7 +560,7 @@ murrine_rgba_draw_progressbar_fill (cairo_t *cr,
 	MurrineRGB effect;
 	MurrineRGB fill = colors->spot[1];
 
-	get_fill_color (&fill, &widget->mrn_gradient);
+	murrine_get_fill_color (&fill, &widget->mrn_gradient);
 	murrine_shade (&fill, murrine_get_contrast(0.65, widget->contrast), &effect);
 
 	/* progressbar->orientation < 2 == boolean is_horizontal */
@@ -1288,7 +1288,7 @@ murrine_rgba_draw_scrollbar_stepper (cairo_t *cr,
 	MurrineRGB border;
 	MurrineRGB fill  = colors->bg[widget->state_type];
 
-	get_fill_color (&fill, &mrn_gradient_new);
+	murrine_get_fill_color (&fill, &mrn_gradient_new);
 	murrine_shade (&colors->shade[7], 0.95, &border);
 
 	mrn_gradient_new.border_shades[0] = border_stop_mid;
@@ -1336,7 +1336,7 @@ murrine_rgba_draw_scrollbar_slider (cairo_t *cr,
 	MurrineRGB border;
 	uint8 corners = widget->corners;
 
-	get_fill_color (&fill, &mrn_gradient_new);
+	murrine_get_fill_color (&fill, &mrn_gradient_new);
 
 	if (scrollbar->stepperstyle < 1)
 	{
@@ -1516,7 +1516,7 @@ murrine_rgba_draw_tooltip (cairo_t *cr,
 	double highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
 
 	murrine_shade (&fill, murrine_get_contrast(0.6, widget->contrast), &border);
-	get_fill_color (&fill, &mrn_gradient_new);
+	murrine_get_fill_color (&fill, &mrn_gradient_new);
 
 	cairo_save (cr);
 
diff --git a/src/murrine_style.c b/src/murrine_style.c
index 52a9c72..321426d 100644
--- a/src/murrine_style.c
+++ b/src/murrine_style.c
@@ -2226,7 +2226,7 @@ murrine_style_init_from_rc (GtkStyle   *style,
 	}
 	/* Adjust lightborder_shade reading contrast */
 	murrine_style->lightborder_shade = murrine_get_contrast(MURRINE_RC_STYLE (rc_style)->lightborder_shade,
-	                                                MURRINE_RC_STYLE (rc_style)->contrast);
+	                                                        MURRINE_RC_STYLE (rc_style)->contrast);
 	murrine_style->trough_shades[0]   = MURRINE_RC_STYLE (rc_style)->trough_shades[0];
 	murrine_style->trough_shades[1]   = MURRINE_RC_STYLE (rc_style)->trough_shades[1];