clutter-embed.rb in rabbit-0.9.2

- old
+ new

@@ -186,27 +186,26 @@
             callback ||= Utils.process_pending_events_proc
             @canvas.activate("ReloadTheme", &callback)
           end
         end
 
-        def attach_to(window)
+        def attach_to(window, container=nil)
           super
 
           init_menu
-          add_widget_to_window(@window)
+          add_widgets_to_container(@container)
           widget.show
           attach_menu(@window)
           attach_key(@window)
         end
 
         def detach
           detach_key(@window)
           detach_menu(@window)
           widget.hide
           unless @window.destroyed?
-            remove_widget_from_window(@window)
-            @window.signal_handler_disconnect(@configure_signal_id)
+            remove_widgets_from_container(@container)
           end
 
           super
         end
 
@@ -295,15 +294,15 @@
             not n.zero?
           end
         end
 
         private
-        def add_widget_to_window(window)
-          window.add(@embed)
+        def add_widgets_to_container(container)
+          container.add(@embed)
         end
 
-        def remove_widget_from_window(window)
-          window.remove(@embed)
+        def remove_widgets_from_container(container)
+          container.remove(@embed)
         end
 
         def init_dpi
           @x_dpi = ScreenInfo.screen_x_resolution
           @y_dpi = ScreenInfo.screen_y_resolution