summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-30 01:54:34 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-30 01:54:34 +0000
commitcf698d4fd3c6c1f5b5ed71f2ab9aac06b076ce62 (patch)
treec28b8800f884eb92a4aa9ff5332a914a09364c6a
parente93c957824a081b4ac329425d59483010b8ff4e0 (diff)
downloaddrakx-cf698d4fd3c6c1f5b5ed71f2ab9aac06b076ce62.tar
drakx-cf698d4fd3c6c1f5b5ed71f2ab9aac06b076ce62.tar.gz
drakx-cf698d4fd3c6c1f5b5ed71f2ab9aac06b076ce62.tar.bz2
drakx-cf698d4fd3c6c1f5b5ed71f2ab9aac06b076ce62.tar.xz
drakx-cf698d4fd3c6c1f5b5ed71f2ab9aac06b076ce62.zip
(_text_insert) fix rpmdrake crashing when description begins by
"Gtk2::.." (#43802)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/mygtk2.pm4
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index bc10568b0..5d6ac4c64 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- libDrakX:
+ o fix rpmdrake crashing when description begins by "Gtk2::.."
+ (#43802)
- drakperm:
o show banner when not embedded
o use Gtk+2's FileChooserDialog
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 9a86ffa76..60e4a7b1d 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -1286,11 +1286,11 @@ sub _text_insert {
foreach my $token (@$t) {
my ($item, $tag) = @$token;
my $iter1 = $buffer->get_end_iter;
- if ($item =~ /^Gtk2::Gdk::Pixbuf/) {
+ if (ref($item) =~ /^Gtk2::Gdk::Pixbuf/) {
$buffer->insert_pixbuf($iter1, $item);
next;
}
- if ($item =~ /^Gtk2::/) {
+ if (ref($item) =~ /^Gtk2::/) {
my $anchor = $buffer->create_child_anchor($iter1);
$textview->add_child_at_anchor($item, $anchor);
$textview->{anchors} ||= [];