From aaf848ee14feb7a2b32975c9d7ef47157e6d7e43 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 28 Jan 2010 07:25:32 +0000
Subject: (refresh_no_more_supported_msg,no_more_supported_choice) fix testing
for availability of extended maintenance
(basically reverting part of r265341)
---
NEWS | 3 +++
mdkapplet | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/NEWS b/NEWS
index ea3ac8d0..e7683c78 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- mdkapplet
+ o fix a test
+
Version 2.77.15.4 - 27 January 2010, Thierry Vignaud
- mdkapplet-extended-maintenance-helper
diff --git a/mdkapplet b/mdkapplet
index fd6b542c..dad5cf9d 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -473,7 +473,7 @@ sub refresh_no_more_supported_msg() {
my $msg;
# is extended maintenance available?
- if (is_extmaint_supported()) {
+ if ($extended_maintenance_url) {
if ($no_more_supported eq 'none') {
$msg = N("You should get extended maintenance.");
} else {
@@ -493,13 +493,13 @@ sub no_more_supported_choice() {
local $mdkapplet_gui::width = 580;
my $w = new_portable_dialog(N("Your distribution is no longer supported"));
my ($b1, $b2, $b3);
- my $choice = is_extmaint_supported() ? 'extended' : ($no_more_supported ne 'none' ? 'upgrade' : undef);
+ my $choice = $extended_maintenance_url ? 'extended' : ($no_more_supported ne 'none' ? 'upgrade' : undef);
my @widgets = (
get_banner(),
gtknew('Label_Left',
text => get_obsolete_message() . "\n", @common),
- if_(is_extmaint_supported(),
+ if_($extended_maintenance_url,
$b1 = gtknew('RadioButton',
text => N("Purchase a maintenance extension for this version (%s) and keep it running until.", $product_id->{version}),
toggled => sub {
--
cgit v1.2.1