From efdd2c7205a92de5f6bb4beef8baa5eb7212ecc3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 29 Jul 2004 11:18:29 +0000 Subject: (show_prev) - kill useless variables - simplify --- perl-install/standalone/draksplash | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash index 8c8866a0c..b6ff8ceef 100755 --- a/perl-install/standalone/draksplash +++ b/perl-install/standalone/draksplash @@ -486,13 +486,7 @@ sub set_thm_values() { } -my ($prev_pic, $prev_canvas); - #- Desc => destroy properly all widget of preview window -sub kill_preview() { - $prev_window->destroy; undef($prev_window); - undef($prev_pic); -} #- Desc => create a new window with a preview of splash screen #- Args => $img_file (str) full path to preview file sub show_prev { @@ -501,6 +495,7 @@ sub show_prev { $prev_window->set_title( #-PO: First %s is theme name, second %s (in parenthesis) is resolution N("%s BootSplash (%s) preview", $theme{name}, $theme{res}{res})); + my $prev_pic; eval { $prev_pic = gtkcreate_pixbuf($img_file) }; if (my $err = $@) { err_dialog(N("Error"), @@ -513,9 +508,11 @@ sub show_prev { $prev_pic->scale_simple($theme{res}{w}, $theme{res}{h}, 'hyper'); $prev_window->add(Gtk2::Image->new_from_pixbuf($prev_pic)); - $prev_window->signal_connect(delete_event => \&kill_preview); + $prev_window->signal_connect(delete_event => sub { + $prev_window->destroy; undef($prev_window); + undef($prev_pic); + }); $prev_window->show_all; - } #- Desc => define the max size of boot's scales -- cgit v1.2.1