summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-02-03 17:22:58 +0000
committerThierry Vignaud <tv@mandriva.org>2010-02-03 17:22:58 +0000
commita9c93cc1343900848289b2dc0f2c9765e1802db0 (patch)
treebce9278336884e411b4f15a3baf7d44dcfe914a1
parentae254996ca6a1057933535abf0e7b8c2307710bd (diff)
downloadmgaonline-a9c93cc1343900848289b2dc0f2c9765e1802db0.tar
mgaonline-a9c93cc1343900848289b2dc0f2c9765e1802db0.tar.gz
mgaonline-a9c93cc1343900848289b2dc0f2c9765e1802db0.tar.bz2
mgaonline-a9c93cc1343900848289b2dc0f2c9765e1802db0.tar.xz
mgaonline-a9c93cc1343900848289b2dc0f2c9765e1802db0.zip
_more_supported) prevent displaying twice the same dialog
and add a FIXME note
-rw-r--r--NEWS3
-rwxr-xr-xmdkapplet6
2 files changed, 8 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1e7e064a..445c4d06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- mdkapplet
+ o prevent displaying twice the same 'no longuer supported' dialog
+
Version 2.77.15.12 - 3 February 2010, Thierry Vignaud
- mdkapplet
diff --git a/mdkapplet b/mdkapplet
index 55358591..5cc28022 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -409,6 +409,7 @@ sub harvester {
return @pids;
}
+# FIXME: we can run many drakconnect when network is down:
sub configNetwork() {
log::explanations(N_("Launching drakconnect\n"));
fork_exec("/usr/sbin/drakconnect");
@@ -569,8 +570,10 @@ sub no_more_supported_choice() {
}
+my $no_more_supported_wip;
sub no_more_supported() {
- return if $mdv_update_pid;
+ return if $mdv_update_pid || $no_more_supported_wip;
+ $no_more_supported_wip = 1;
my $choice = no_more_supported_choice();
if ($choice eq 'upgrade') {
really_confirm_upgrade() and real_upgrade();
@@ -579,6 +582,7 @@ sub no_more_supported() {
} elsif ($choice eq 'nothing') {
$icon->set_visible(0);
}
+ undef $no_more_supported_wip;
}