summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-22 17:51:14 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-22 17:51:14 +0000
commite50a210f3b4e17b01fc084ddb0b7fe5d9c2a3707 (patch)
treec326442520bb5da932d98d5e5d5460168a7b09d7
parent898bd3e2c1eb518534ab5a73ba6edf2fd13e3489 (diff)
downloaddrakx-e50a210f3b4e17b01fc084ddb0b7fe5d9c2a3707.tar
drakx-e50a210f3b4e17b01fc084ddb0b7fe5d9c2a3707.tar.gz
drakx-e50a210f3b4e17b01fc084ddb0b7fe5d9c2a3707.tar.bz2
drakx-e50a210f3b4e17b01fc084ddb0b7fe5d9c2a3707.tar.xz
drakx-e50a210f3b4e17b01fc084ddb0b7fe5d9c2a3707.zip
fix/workaround crash when setting banner background
(Can't call method "get_width" on an undefined value) it got broken three days ago (246038) by Gtk2::Banner changes, and install::steps_gtk calls Gtk2::Banner::set_pixmap without a real Gtk2::Banner object (but with an Install_Title object), which does not define back_pixbuf member to be fixed properly by the previous committer (not to name titi...)
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/ugtk2.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 06c19e8d9..95a24921e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- fix/workaround crash when setting banner background
+ (Can't call method "get_width" on an undefined value)
+
Version 11.50.2 - 22 September 2008
- RC2 logo
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index e7ad41cbc..e5eb092a2 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -1425,7 +1425,7 @@ use ugtk2 qw(:helpers :wrappers);
sub set_pixmap {
my ($darea) = @_;
return if !$darea->realized;
- ugtk2::set_back_pixbuf($darea, $darea->{back_pixbuf});
+ ugtk2::set_back_pixbuf($darea, $darea->{back_pixbuf} || gtknew('Pixbuf', file => 'banner-background'));
$darea->{layout} = $darea->create_pango_layout($darea->{text});
$darea->{txt_width} = ($darea->{layout}->get_pixel_size)[0];
$darea->queue_draw;