summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcarlosg <carlosg>2004-11-23 17:51:01 +0000
committercarlosg <carlosg>2004-11-23 17:51:01 +0000
commitade536108fc586c8768496fd92b8b61c8d331c0b (patch)
tree434fd97c8c06975b30d41c1ac091c168e00eecc7
parent5c8bcad52b047bb8a77d4a67c8e0f4b2c2b24c90 (diff)
2004-11-23 Carlos Garnacho Parro <carlosg@gnome.org>
* network.pl.in: add the PPP interface EVEN if it's not configured
-rw-r--r--ChangeLog4
-rw-r--r--network.pl.in18
2 files changed, 11 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 25b4d34..f327544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-11-23 Carlos Garnacho Parro <carlosg@gnome.org>
+ * network.pl.in: add the PPP interface EVEN if it's not configured
+
+2004-11-23 Carlos Garnacho Parro <carlosg@gnome.org>
+
* network.pl.in (gst_network_interfaces_get): began to handle PPP
devices
diff --git a/network.pl.in b/network.pl.in
index d276cb6..785f1f4 100644
--- a/network.pl.in
+++ b/network.pl.in
@@ -1412,10 +1412,10 @@ sub gst_network_interfaces_get
$$iface{"file"} = $i if ($$iface{"file"} eq undef);
$dev = $$iface{"dev"};
+ delete $$iface{"dev"};
if (exists $$hash{$dev})
{
- delete $$iface{"dev"};
$$hash{$dev}{"configuration"} = $iface;
}
elsif (($dev eq "ppp0") || ($dev eq "tun0"))
@@ -1424,17 +1424,13 @@ sub gst_network_interfaces_get
}
}
- if ($modem_settings)
- {
- # save the modem interface even if it's not enabled
- $dev = $$modem_settings{"dev"};
- delete $$modem_settings{"dev"};
+ $dev = "ppp0" if ($$tool{"system"} eq "Linux");
+ $dev = "tun0" if ($$tool{"system"} eq "FreeBSD");
- $$hash{$dev}{"dev"} = $dev;
- $$hash{$dev}{"enabled"} = 0;
- $$hash{$dev}{"type"} = &gst_network_get_interface_type ($dev);
- $$hash{$dev}{"configuration"} = $modem_settings;
- }
+ $$hash{$dev}{"dev"} = $dev;
+ $$hash{$dev}{"enabled"} = 0;
+ $$hash{$dev}{"type"} = &gst_network_get_interface_type ($dev);
+ $$hash{$dev}{"configuration"} = $modem_settings if ($modem_settings);
return \%$hash;
}