summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-26 15:36:17 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-26 15:36:17 +0000
commitda4f7b1205b0a2a2f8c0ef3b734f7f2f36f53fe5 (patch)
tree21d3a5141da26288381441767e732dfcb89a013e /perl-install
parent3b42da4c91a21dae2d299d1e4b77af42bd892ed4 (diff)
downloaddrakx-da4f7b1205b0a2a2f8c0ef3b734f7f2f36f53fe5.tar
drakx-da4f7b1205b0a2a2f8c0ef3b734f7f2f36f53fe5.tar.gz
drakx-da4f7b1205b0a2a2f8c0ef3b734f7f2f36f53fe5.tar.bz2
drakx-da4f7b1205b0a2a2f8c0ef3b734f7f2f36f53fe5.tar.xz
drakx-da4f7b1205b0a2a2f8c0ef3b734f7f2f36f53fe5.zip
only write conf & install packages on exit (Ok press) if something
really has been altered so that we do not write the config twice if the user already pressed the "apply" button
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/drakconnect18
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index ba7c8b205..66f471dba 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -193,9 +193,7 @@ $window1->{window}->add(
sensitive_buttons(0);
local ($::isWizard, $::Wizard_finished) = (1, 1);
eval { # For wizcancel
- use Data::Dumper; print Dumper([ $intf, $netc ]);
configureNetworkNet($in, $netc, $intf, @all_cards);
- use Data::Dumper; print Dumper([ $intf, $netc ]);
network::sethostname($intf);
$button_apply->set_sensitive(1);
update();
@@ -255,13 +253,15 @@ $window1->{window}->add(
clicked => \&apply),
gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&quit_global),
gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub {
- my $dialog = _create_dialog(N("Please wait"));
- gtkpack($dialog->vbox,
- Gtk2::Label->new(N("Please Wait... Applying the configuration")));
- $dialog->show_all;
- gtkflush();
- apply();
- $dialog->destroy;
+ if ($button_apply->get('sensitive')) {
+ my $dialog = _create_dialog(N("Please wait"));
+ gtkpack($dialog->vbox,
+ Gtk2::Label->new(N("Please Wait... Applying the configuration")));
+ $dialog->show_all;
+ gtkflush();
+ apply();
+ $dialog->destroy;
+ }
update();
quit_global();
}),