summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-22 11:00:48 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-22 11:00:48 +0000
commitf1d567111bc992f762170a634713fc2935f928f7 (patch)
treeb5fa348bf4d6438c2bfe553f747c6d5a98ca4d24
parentb3fda9dd95fa45190d3f81cf613c5bda1a246c92 (diff)
downloaddrakx-f1d567111bc992f762170a634713fc2935f928f7.tar
drakx-f1d567111bc992f762170a634713fc2935f928f7.tar.gz
drakx-f1d567111bc992f762170a634713fc2935f928f7.tar.bz2
drakx-f1d567111bc992f762170a634713fc2935f928f7.tar.xz
drakx-f1d567111bc992f762170a634713fc2935f928f7.zip
(new) do not let MCC crashes if an icon is missing (#37651)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/ugtk2.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d33d7794f..e252d5044 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,7 @@
- do not bother probing /dev/fd0 and loading floppy device uselessly,
it takes time and it is already done by boot process
(just check /proc/devices)
+- do not let MCC crashes if an icon is missing (#37651)
Version 11.21 - 21 August 2008
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 89844f570..ecfe879e9 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -1433,7 +1433,7 @@ sub new {
my $d_height = 75;
$darea->set_size_request(-1, $d_height);
$darea->modify_font(Gtk2::Pango::FontDescription->from_string("Sans Bold 14"));
- $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon);
+ eval { $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon) };
$darea->{text} = $text;
require lang;
my $is_rtl = lang::text_direction_rtl();