[murrine] Small fixes to the default button color

[Andrea Cimitan <acimitan src gnome org>]

commit 0fb0475a291c906ff769a2cb2e8e7a2104713749
Author: Andrea Cimitan <andrea cimitan gmail com>
Date:   Thu Sep 9 11:23:40 2010 +0200

    Small fixes to the default button color

 src/cairo-support.c     |    1 -
 src/murrine_draw.c      |    3 ++-
 src/murrine_draw_rgba.c |    6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/cairo-support.c b/src/cairo-support.c
index dad34fe..5ba17d3 100644
--- a/src/cairo-support.c
+++ b/src/cairo-support.c
@@ -699,7 +699,6 @@ murrine_draw_blur_glow (cairo_t *cr,
 	cairo_destroy (cr_surface); 
 }
 
-
 static void
 murrine_draw_lightborder (cairo_t *cr,
                           const MurrineRGB *fill,
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index bd3e087..eb7f92d 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -182,7 +182,6 @@ murrine_draw_button (cairo_t *cr,
 	if (widget->is_default && !widget->disabled)
 	{
 		murrine_shade (&border, murrine_get_contrast(0.8, widget->contrast), &border);
-		murrine_mix_color (&fill, &colors->spot[1], 0.2, &fill);
 
 		if (button->has_default_button_color)
 		{
@@ -190,6 +189,8 @@ murrine_draw_button (cairo_t *cr,
 			mrn_gradient_new.has_gradient_colors = FALSE;
 			murrine_mix_color (&fill, &button->default_button_color, 0.8, &fill);
 		}
+		else
+			murrine_mix_color (&fill, &colors->spot[1], 0.2, &fill);
 
 		if (mrn_gradient_new.has_border_colors)
 		{
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index b1797a0..4a6df60 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -176,14 +176,16 @@ murrine_rgba_draw_button (cairo_t *cr,
 	if (widget->is_default)
 	{
 		murrine_shade (&border, murrine_get_contrast(0.8, widget->contrast), &border);
-		murrine_mix_color (&fill, &colors->spot[1], 0.2, &fill);
-
+		
 		if (button->has_default_button_color)
 		{
 			mrn_gradient_new.has_border_colors = FALSE;
 			mrn_gradient_new.has_gradient_colors = FALSE;
 			murrine_mix_color (&fill, &button->default_button_color, 0.8, &fill);
 		}
+		else
+			murrine_mix_color (&fill, &colors->spot[1], 0.2, &fill);
+
 
 		if (mrn_gradient_new.has_border_colors)
 		{