From 0c20502e91e906a08177443885f84262816f5b68 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 18 Mar 2008 22:18:42 +0000
Subject: (interactive_msg) fix displaying data about packages when choosing
 one while resolving dependancies (#39042)

(regression introduced in r238921 on 2008-03-10: "(interactive_msg)
enable to use markups in TextView (needed for next commit)")
---
 NEWS        | 4 ++++
 rpmdrake.pm | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 2dc57072..7c94bc22 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- fix displaying data about packages when choosing one while resolving
+  dependancies (#39042)
+  (regression introduced in "display in bold that priority updates
+  require restarting" in 4.6 on 10 March 2008)
 - rpmdrake:
   o be nice with UMPC screens:
     * enable to shrink package groups tree (#38762)
diff --git a/rpmdrake.pm b/rpmdrake.pm
index d1bcb9c3..4d2e1c37 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -201,9 +201,9 @@ sub interactive_msg {
     my $d = ugtk2->new($title, grab => 1, if_(exists $options{transient}, transient => $options{transient}));
     $d->{rwindow}->set_position($options{transient} ? 'center_on_parent' : 'center_always');
     if ($options{scroll}) {
-        $contents = ugtk2::markup_to_TextView_format($contents);
+        $contents = ugtk2::markup_to_TextView_format($contents) if !ref $contents;
     } else { #- because we'll use a WrappedLabel
-        $contents = formatAlaTeX($contents);
+        $contents = formatAlaTeX($contents) if !ref $contents;
     }
     my $banner = $options{banner} ? getbanner() : undef;
     my $text_w;
-- 
cgit v1.2.1