From 507903e29c933401eb2fa3f8f784f2e22a92504a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 23 Mar 2009 09:35:50 +0000
Subject: (definition of @tree) fix IDs of DVD/CDs thus fixing crashing on
 invalidly escaped characters (#49034)

(regression introduced in r254139 on 2009-03-17:
"(navigation-requested callback) simplify using Glib")
---
 NEWS           | 3 +++
 control-center | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 184ea0e9..1b1e9058 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- drakconf:
+  o fix IDs of DVD/CDs thus fixing crashing on invalidly escaped
+    characters (#49034)
 - drakxconf:
   o do use translations when using the text mode version (#48988)
 
diff --git a/control-center b/control-center
index b4ad3b68..9e8e1f8d 100755
--- a/control-center
+++ b/control-center
@@ -467,12 +467,13 @@ my @tree = (
                     (map {
                         my ($type, $scan, $text, $long_text) = @$_;
                         map_index {
+                            $text = sprintf(translate($text), $_->{info});
                             my $full_name = $text . ($::i ? $::i + 1 : '');
                             $programs{$full_name} =
                               {
                                   binary => "$sbindir/diskdrake --removable=$_->{device}",
                                   embedded => 1,
-                                  description => sprintf(translate($text), $_->{info}),
+                                  description => $text,
                                   long_description => sprintf(translate($long_text), $_->{info}),
                                   icon => "diskdrake_$type",
                               };
-- 
cgit v1.2.1