summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakfloppy5
-rwxr-xr-xperl-install/standalone/net_monitor7
2 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index 082edf842..53381a12e 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -23,16 +23,15 @@
use strict;
+use diagnostics;
use lib qw(/usr/lib/libDrakX);
use standalone; #- warning, standalone must be loaded very first, for 'explanations'
-use interactive;
use common;
-use ugtk qw(:helpers);
use my_gtk qw(:helpers);
-my $in = interactive->vnew('su', 'default');
+require_root_capability();
my $expert_mode = 0;
# we have put here the list in order to do $list->clear() when we have to do
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index 6dff839f8..cc10ce093 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -23,7 +23,6 @@ use lib qw(/usr/lib/libDrakX);
use strict;
use standalone; #- warning, standalone must be loaded very first, for 'explanations'
-use interactive;
use my_gtk qw(:helpers :wrappers);
use common;
use network::netconnect;
@@ -44,8 +43,8 @@ if ($force) {
}
$quiet and exit(0);
init Gtk;
-my $in = 'interactive'->vnew('su', 'default');
+require_root_capability();
my $window1 = my_gtk->new('net_monitor');
$window1->{rwindow}->signal_connect(delete_event => sub { my_gtk->exit(0) });
@@ -82,7 +81,7 @@ MDK::Common::Globals::init(
disconnect_file => "/etc/sysconfig/network-scripts/net_cnx_down",
connect_prog => "/etc/sysconfig/network-scripts/net_cnx_pg");
-gtkadd($window1->{rwindow},
+gtkadd($window1->{window},
gtkpack_(new Gtk::VBox(0,5),
0, N("Network Monitoring"),
1, gtkpack_(new Gtk::HBox(0,5),
@@ -155,7 +154,7 @@ update();
rescan();
while ($isconnected == -2 || $isconnected == -1) {
- Gtk->main_iteration while Gtk->events_pending;
+ ugtk::gtkflush()
}
Gtk->timeout_remove($time_tag2);