summaryrefslogtreecommitdiffstats
path: root/lib/network
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-14 12:40:56 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-14 12:40:56 +0000
commit90a1ea8f11a3e6273a44be471752143944fe1e76 (patch)
treee1d10c0291d6958f19aeaab8bce39a2a25bbe8b1 /lib/network
parentd0493e671689854dfdc016356f09d81962bd5044 (diff)
downloaddrakx-net-90a1ea8f11a3e6273a44be471752143944fe1e76.tar
drakx-net-90a1ea8f11a3e6273a44be471752143944fe1e76.tar.gz
drakx-net-90a1ea8f11a3e6273a44be471752143944fe1e76.tar.bz2
drakx-net-90a1ea8f11a3e6273a44be471752143944fe1e76.tar.xz
drakx-net-90a1ea8f11a3e6273a44be471752143944fe1e76.zip
do not run exit in sub-modules directly
Diffstat (limited to 'lib/network')
-rw-r--r--lib/network/drakconnect/delete.pm3
-rw-r--r--lib/network/drakconnect/edit.pm1
-rw-r--r--lib/network/drakconnect/global.pm3
3 files changed, 2 insertions, 5 deletions
diff --git a/lib/network/drakconnect/delete.pm b/lib/network/drakconnect/delete.pm
index e8ac7ab..b8d0689 100644
--- a/lib/network/drakconnect/delete.pm
+++ b/lib/network/drakconnect/delete.pm
@@ -10,7 +10,7 @@ sub del_intf {
my ($intf2delete, $failure);
if (!keys %{$net->{ifcfg}}) {
$in->ask_warn(N("Error"), N("No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."));
- $in->exit(0);
+ return;
}
my @all_cards = network::connection::ethernet::get_eth_cards($modules_conf);
my %names = network::connection::ethernet::get_eth_cards_names(@all_cards);
@@ -63,7 +63,6 @@ sub del_intf {
},
});
$wiz->safe_process($in);
- $in->exit(0);
}
1;
diff --git a/lib/network/drakconnect/edit.pm b/lib/network/drakconnect/edit.pm
index 9c89bfd..5c62cfe 100644
--- a/lib/network/drakconnect/edit.pm
+++ b/lib/network/drakconnect/edit.pm
@@ -90,7 +90,6 @@ sub manage {
$window->{rwindow}->show_all;
$window->main;
- ugtk2->exit(0);
}
sub build_tree {
diff --git a/lib/network/drakconnect/global.pm b/lib/network/drakconnect/global.pm
index 84881b2..ad59c2a 100644
--- a/lib/network/drakconnect/global.pm
+++ b/lib/network/drakconnect/global.pm
@@ -34,7 +34,7 @@ sub configure_net {
N("Warning"),
N("You do not have any configured Internet connection.
Run the \"%s\" assistant from the Mandriva Linux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)")));
- $in->exit;
+ return;
}
unless ($::isEmbedded) {
$dialog->{rwindow}->set_position('center');
@@ -102,7 +102,6 @@ Run the \"%s\" assistant from the Mandriva Linux Control Center", N("Set up a ne
$update->();
Glib::Timeout->add(2000, $update);
$dialog->main;
- ugtk2->exit(0);
}
1;