Merge branch from Andre Hilsendeger that fixes initial terminal sizing with non-default font sizes

This commit is contained in:
Chris Jones 2012-04-19 11:03:51 +01:00
commit 0a2f1ba7a7
1 changed files with 2 additions and 1 deletions

View File

@ -135,7 +135,6 @@ class Terminal(gtk.VBox):
dbg('assigning Terminal a TERMINATOR_UUID of: %s' % self.uuid.urn) dbg('assigning Terminal a TERMINATOR_UUID of: %s' % self.uuid.urn)
self.vte = vte.Terminal() self.vte = vte.Terminal()
self.vte.set_size(80, 24)
self.vte._expose_data = None self.vte._expose_data = None
if not hasattr(self.vte, "set_opacity") or \ if not hasattr(self.vte, "set_opacity") or \
not hasattr(self.vte, "is_composited"): not hasattr(self.vte, "is_composited"):
@ -175,6 +174,8 @@ class Terminal(gtk.VBox):
if not env_proxy: if not env_proxy:
if self.config['http_proxy'] and self.config['http_proxy'] != '': if self.config['http_proxy'] and self.config['http_proxy'] != '':
os.putenv('http_proxy', self.config['http_proxy']) os.putenv('http_proxy', self.config['http_proxy'])
self.reconfigure()
self.vte.set_size(80, 24)
def get_vte(self): def get_vte(self):
"""This simply returns the vte widget we are using""" """This simply returns the vte widget we are using"""