--- gal-0.13.99.0-orig/gal/e-text/e-text.c	Wed Sep 26 15:03:25 2001
+++ gal-0.13.99.0/gal/e-text/e-text.c	Mon Oct 22 00:24:01 2001
@@ -1981,6 +1981,10 @@
 	widget = GTK_WIDGET(canvas);
 
 	fg_gc = widget->style->fg_gc[text->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE];
+	{	
+	    gdk_gc_set_foreground(text->gc,widget->style->text + GTK_STATE_NORMAL);
+	    gdk_gc_set_foreground(fg_gc,widget->style->fg + (text->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE));
+	}
 	
 	if (text->draw_borders || text->draw_background) {
 		gdouble thisx = item->x1 - x;
--- gal-0.13.99.0-orig/gal/e-table/e-table-header-item.c	Sat Sep  1 13:03:44 2001
+++ gal-0.13.99.0/gal/e-table/e-table-header-item.c	Sun Oct 21 20:05:34 2001
@@ -714,7 +714,6 @@
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
 	GdkWindow *window;
-	GdkColor c;
 	GtkTargetEntry  ethi_drop_types [] = {
 		{ TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
 	};
@@ -726,8 +725,19 @@
 	window = GTK_WIDGET (item->canvas)->window;
 
 	ethi->gc = gdk_gc_new (window);
-	gnome_canvas_get_color (item->canvas, "black", &c);
-	gdk_gc_set_foreground (ethi->gc, &c);
+	{
+		static gboolean color_initialized = 0;
+		static GdkColor color;
+	    	if (!color_initialized) {
+			GtkWidget* w = gtk_label_new("");
+			gtk_widget_ensure_style(w);
+			memcpy(&color,&w->style->fg[GTK_STATE_NORMAL],sizeof(GdkColor));
+			gtk_widget_destroy(w);
+			color_initialized = 1;
+	    	}
+		gdk_gc_set_foreground (ethi->gc, &color);
+	}
+
 
 	if (!ethi->font)
 		ethi_font_set (ethi, GTK_WIDGET (item->canvas)->style->font);