summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-03 16:55:15 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-03 16:55:15 +0000
commit151c651b65783b06e68578a5b0528748aa8eac05 (patch)
treec86ca724a8bc96d3ec2d788dcfb4f610417a0942
parent0fa3caf2178f02633e4727a786840a5873ac7005 (diff)
downloadmgaonline-151c651b65783b06e68578a5b0528748aa8eac05.tar
mgaonline-151c651b65783b06e68578a5b0528748aa8eac05.tar.gz
mgaonline-151c651b65783b06e68578a5b0528748aa8eac05.tar.bz2
mgaonline-151c651b65783b06e68578a5b0528748aa8eac05.tar.xz
mgaonline-151c651b65783b06e68578a5b0528748aa8eac05.zip
if there're updates, install regular updates instead of performing
distro upgrade on left click
-rw-r--r--NEWS2
-rwxr-xr-xmdkapplet6
2 files changed, 7 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 678ca087..6d7a016e 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@
o ask for confirmation before performing distro upgrade
o compute regular updates even if there's a new distro
o enable to not check again for new distro
+ o if there're updates, install regular updates instead of performing
+ distro upgrade on left click
o use blue icon when there's a new distro
Version 2.48 - 2 October 2008
diff --git a/mdkapplet b/mdkapplet
index f8ee74ee..b6f5e1c7 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -220,7 +220,11 @@ $icon->signal_connect(activate => sub {
updates => \&installUpdates,
new_distribution => \&upgrade,
);
- $actions{$state_global}->() if ref $actions{$state_global};
+ my $action = $state_global;
+ if ($action eq 'new_distribution' && $sub_state eq 'updates') {
+ $action = 'updates';
+ }
+ $actions{$action}->() if ref $actions{$action};
});
foreach my $opt (@ARGV) {
if ($opt eq '--force' || $opt eq '-f') { setAutoStart('TRUE') }