From f89711097acd6c2404485cd7919088d3ef5589c3 Mon Sep 17 00:00:00 2001
From: Wade Brainerd <wadetb@gmail.com>
Date: Mon, 02 Mar 2009 04:52:12 +0000
Subject: Fix bad merge.

---
diff --git a/terminal.py b/terminal.py
index cdaee02..af0e422 100644
--- a/terminal.py
+++ b/terminal.py
@@ -355,6 +355,10 @@ class TerminalActivity(sugar.activity.activity.Activity):
         font = self._get_conf(conf, 'font', 'Monospace')
         vt.set_font(pango.FontDescription(font))
 
+        fg_color = self._get_conf(conf, 'fg_color', '#000000')
+        bg_color = self._get_conf(conf, 'bg_color', '#FFFFFF')
+        vt.set_colors(gtk.gdk.color_parse(fg_color), gtk.gdk.color_parse(bg_color), [])
+
         blink = self._get_conf(conf, 'cursor_blink', False)
         vt.set_cursor_blinks(blink)
 
--
cgit v0.9.1