From 337c650f345e6ce7846a867cda98933168ffc9bb Mon Sep 17 00:00:00 2001
From: Chris Jones <cmsj@tenshu.net>
Date: Tue, 27 Jan 2009 21:19:10 +0000
Subject: [PATCH] Back out earlier debugging changes

---
 terminatorlib/terminator.py     | 11 -----------
 terminatorlib/terminatorterm.py | 10 +---------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
index 97fadfa0..99316097 100755
--- a/terminatorlib/terminator.py
+++ b/terminatorlib/terminator.py
@@ -750,11 +750,6 @@ class Terminator:
       dbg ("splitaxis function called, but Terminator was in zoomed mode.")
       return
 
-    # Make sure we are actually ready to do this
-    while gtk.events_pending ():
-      dbg ('WEIRD: Running a main loop iteration. 2')
-      gtk.main_iteration ()
-
     # create a new terminal and parent pane.
     dbg ('SEGBUG: Creating TerminatorTerm')
     terminal = TerminatorTerm (self, self.profile, command, widget.get_cwd())
@@ -767,12 +762,6 @@ class Terminator:
     dbg ('SEGBUG: showed TerminatorTerm')
     terminal.spawn_child ()
     dbg ('SEGBUG: spawned child')
-
-    # Make sure we are actually ready to return
-    while gtk.events_pending ():
-      dbg ('WEIRD: Running a main loop iteration. 3')
-      gtk.main_iteration ()
-
     return
   
   def remove(self, widget, keep = False):
diff --git a/terminatorlib/terminatorterm.py b/terminatorlib/terminatorterm.py
index 3a277bd1..95e04c6c 100755
--- a/terminatorlib/terminatorterm.py
+++ b/terminatorlib/terminatorterm.py
@@ -123,6 +123,7 @@ class TerminatorTerm (gtk.VBox):
       self._composited_support = False
     #self._vte.set_double_buffered(True)
     self._vte.set_size (80, 24)
+    self.reconfigure_vte ()
     self._vte._expose_data = None
     self._vte.show ()
 
@@ -242,13 +243,6 @@ class TerminatorTerm (gtk.VBox):
     dbg ('SEGBUG: Setting COLORTERM')
     os.putenv ('COLORTERM', 'gnome-terminal')
     dbg ('SEGBUG: TerminatorTerm __init__ complete')
-    while gtk.events_pending ():
-      dbg ('WEIRD: Running a main loop iteration. 1')
-      gtk.main_iteration ()
-    dbg ('WEIRD: Flags before calling reconfigure_vte: %s' % self._vte.flags ())
-    self.reconfigure_vte ()
-    dbg ('WEIRD: Flags after calling reconfigure_vte: %s' % self._vte.flags ())
-    gobject.timeout_add (1000, self.reconfigure_vte)
 
   def openurl (self, url):
     dbg ('openurl: viewing %s'%url)
@@ -705,8 +699,6 @@ text/plain
 
     self._vte.queue_draw ()
 
-    return (False)
-
   def on_composited_changed (self, widget):
     self.reconfigure_vte ()