Merge lp:~andre-hilsendeger/terminator/font_fix into lp:terminator/trunk

[Andre Hilsendeger]

Fixes Bug #517817 by applying the font config before setting the terminal size.

[Chris Jones (cmsj)]

review: Approve

=== modified file 'terminatorlib/terminal.py'
--- terminatorlib/terminal.py	2012-01-14 20:39:00 +0000
+++ terminatorlib/terminal.py	2012-04-14 11:36:19 +0000
@@ -133,7 +133,6 @@
         dbg('assigning Terminal a TERMINATOR_UUID of: %s' % self.uuid.urn)
 
         self.vte = vte.Terminal()
-        self.vte.set_size(80, 24)
         self.vte._expose_data = None
         if not hasattr(self.vte, "set_opacity") or \
            not hasattr(self.vte, "is_composited"):
@@ -173,6 +172,8 @@
         if not env_proxy:
             if self.config['http_proxy'] and self.config['http_proxy'] != '':
                 os.putenv('http_proxy', self.config['http_proxy'])
+        self.reconfigure()
+        self.vte.set_size(80, 24)
 
     def get_vte(self):
         """This simply returns the vte widget we are using"""