Index: widgets/misc/e-combo-button.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-combo-button.c,v
retrieving revision 1.21
diff -p -u -u -p -U10 -r1.21 e-combo-button.c
--- widgets/misc/e-combo-button.c	21 Feb 2005 17:59:40 -0000	1.21
+++ widgets/misc/e-combo-button.c	8 Sep 2005 17:46:03 -0000
@@ -87,20 +87,21 @@ set_icon (EComboButton *combo_button,
 
 
 /* Paint the borders.  */
 
 static void
 paint (EComboButton *combo_button,
        GdkRectangle *area)
 {
 	EComboButtonPrivate *priv = combo_button->priv;
 	GtkWidget *widget = GTK_WIDGET (combo_button);
+	GtkButton *button = GTK_BUTTON (combo_button);
 	GtkShadowType shadow_type;
 	gboolean interior_focus;
 	int separator_x;
 	int focus_width, focus_pad;
 	int x, y, width, height;
 	int border_width;
 
 	if (GTK_BUTTON (widget)->depressed || priv->menu_popped_up) {
 		shadow_type = GTK_SHADOW_IN;
 		gtk_widget_set_state (widget, GTK_STATE_ACTIVE);
@@ -135,29 +136,33 @@ paint (EComboButton *combo_button,
 			       area, widget, "buttondefault",
 			       x, y, width, height);
 
 	if (!interior_focus && GTK_WIDGET_HAS_FOCUS (widget)) {
 		x += focus_width + focus_pad;
 		y += focus_width + focus_pad;
 		width -= 2 * (focus_width + focus_pad);
 		height -= 2 * (focus_width + focus_pad);
 	}
 
-	gtk_paint_box (widget->style, widget->window,
-		       GTK_WIDGET_STATE (widget), shadow_type,
-		       area, widget, "button",
-		       x, y, separator_x, height);
-	gtk_paint_box (widget->style, widget->window,
-		       GTK_WIDGET_STATE (widget), shadow_type,
-		       area, widget, "button",
-		       separator_x, y, width - separator_x, height);
-
+	if (button->relief != GTK_RELIEF_NONE || button->depressed ||
+	    priv->menu_popped_up ||
+	    GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT) {
+		gtk_paint_box (widget->style, widget->window,
+			       GTK_WIDGET_STATE (widget), shadow_type,
+			       area, widget, "button",
+			       x, y, separator_x, height);
+		gtk_paint_box (widget->style, widget->window,
+			       GTK_WIDGET_STATE (widget), shadow_type,
+			       area, widget, "button",
+			       separator_x, y, width - separator_x, height);
+	}
+    
 	if (GTK_WIDGET_HAS_FOCUS (widget)) {
 		if (interior_focus) {
 			x += widget->style->xthickness + focus_pad;
 			y += widget->style->ythickness + focus_pad;
 			width -= 2 * (widget->style->xthickness + focus_pad);
 			height -=  2 * (widget->style->xthickness + focus_pad);
 		} else {
 			x -= focus_width + focus_pad;
 			y -= focus_width + focus_pad;
 			width += 2 * (focus_width + focus_pad);
