summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-05-14 20:08:20 +0000
committerColin Guthrie <colin@mageia.org>2013-05-14 20:08:20 +0000
commitcf74235920962a7ad30eb4d213e648b2d0183bf9 (patch)
tree93430b7f6ced1f70cb1772be3a2d51d5d5d96cb6
parent0171140ce456e3ac02073feff8ed6a6764702c6e (diff)
downloadmgaonline-cf74235920962a7ad30eb4d213e648b2d0183bf9.tar
mgaonline-cf74235920962a7ad30eb4d213e648b2d0183bf9.tar.gz
mgaonline-cf74235920962a7ad30eb4d213e648b2d0183bf9.tar.bz2
mgaonline-cf74235920962a7ad30eb4d213e648b2d0183bf9.tar.xz
mgaonline-cf74235920962a7ad30eb4d213e648b2d0183bf9.zip
Enable the 'download all' links for everyone (mga#8157)
-rw-r--r--NEWS1
-rwxr-xr-xmgaapplet26
2 files changed, 10 insertions, 17 deletions
diff --git a/NEWS b/NEWS
index e65553ed..c9d7bd26 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- ensure nonfree/tainted media is kept enabled on distro upgrade
- do not use urpm code to check the folder as this is run as unprivileged user (mga#6083)
+- enable the 'download all' links for everyone (mga#8157)
Version 2.80 - 4 May 2013, Colin Guthrie
diff --git a/mgaapplet b/mgaapplet
index af110253..0f82b094 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -383,11 +383,6 @@ sub configNetwork() {
fork_exec("/usr/sbin/drakconnect");
}
-# only enable 'download all packages at once' on 2010.1 and further:
-sub is_download_all_enabled() {
- is_it_a_devel_distro();
-}
-
sub confirm_upgrade() {
local $mygtk2::left_padding = 0;
my $warn_me = text2bool($local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE});
@@ -414,18 +409,15 @@ sub confirm_upgrade() {
gtknew('Label_Left', text => N("Do you want to upgrade to the '\%s' distribution?",
$new_distro->{name} || $new_distro->{version}), @common),
gtknew('CheckButton', text => N("Do not ask me next time"), active_ref => \$warn_me),
- (is_download_all_enabled() ?
- (gtknew('CheckButton', text => N("Download all packages at once") . "\n" .
- N("(Warning: You will need quite a lot of free space)"),
- active_ref => \$download_all, sensitive_ref => \$browse,
- toggled => sub { $box and $box->set_sensitive($download_all) },
- ),
- $box = gtknew('HBox', sensitive => $download_all,
- children => [
- 0, gtknew('Label_Left', text => N("Where to download packages:")),
- 1 , $browse,
- ]),
- ) : ()),
+ gtknew('CheckButton', text => N("Download all packages at once") . "\n" .
+ N("(Warning: You will need quite a lot of free space)"),
+ active_ref => \$download_all, sensitive_ref => \$browse,
+ toggled => sub { $box and $box->set_sensitive($download_all) },
+ ),
+ $box = gtknew('HBox', sensitive => $download_all, children => [
+ 0, gtknew('Label_Left', text => N("Where to download packages:")),
+ 1, $browse,
+ ]),
create_okcancel($w, N("Next"), N("Cancel")),
]);