From 523eb41c0cfa724ec2737cecbd0ec2d3ed337718 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Fri, 2 Aug 2002 14:21:04 +0000
Subject: allow user to cancel on medium changes

---
 rpmdrake.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'rpmdrake.pm')

diff --git a/rpmdrake.pm b/rpmdrake.pm
index 1bf4d172..189e5ebf 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -61,14 +61,16 @@ sub writeconf {
 }
 
 sub interactive_msg {
-    my ($title, $contents, $yesno) = @_;
+    my ($title, $contents, $options) = @_;
     my $d = my_gtk->new($title);
     gtkadd($d->{window},
 	   gtkpack_(new Gtk::VBox(0,5),
 		    1, new Gtk::Label($contents),
 		    0, gtkpack(create_hbox(),
-			       $yesno ? (gtksignal_connect(new Gtk::Button(_("Yes")), clicked => sub { $d->{retval} = 1; Gtk->main_quit }),
-					 gtksignal_connect(new Gtk::Button(_("No")), clicked => sub { $d->{retval} = 0; Gtk->main_quit }))
+			       $options->{yesno} ? (gtksignal_connect(new Gtk::Button($options->{text}{yes} || _("Yes")),
+								      clicked => sub { $d->{retval} = 1; Gtk->main_quit }),
+						    gtksignal_connect(new Gtk::Button($options->{test}{no} || _("No")), clicked =>
+								      sub { $d->{retval} = 0; Gtk->main_quit }))
 			       : gtksignal_connect(new Gtk::Button(_("Ok")), clicked => sub { Gtk->main_quit })
 			      )));
     $d->main;
@@ -215,7 +217,7 @@ sub choose_mirror {
 _("I need to contact MandrakeSoft website to get the mirrors list.
 Please check that your network is currently running.
 
-Is it ok to continue?"), 1) or return '';
+Is it ok to continue?"), { yesno => 1 }) or return '';
     my $wait = wait_msg(_("Please wait, downloading mirrors addresses from MandrakeSoft website."));
     my @mirrors;
     eval { @mirrors = mirrors('/var/cache/urpmi', 'updates') };
-- 
cgit v1.2.1