Merge lp:~xapantu/granite/fix-1157350tab-crash into lp:~elementary-pantheon/granite/granite

[xapantu]

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

584. By xapantu on 2013-06-16

New API to force tab deletion (useful for drag and drop things, when the tab is not really deleted)
Code simplification (which avoids some weird bugs)

585. By xapantu on 2013-06-16

Removed commented code

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2013-06-02 12:40:05 +0000
+++ lib/Widgets/DynamicNotebook.vala	2013-06-16 16:41:27 +0000
@@ -116,7 +116,7 @@
             this.pack_start (this._working, false);
 
             page_container = new Gtk.EventBox ();
-            page_container.add (page ?? new Gtk.Label (""));
+            this.page = page ?? new Gtk.Label("");
             page_container.show_all ();
 
             this.show_all ();
@@ -483,9 +483,6 @@
 
         unowned Gtk.Notebook on_create_window (Gtk.Widget page, int x, int y) {
             var tab = notebook.get_tab_label (page) as Tab;
-            notebook.remove_page (notebook.page_num (tab.page_container));
-            tab.page_container.destroy ();
-
             tab_moved (tab, 0, true, x, y);
             return null;
         }
@@ -507,8 +504,8 @@
             }
         }
 
-        public void remove_tab (Tab tab) {
-            if (Signal.has_handler_pending (this, Signal.lookup ("tab-removed", typeof (DynamicNotebook)), 0, true)) {
+        public void remove_tab (Tab tab, bool force = false) {
+            if (!force && Signal.has_handler_pending (this, Signal.lookup ("tab-removed", typeof (DynamicNotebook)), 0, true)) {
                 var sure = tab_removed (tab);
                 if (!sure)
                     return;
@@ -517,7 +514,6 @@
             var pos = get_tab_position (tab);
             if (pos != -1)
                 notebook.remove_page (pos);
-            tab.page_container.destroy ();
         }
 
         public void next_page () {
@@ -610,9 +606,7 @@
             });
 
             tab.new_window.connect (() => {
-                notebook.remove_page (notebook.page_num (tab.page_container));
-                tab.page_container.destroy ();
-                tab_moved (tab, 0, true, 0, 0);
+                notebook.create_window(tab.page_container, 0, 0);
             });
 
             tab.duplicate.connect (() => {