From 552d506a82618d8145ff8c284d60112349a4d3ba Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 26 Mar 2007 11:23:25 +0000 Subject: (set_node_state) set_node_state_tree() is now basically a wrapper around set_node_state_flat(), doing the same checks; just merge them into their unique caller --- Rpmdrake/gui.pm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'Rpmdrake') diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index d56a2a42..aef6170f 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -177,28 +177,16 @@ sub node_state { my ($common, $w, %wtree, %ptree, %pix); -sub set_node_state_flat { +sub set_node_state { my ($iter, $state, $model) = @_; - $state eq 'XXX' and return; - $pix{$state} ||= gtkcreate_pixbuf($state); + ($state eq 'XXX' || !$state) and return; + $pix{$state} ||= gtkcreate_pixbuf('state_' . $state); $model ||= $w->{tree_model}; $model->set($iter, $pkg_columns{state_icon} => $pix{$state}); $model->set($iter, $pkg_columns{state} => $state); $model->set($iter, $pkg_columns{selected} => to_bool(member($state, qw(base installed to_install)))); #$pkg->{selected})); } -sub set_node_state_tree { - my ($iter, $state, $model) = @_; - $model ||= $w->{tree_model}; - ($state eq 'XXX' || !$state) and return; - $pix{$state} ||= gtkcreate_pixbuf('state_' . $state); - set_node_state_flat($iter, $state, $model); -} - -sub set_node_state { - $common->{state}{flat} ? set_node_state_flat(@_) : \&set_node_state_tree(@_); -} - sub set_leaf_state { my ($leaf, $state, $model) = @_; set_node_state($_, $state, $model) foreach @{$ptree{$leaf}}; -- cgit v1.2.1