[murrine] Draw lightborder on menubar and toolbar with their style options = 1

[Andrea Cimitan <acimitan src gnome org>]

commit 3977fe20b97b7c6467cf2a478d5adca38f25f34a
Author: Andrea Cimitan <andrea cimitan gmail com>
Date:   Fri Oct 30 17:05:56 2009 +0100

    Draw lightborder on menubar and toolbar with their style options = 1

 src/murrine_draw.c      |    8 ++++----
 src/murrine_draw_rgba.c |    8 ++++----
 src/murrine_style.c     |    2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index 84a214d..e4e4f10 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -301,7 +301,7 @@ murrine_draw_entry (cairo_t *cr,
 
 	mrn_gradient_custom = get_inverted_border_shades (mrn_gradient_custom);
 
-	/* Draw the border */
+	/* Draw border */
 	murrine_draw_border (cr, &border,
 	                     1, 1, width-3, height-3,
 	                     radius, widget->corners,
@@ -707,7 +707,7 @@ murrine_draw_progressbar_fill (cairo_t *cr,
 	                                  roundness, MRN_CORNER_TOPRIGHT | MRN_CORNER_BOTTOMRIGHT);
 	cairo_clip (cr);
 
-	/* Draw the border */
+	/* Draw border */
 	murrine_mix_color (&border, fill, 0.28, &border);
 	murrine_draw_border (cr, &border,
 	                     1.5, 0.5, width-3, height-1,
@@ -766,7 +766,7 @@ murrine_draw_menubar (cairo_t *cr,
 		{
 			int os = (widget->glazestyle == 2) ? 1 : 0;
 			murrine_draw_glaze (cr, fill,
-			                    widget->glow_shade, widget->highlight_shade, widget->glazestyle == 2 ? widget->lightborder_shade : 1.0,
+			                    widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
 			                    widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
 			                    widget->roundness, widget->corners, TRUE);
 			break;
@@ -863,7 +863,7 @@ murrine_draw_toolbar (cairo_t *cr,
 		{
 			int os = (widget->glazestyle == 2) ? 1 : 0;
 			murrine_draw_glaze (cr, fill,
-			                    widget->glow_shade, widget->highlight_shade, widget->glazestyle == 2 ? widget->lightborder_shade : 1.0,
+			                    widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
 			                    widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
 			                    widget->roundness, widget->corners, TRUE);
 			break;
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index 7b517a5..96f788e 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -308,7 +308,7 @@ murrine_rgba_draw_entry (cairo_t *cr,
 
 	mrn_gradient_custom = get_inverted_border_shades (mrn_gradient_custom);
 
-	/* Draw the border */
+	/* Draw border */
 	murrine_draw_border (cr, &border,
 	                     1, 1, width-3, height-3,
 	                     radius, widget->corners,
@@ -592,7 +592,7 @@ murrine_rgba_draw_progressbar_fill (cairo_t *cr,
 	                                  roundness, MRN_CORNER_TOPRIGHT | MRN_CORNER_BOTTOMRIGHT);
 	cairo_clip (cr);
 
-	/* Draw the border */
+	/* Draw border */
 	murrine_mix_color (&border, fill, 0.28, &border);
 	murrine_draw_border (cr, &border,
 	                     1.5, 0.5, width-3, height-1,
@@ -640,7 +640,7 @@ murrine_rgba_draw_menubar (cairo_t *cr,
 			/* XXX: should use another gradient rgba_opacity */
 			int os = (widget->glazestyle == 2) ? 1 : 0;
 			murrine_draw_glaze (cr, fill,
-			                    widget->glow_shade, widget->highlight_shade, widget->glazestyle == 2 ? widget->lightborder_shade : 1.0,
+			                    widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
 			                    widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
 			                    widget->roundness, widget->corners, TRUE);
 			break;
@@ -742,7 +742,7 @@ murrine_rgba_draw_toolbar (cairo_t *cr,
 		{
 			int os = (widget->glazestyle == 2) ? 1 : 0;
 			murrine_draw_glaze (cr, fill,
-			                    widget->glow_shade, widget->highlight_shade, widget->glazestyle == 2 ? widget->lightborder_shade : 1.0,
+			                    widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
 			                    widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
 			                    widget->roundness, widget->corners, TRUE);
 
diff --git a/src/murrine_style.c b/src/murrine_style.c
index 585166c..8676dc0 100644
--- a/src/murrine_style.c
+++ b/src/murrine_style.c
@@ -734,6 +734,7 @@ murrine_style_draw_box (DRAW_ARGS)
 		}
 
 		horizontal = height < 2*width;
+		params.corners = MRN_CORNER_NONE;
 
 		/* This is not that great. Ideally we would have a nice vertical menubar. */
 		if (params.mrn_gradient.use_rgba ||
@@ -1357,6 +1358,7 @@ murrine_style_draw_box (DRAW_ARGS)
 		}
 
 		horizontal = height < 2*width;
+		params.corners = MRN_CORNER_NONE;
 
 		/* This is not that great. Ideally we would have a nice vertical toolbar. */
 		if ((shadow_type != GTK_SHADOW_NONE) && horizontal)