From ce63d6c29cc710f830201e80a2be907ceaab6df1 Mon Sep 17 00:00:00 2001
From: Emmanuel Bretelle <chantra@mangal>
Date: Thu, 22 May 2008 20:01:20 +0100
Subject: [PATCH] cleaning up some code in newtab   ** removed old reference to
 the box   ** better handling of new tab spawning

---
 terminator | 45 +++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/terminator b/terminator
index e7588262..706d9852 100755
--- a/terminator
+++ b/terminator
@@ -1045,47 +1045,60 @@ class Terminator:
     
   def newtab(self,widget):
     terminal = TerminatorTerm (self, self.profile, None, widget.get_cwd())
-    widgetbox = widget
-    parent   = widgetbox.get_parent ()
+    parent   = widget.get_parent ()
     
     if isinstance(parent, gtk.Paned) or isinstance(parent, gtk.Window):
       #no notebook yet.
       notebook = gtk.Notebook()
       notebook.connect('page-reordered',self.on_page_reordered)
       notebook.set_property('homogeneous', True)
-      notebook.set_tab_reorderable(widgetbox, True)
+      notebook.set_tab_reorderable(widget, True)
       
       if isinstance(parent, gtk.Paned):
-        if parent.get_child1() == widgetbox:
-          widgetbox.reparent(notebook)
+        if parent.get_child1() == widget:
+          widget.reparent(notebook)
           parent.pack1(notebook)
         else:
-          widgetbox.reparent(notebook)
+          widget.reparent(notebook)
           parent.pack2(notebook)
       elif isinstance(parent, gtk.Window):
-         widgetbox.reparent(notebook)
+         widget.reparent(notebook)
          parent.add(notebook)
-      notebook.set_tab_reorderable(widgetbox,True)
+      notebook.set_tab_reorderable(widget,True)
       notebooklabel = ""
       if widget._vte.get_window_title() is not None:
         notebooklabel = widget._vte.get_window_title()
-      notebook.set_tab_label_text(widgetbox, notebooklabel)    
-      notebook. set_tab_label_packing(widgetbox, True, True, gtk.PACK_START)
+      notebook.set_tab_label_text(widget, notebooklabel)    
+      notebook. set_tab_label_packing(widget, True, True, gtk.PACK_START)
       notebook.show()  
     elif isinstance(parent, gtk.Notebook):
       notebook = parent
     else:
       return (False)
     
-    notebook.append_page(terminal,terminal._vte.get_window_title())
-    notebook. set_tab_label_packing(terminal, True, True, gtk.PACK_START)
-    notebook.set_tab_reorderable(terminal,True)
-    notebook.set_current_page(-1)
-    index = self.term_list.index(widget)
-    self.term_list.insert (index + 1, terminal)
+    ## NOTE
+    ## Here we need to append to the notebook before we can 
+    ## spawn the terminal (WINDOW_ID needs to be set)
+    
+    notebook.append_page(terminal,None)
     terminal.show ()
     terminal.spawn_child ()
+    ## Some gtk/vte weirdness
+    ## If we don't use this silly test,
+    ## terminal._vte.get_window_title() might return
+    ## bogus values
+    notebooklabel = ""
+    if terminal._vte.get_window_title() is not None:
+      notebooklabel = terminal._vte.get_window_title()
+    notebook.set_tab_label_text(terminal, notebooklabel)
+    notebook.set_tab_label_packing(terminal, True, True, gtk.PACK_START)
+    notebook.set_tab_reorderable(terminal,True)
+    ## Now, we set focus on the new term
+    notebook.set_current_page(-1)
     terminal._vte.grab_focus ()
+
+    index = self.term_list.index(widget)
+    self.term_list.insert (index + 1, terminal)
     return (True)