summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/draknet
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-09-12 10:57:01 +0000
committerdamien <damien@mandriva.com>2001-09-12 10:57:01 +0000
commit679dfd84cc5213c8387e5a2952832fb8fa787a2b (patch)
tree01a7cf0a05db841dd8ff2b2eed886a95370732a6 /perl-install/standalone/draknet
parentb97e16a8cdd62795cd14636a7a721723487131f0 (diff)
downloaddrakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.tar
drakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.tar.gz
drakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.tar.bz2
drakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.tar.xz
drakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.zip
corrected wizard mode in newt mode
Diffstat (limited to 'perl-install/standalone/draknet')
-rwxr-xr-xperl-install/standalone/draknet6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index bfc70118a..1ddca557b 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -38,9 +38,6 @@ my $xpm_path="/usr/share/libDrakX/pixmaps";
$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
$::isWizard = "@ARGV" =~ /--wizard/;
$::expert = "@ARGV" =~ /--expert/;
-$::isEmbedded or $::isWizard=1;
-$::Wizard_pix_up = "wiz_draknet.png";
-$::Wizard_title = "Network & Internet Configuration";
local $_ = join '', @ARGV;
#/-h/ and die "usage: draknet[--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
@@ -53,6 +50,9 @@ my @conx_type = ('modem', 'isdn_internal', 'isdn_external', 'adsl', 'cable', 'la
#$::wizard_xpm = "/usr/share/pixmaps/internet.xpm";
my $in = 'interactive'->vnew('su', 'network');
+!$::isEmbedded && $in->isa('interactive_gtk') and $::isWizard=1;
+$::Wizard_pix_up = "wiz_draknet.png";
+$::Wizard_title = "Network & Internet Configuration";
MDK::Common::Globals::init(
in => $in,
hl kwa">if ($@) { print STDERR "($method) exception: $@\n"; $o->{bus}{connection}->dispatch; return; } @ret; } sub set_gtk3_watch { my ($o) = @_; set_gtk3_watch_helper($o->{bus}); } sub set_gtk3_watch_helper { my ($bus) = @_; $bus->{connection}->set_watch_callbacks(sub { my ($con, $watch) = @_; my $flags = $watch->get_flags; require Net::DBus::Binding::Watch; require Gtk3::Helper; if ($flags & &Net::DBus::Binding::Watch::READABLE) { Gtk3::Helper->add_watch($watch->get_fileno, 'in', sub { $watch->handle(&Net::DBus::Binding::Watch::READABLE); $con->dispatch; 1; }); } #- do nothing for WRITABLE watch, we dispatch when needed }, undef, undef); #- do nothing when watch is disabled or toggled yet $bus->{connection}->dispatch; } 1;