From ba2478cb78de0d5a3ddce1b7eb11b236c16f4b26 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 22 Oct 2008 16:35:05 +0000
Subject: (confirm_upgrade,really_confirm_upgrade) use wizard button order
 (hackish)

---
 NEWS      |  1 +
 mdkapplet | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/NEWS b/NEWS
index e7c51d75..5e2dafd9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 - mdkapplet
   o make sure confirm dialog is large enough on 2008.1
+  o use wizard button order in confirm dialog
 
 Version 2.65 - 22 October 2008
 
diff --git a/mdkapplet b/mdkapplet
index 37229501..8558c0fc 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -355,6 +355,12 @@ sub confirm_upgrade() {
     my $w = ugtk2->new(N("New version of Mandriva Linux distribution"), width => $width + 20);
     my $warn_me = text2bool($local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE});
     my $link;
+
+    {
+        # use wizard button order (for both 2008.1 & 2009.0):
+        local $::isWizard = 1;
+        local $w->{pop_it} = 0;
+        local $::isInstall = 1;
     gtkadd($w->{window},
            gtknew('VBox', children_tight => [
                get_banner(),
@@ -368,6 +374,8 @@ sub confirm_upgrade() {
                create_okcancel($w, N("Next"), N("Cancel")),
            ]),
        );
+    }
+    
     $link->set_uri_hook(sub {
                             my (undef, $url) = @_;
                             run_program::raw({ detach => 1, setuid => get_parent_uid() }, 'www-browser', $url);
@@ -391,6 +399,11 @@ sub really_confirm_upgrade() {
     }
     $c = formatXiB($c);
 
+    {
+        # use wizard button order (for both 2008.1 & 2009.0):
+        local $::isWizard = 1;
+        local $w->{pop_it} = 0;
+        local $::isInstall = 1;
     gtkadd($w->{window},
            gtknew('VBox', children_tight => [
                get_banner(),
@@ -406,6 +419,7 @@ sub really_confirm_upgrade() {
                create_okcancel($w, N("Next"), N("Cancel")),
            ]),
        );
+    }
     $w->{ok}->grab_focus;
     return $w->main;
 }
-- 
cgit v1.2.1