From bf30d21136fd7105b96125016ce623476fc6a478 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 10 Oct 2008 10:06:00 +0000
Subject: - mdkapplet   o do not wrongly propose distribution upgrade after
 installing updates   o do not display "Congratulations" dialog when done
 installing updates, only     do it for distribution upgrade

precision: displaying $new_distro->{version} was vivifying $new_distro, hence
messing the "if $new_distro" test
---
 NEWS      | 5 +++++
 mdkapplet | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 1ecc75cd..f2ca2b76 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+- mdkapplet
+  o do not wrongly propose distribution upgrade after installing updates
+  o do not display "Congratulations" dialog when done installing updates, only
+    do it for distribution upgrade
+
 Version 2.53 - 9 October 2008
 
 - mdkapplet
diff --git a/mdkapplet b/mdkapplet
index 23a73843..f042030c 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -336,8 +336,8 @@ sub harvester {
                                 N("Installation failed"),
                                 N("Installation logs can be found in '%s'", $log_file)
                             );
-            } else {
-                congratulations();
+            } elsif ($state_global eq 'new_distribution') {
+                upgrade_distro_congratulations();
             }
         } elsif ($checker_pid && $checker_pid == $childpid) {
             undef $checker_pid;
@@ -371,7 +371,7 @@ sub restart_applet() {
     exec($0, '--auto-update');
 }
 
-sub congratulations() {
+sub upgrade_distro_congratulations() {
     local $mygtk2::left_padding = 0;
     my $width = 500;
     my $w = ugtk2->new(N("Congratulations"));
-- 
cgit v1.2.1