1 files changed, 8 insertions, 8 deletions

diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 9181a3da..d653daca 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -118,7 +118,7 @@ sub build_expander {
                 state $first;
                 return if $first;
                 $first = 1;
-                slow_func($::main_window->window, sub {
+                slow_func($::main_window->get_window, sub {
                               extract_header($pkg, $urpm, $type, $o_installed_version);
                               gtktext_insert($textview, $get_data->() || [ [  N("(Not available)") ] ]);
                           });
@@ -228,7 +228,7 @@ sub get_new_deps {
         gtksignal_connect(
             gtkshow(my $dependencies = Gtk3::Expander->new(format_field(N("New dependencies:")))), 
             activate => sub { 
-                slow_func($::main_window->window, sub {
+                slow_func($::main_window->get_window, sub {
                               my $state = {};
                               my $db = open_rpm_db();
                               my @requested = $urpm->resolve_requested__no_suggests_(
@@ -488,7 +488,7 @@ sub toggle_all {
       #- not all is selected, select all if no option to potentially override
       (exists $common->{partialsel_unsel} && $common->{partialsel_unsel}->(\@unsel, \@l) ? difference2(\@l, \@unsel) : @unsel)
         : @l;
-    toggle_nodes($w->{detail_list}->window, $w->{detail_list_model}, \&set_leaf_state, node_state($p[0]), @p);
+    toggle_nodes($w->{detail_list}->get_window, $w->{detail_list_model}, \&set_leaf_state, node_state($p[0]), @p);
     update_size($common);
 }
 
@@ -548,15 +548,15 @@ sub ask_browse_tree_given_widgets_for_rpmdrake {
     };
     
     $common->{display_info} = sub {
-        gtktext_insert($w->{info}, get_info($_[0], $w->{tree}->window));
+        gtktext_insert($w->{info}, get_info($_[0], $w->{tree}->get_window));
         $w->{info}->scroll_to_iter($w->{info}->get_buffer->get_start_iter, 0, 0, 0, 0);
         0;
     };
 
     my $fast_toggle = sub {
         my ($iter) = @_;
-        gtkset_mousecursor_wait($w->{w}{rwindow}->window);
-        my $_cleaner = before_leaving { gtkset_mousecursor_normal($w->{w}{rwindow}->window) };
+        gtkset_mousecursor_wait($w->{w}{rwindow}->get_window);
+        my $_cleaner = before_leaving { gtkset_mousecursor_normal($w->{w}{rwindow}->get_window) };
         my $name = $w->{detail_list_model}->get($iter, $pkg_columns{text});
         my $urpm_obj = $pkgs->{$name}{pkg};
 
@@ -576,7 +576,7 @@ sub ask_browse_tree_given_widgets_for_rpmdrake {
             interactive_msg(N("Warning"), '<b>' . N("Rpmdrake or one of its priority dependencies needs to be updated first. Rpmdrake will then restart.") . '</b>' . "\n\n");
         }
 
-        toggle_nodes($w->{tree}->window, $w->{detail_list_model}, \&set_leaf_state, $w->{detail_list_model}->get($iter, $pkg_columns{state}),
+        toggle_nodes($w->{tree}->get_window, $w->{detail_list_model}, \&set_leaf_state, $w->{detail_list_model}->get($iter, $pkg_columns{state}),
                      $w->{detail_list_model}->get($iter, $pkg_columns{text}));
 	    update_size($common);
     };
@@ -593,7 +593,7 @@ sub ask_browse_tree_given_widgets_for_rpmdrake {
     });
     $common->{rebuild_tree}->();
     update_size($common);
-    $common->{initial_selection} and toggle_nodes($w->{tree}->window, $w->{detail_list_model}, \&set_leaf_state, undef, @{$common->{initial_selection}});
+    $common->{initial_selection} and toggle_nodes($w->{tree}->get_window, $w->{detail_list_model}, \&set_leaf_state, undef, @{$common->{initial_selection}});
     #my $_b = before_leaving { $clear_all_caches->() };
     $common->{init_callback}->() if $common->{init_callback};
     $w->{w}->main;