[evolution/webkit] Bug #633774 - Headers are gone in grouped view

[Dan VrÃtil <dvratil src gnome org>]

commit d624a6e6fee80727689d42cd49b764ffcb3dadca
Author: Vibha Yadav <yvibha novell com>
Date:   Mon Nov 15 11:10:15 2010 +0100

    Bug #633774 - Headers are gone in grouped view

 libgnomecanvas/gnome-canvas-rect.c      |    2 +-
 widgets/table/e-table-group-container.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c
index aa1399b..1e44aa8 100644
--- a/libgnomecanvas/gnome-canvas-rect.c
+++ b/libgnomecanvas/gnome-canvas-rect.c
@@ -171,7 +171,7 @@ gnome_canvas_rect_set_property (GObject *object,
 	case PROP_FILL_COLOR:
 		color_string = g_value_get_string (value);
 		if (color_string != NULL) {
-			if (gdk_color_parse (color_string, &color)) {
+			if (!gdk_color_parse (color_string, &color)) {
 				g_warning (
 					"Failed to parse color '%s'",
 					color_string);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 39e7f0b..12788ad 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1094,7 +1094,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 
 				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM (child_node->text),
 							    GROUP_INDENT,
-							    running_height - BUTTON_PADDING);
+							    running_height - GROUP_INDENT - BUTTON_PADDING);
 
 				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM (child),
 							    GROUP_INDENT,