Merge lp:~xapantu/pantheon-terminal/fix-1157350tab-crash into lp:~elementary-apps/pantheon-terminal/trunk

[xapantu]

[lp:~xapantu/pantheon-terminal/fix-1157350tab-crash]

487. By xapantu on 2013-06-16

Change to use the new granite API
Avoid a warning while getting the current_terminal window title

488. By xapantu on 2013-06-16

Internal API simplification and code cleanup

=== modified file 'src/PantheonTerminal.vala'
--- src/PantheonTerminal.vala	2013-06-11 18:50:20 +0000
+++ src/PantheonTerminal.vala	2013-06-16 16:32:26 +0000
@@ -138,11 +138,12 @@
             add_window (window);
         }
 
-        public void new_window_with_coords (int x, int y, bool should_recreate_tabs=true) {
+        public PantheonTerminalWindow new_window_with_coords (int x, int y, bool should_recreate_tabs=true) {
             var window = new PantheonTerminalWindow.with_coords (this, x, y, should_recreate_tabs);
             window.show ();
             windows.append (window);
             add_window (window);
+            return window;
         }
 
         public void new_window_with_programs (string[] programs) {

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2013-06-12 02:40:32 +0000
+++ src/PantheonTerminalWindow.vala	2013-06-16 16:32:26 +0000
@@ -148,9 +148,10 @@
             notebook.show_icons = false;
             notebook.tab_switched.connect (on_switch_page);
             notebook.tab_moved.connect (on_tab_moved);
-            notebook.allow_new_window = false;
+            notebook.allow_new_window = true;
             notebook.allow_duplication = false;
             notebook.margin_top = 3;
+            notebook.group_name = "pantheon-terminal";
 
             notebook.tab_added.connect ((tab) => {
                 new_tab ("", tab);
@@ -297,21 +298,17 @@
 
         private void on_tab_moved (Granite.Widgets.Tab tab, int new_pos, bool new_window, int x, int y) {
             if (new_window) {
-                app.new_window_with_coords (x, y, false);
-                var win = app.windows.last ().data;
-                //win.move (x, y);
+                var win = app.new_window_with_coords (x, y, false);
+                
+                notebook.remove_tab (tab, /* force */ true);
 
                 var n = win.notebook;
-                //remove the one automatically created after inserting
                 n.insert_tab (tab, -1);
-                n.remove_tab (n.tabs.nth_data (1));
-
-                //notebook.remove_tab (tab);
-                if (notebook.n_tabs == 0)
-                    destroy ();
             } else {
                 current_terminal.grab_focus ();
             }
+            if (notebook.n_tabs == 0)
+                destroy ();
         }
 
         private void update_context_menu () {
@@ -361,7 +358,7 @@
         void on_switch_page (Granite.Widgets.Tab? old, Granite.Widgets.Tab new_tab) {
             current_tab = new_tab;
             current_terminal = ((Grid) new_tab.page).get_child_at (0, 0) as TerminalWidget;
-            title = current_terminal.window_title;
+            title = current_terminal.window_title ?? "";
             new_tab.page.grab_focus ();
         }