ペインが削除されないことがあった

git-svn-id: svn://toshia.dip.jp/mikutter/trunk@945 03aab468-d3d2-4883-8b12-f661bbf03fa8

3 files changed, 3 insertions, 3 deletions

diff --git a/core/plugin/gtk/gtk.rb b/core/plugin/gtk/gtk.rb
index f5a8fc67..dae3e49d 100644
--- a/core/plugin/gtk/gtk.rb
+++ b/core/plugin/gtk/gtk.rb
@@ -74,7 +74,7 @@ Plugin.create :gtk do
         pane.parent.remove(pane)
         UserConfig.disconnect(tab_position_hook_id)
         pane_order_delete(i_pane)
-        pane.destroy end
+        i_pane.destroy end
       false }
   end
 
@@ -260,7 +260,7 @@ Plugin.create :gtk do
               pane.remove_page(pagenum)
               break end } end
       else
-        widget.parent.remove(widget)
+        widget.parent.remove(widget) if widget.parent
         widget.destroy end end end
 
   # 互換性のため
diff --git a/core/plugin/gui/postbox.rb b/core/plugin/gui/postbox.rb
index 00d4e046..befdca41 100644
--- a/core/plugin/gui/postbox.rb
+++ b/core/plugin/gui/postbox.rb
@@ -64,5 +64,4 @@ class Plugin::GUI::Window
   include Plugin::GUI::Postbox::PostboxParent end
 
 class Plugin::GUI::Timeline
-  include Plugin::GUI::HierarchyParent
   include Plugin::GUI::Postbox::PostboxParent end
diff --git a/core/plugin/gui/timeline.rb b/core/plugin/gui/timeline.rb
index ee5ca4b7..c840a258 100644
--- a/core/plugin/gui/timeline.rb
+++ b/core/plugin/gui/timeline.rb
@@ -10,6 +10,7 @@ class Plugin::GUI::Timeline
 
   include Plugin::GUI::Cuscadable
   include Plugin::GUI::HierarchyChild
+  include Plugin::GUI::HierarchyParent
   include Plugin::GUI::Widget
 
   role :timeline