summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-20 17:22:42 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-20 17:22:42 +0000
commitac99ffbf76fc96ad1ea505095a284cce6f59cf18 (patch)
treee0221a626ce38b60be4134e003f4e9f74b2227c1
parent9ba3e494d5bbcea7f68907563bb374fa1d934305 (diff)
downloadmgaonline-ac99ffbf76fc96ad1ea505095a284cce6f59cf18.tar
mgaonline-ac99ffbf76fc96ad1ea505095a284cce6f59cf18.tar.gz
mgaonline-ac99ffbf76fc96ad1ea505095a284cce6f59cf18.tar.bz2
mgaonline-ac99ffbf76fc96ad1ea505095a284cce6f59cf18.tar.xz
mgaonline-ac99ffbf76fc96ad1ea505095a284cce6f59cf18.zip
(setState) do not display "install updates" button when notifying about
network being down (regression introduced in r54199 on 2006-09-18: "(setState) fix closing about dialog when "close" button is clicked (#25867)")
-rw-r--r--NEWS5
-rwxr-xr-xmdkapplet2
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 358a225c..1a1ce24a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+- do not display "install updates" button when notify about network
+ being done
+ (regression introduced in 2.35: "offer to install updates in
+ notifications")
+
Version 2.37 - 19 March 2008, Olivier Blin
- simplify network detection
diff --git a/mdkapplet b/mdkapplet
index db27cd01..37d93673 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -453,7 +453,7 @@ sub setState {
if ($state{$state_type}{tt}[0] && $icon->isa('Gtk2::StatusIcon') && !$state{$state_type}{do_not_use_bubble}) {
my $bubble = Gtk2::Notify->new_with_status_icon(N("Warning"), formatAlaTeX(translate($state{$state_type}{tt}[0])) . "\n",
'/usr/share/icons/mdkonline.png', $icon);
- $bubble->add_action('clicked', N("Install updates"), \&installUpdates);
+ $bubble->add_action('clicked', N("Install updates"), \&installUpdates) if $state_type eq 'updates';
$bubble->set_timeout(5000);
eval { $bubble->show };
}