aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-11-19 21:37:27 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-12-05 14:16:06 +0100
commit581d70ff9bbdb93dca53e1c46ddb10b2b1eaa945 (patch)
tree08049520b306ff410d8c72f5048be12ab5d7c878
parent4473fb769b8aa88daede1eaaa4c65e74cbd17401 (diff)
downloadrpmdrake-581d70ff9bbdb93dca53e1c46ddb10b2b1eaa945.tar
rpmdrake-581d70ff9bbdb93dca53e1c46ddb10b2b1eaa945.tar.gz
rpmdrake-581d70ff9bbdb93dca53e1c46ddb10b2b1eaa945.tar.bz2
rpmdrake-581d70ff9bbdb93dca53e1c46ddb10b2b1eaa945.tar.xz
rpmdrake-581d70ff9bbdb93dca53e1c46ddb10b2b1eaa945.zip
perlish ->window => ->get_window
-rwxr-xr-xMageiaUpdate8
-rw-r--r--Rpmdrake/gui.pm16
-rwxr-xr-xrpmdrake14
-rw-r--r--rpmdrake.pm12
4 files changed, 25 insertions, 25 deletions
diff --git a/MageiaUpdate b/MageiaUpdate
index df1bbd09..8bde8afc 100755
--- a/MageiaUpdate
+++ b/MageiaUpdate
@@ -114,7 +114,7 @@ sub toggle {
my $pkg = $pkgs->{$name}{pkg};
return if !$pkg;
$pkg->set_flag_skip(0);
- toggle_nodes($w->{real_window}->window, $list->get_model, sub {
+ toggle_nodes($w->{real_window}->get_window, $list->get_model, sub {
my ($leaf, $_state, $_model) = @_;
$done = 1;
$list->{data}[$data{$leaf}][$pkg_columns{selected}] = $pkgs->{$name}{selected};
@@ -237,7 +237,7 @@ sub run_treeview_dialog {
$list->get_selection->signal_connect(changed => sub {
my ($model, $iter) = $_[0]->get_selected;
$model && $iter or return;
- gtktext_insert($info, get_info($model->get($iter, $pkg_columns{text}), $w->{real_window}->window));
+ gtktext_insert($info, get_info($model->get($iter, $pkg_columns{text}), $w->{real_window}->get_window));
$info->scroll_to_iter($info->get_buffer->get_start_iter, 0, 0, 0, 0);
});
@@ -264,8 +264,8 @@ sub run_treeview_dialog {
$cell->signal_connect(toggled => sub {
my ($_cell, $text_path) = @_;
my $name = $list->{data}[$text_path][$pkg_columns{text}];
- gtkset_mousecursor_wait($w->{real_window}->window);
- my $_guard = before_leaving(sub { gtkset_mousecursor_normal($w->{real_window}->window) });
+ gtkset_mousecursor_wait($w->{real_window}->get_window);
+ my $_guard = before_leaving(sub { gtkset_mousecursor_normal($w->{real_window}->get_window) });
toggle($list, $name);
});
$action_button->set_sensitive(0) if $>;
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;
diff --git a/rpmdrake b/rpmdrake
index 78e06f0e..6d89d82d 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -211,7 +211,7 @@ sub do_search($$$$$$$) {
N("No search results. You may want to switch to the '%s' view and to the '%s' filter",
N("All"), N("All"),);
statusbar_msg($string , 1);
- gtkset_mousecursor_normal($::w->{rwindow}->window);
+ gtkset_mousecursor_normal($::w->{rwindow}->get_window);
}
my $tree_selection = $tree->get_selection;
if (my $path = $tree_model->get_path($iter)) {
@@ -337,7 +337,7 @@ sub run_treeview_dialog {
$_->signal_connect(
expose_event => sub {
$cursor_to_restore or return;
- gtkset_mousecursor_normal($tree->window);
+ gtkset_mousecursor_normal($tree->get_window);
undef $cursor_to_restore;
},
) foreach $tree, $detail_list;
@@ -355,9 +355,9 @@ sub run_treeview_dialog {
while ($parent = $model->iter_parent($parent)) {
$group = join('|', $model->get($parent, 0), $group);
}
- $detail_list->window->freeze_updates;
+ $detail_list->get_window->freeze_updates;
$options->{add_nodes}->(@{$elems{$group}});
- $detail_list->window->thaw_updates if $detail_list->window;
+ $detail_list->get_window->thaw_updates if $detail_list->get_window;
});
$options->{state}{splited} = 1;
@@ -463,7 +463,7 @@ sub run_treeview_dialog {
if ($filter->[0] ne $val) {
$filter->[0] = $val;
reset_search();
- slow_func($::main_window->window, sub { switch_pkg_list_mode($default_list_mode) });
+ slow_func($::main_window->get_window, sub { switch_pkg_list_mode($default_list_mode) });
$options->{rebuild_tree}->();
}
}
@@ -516,7 +516,7 @@ sub run_treeview_dialog {
);
my $reload_db_and_clear_all = sub {
- slow_func($w->{real_window}->window, sub {
+ slow_func($w->{real_window}->get_window, sub {
$force_rebuild = 1;
pkgs_provider($options->{tree_mode}, skip_updating_mu => 1);
reset_search();
@@ -762,7 +762,7 @@ sub run_treeview_dialog {
$detail_list->realize;
gtkflush();
- slow_func($::main_window->window, sub { pkgs_provider($default_list_mode) }); # default mode
+ slow_func($::main_window->get_window, sub { pkgs_provider($default_list_mode) }); # default mode
if (@initial_selection) {
$options->{initial_selection} = \@initial_selection;
undef $pkgs->{$_}{selected} foreach @initial_selection;
diff --git a/rpmdrake.pm b/rpmdrake.pm
index e5697957..13c287b6 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -394,14 +394,14 @@ sub wait_msg {
)
);
$mainw->sync;
- gtkset_mousecursor_wait($mainw->{rwindow}->window) unless $options{no_wait_cursor};
+ gtkset_mousecursor_wait($mainw->{rwindow}->get_window) unless $options{no_wait_cursor};
$mainw->flush;
$mainw;
}
sub remove_wait_msg {
my $w = shift;
- gtkset_mousecursor_normal($w->{rwindow}->window);
+ gtkset_mousecursor_normal($w->{rwindow}->get_window);
$w->destroy;
}
@@ -429,7 +429,7 @@ sub statusbar_msg {
my ($msg, $o_timeout) = @_;
#- always use the same context description for now
my $cx = $::statusbar->get_context_id("foo");
- $::w and $::w->{rwindow} and gtkset_mousecursor_wait($::w->{rwindow}->window);
+ $::w and $::w->{rwindow} and gtkset_mousecursor_wait($::w->{rwindow}->get_window);
#- returns a msg_id to be passed optionnally to statusbar_msg_remove
my $id = $::statusbar->push($cx, $msg);
gtkflush();
@@ -448,17 +448,17 @@ sub statusbar_msg_remove {
} else {
$::statusbar->pop($cx);
}
- $::w and $::w->{rwindow} and gtkset_mousecursor_normal($::w->{rwindow}->window);
+ $::w and $::w->{rwindow} and gtkset_mousecursor_normal($::w->{rwindow}->get_window);
}
sub slow_func_statusbar ($$&) {
my ($msg, $w, $func) = @_;
- gtkset_mousecursor_wait($w->window);
+ gtkset_mousecursor_wait($w->get_window);
my $msg_id = statusbar_msg($msg);
gtkflush();
$func->();
statusbar_msg_remove($msg_id);
- gtkset_mousecursor_normal($w->window);
+ gtkset_mousecursor_normal($w->get_window);
}
my %u2l = (