summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-04 18:12:55 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-04 18:12:55 +0000
commita11e8148036cb4425478c7153de3e4551b17878a (patch)
tree7a4323822ae3d235e3cc20b2aaa11723eac90473 /perl-install
parentda80d0370e178ad06c3d353afa0b104c26b93db8 (diff)
downloaddrakx-a11e8148036cb4425478c7153de3e4551b17878a.tar
drakx-a11e8148036cb4425478c7153de3e4551b17878a.tar.gz
drakx-a11e8148036cb4425478c7153de3e4551b17878a.tar.bz2
drakx-a11e8148036cb4425478c7153de3e4551b17878a.tar.xz
drakx-a11e8148036cb4425478c7153de3e4551b17878a.zip
(Gtk2::Banner->new) fix crashing when a banner icon doesn't exist (mga#5223)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/ugtk2.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ed4af5395..50488862b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- fix crashing when a banner icon doesn't exist (mga#5223)
- recognize new drivers:
o input: hid-aureal synaptics_usb
o wifi: qmi_wwan, mwifiex_usb
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 65f07cc0d..69185247c 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -1448,6 +1448,7 @@ sub new {
$darea->set_size_request(-1, $d_height);
$darea->modify_font(Gtk2::Pango::FontDescription->from_string("13"));
eval { $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon) };
+ $darea->{icon} ||= ugtk2::gtkcreate_pixbuf(ugtk2::wm_icon());
my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk2::text_direction_rtl()) };
my $blue_width = $blue_part->get_width;
$darea->{text} = $text;