summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcarlosg <carlosg>2005-03-15 11:43:48 +0000
committercarlosg <carlosg>2005-03-15 11:43:48 +0000
commit11b2bd53d8789f5ca38fb325e42ec94f518dd305 (patch)
treeaf97bdc358d061b73d676ecbb0e60b815b6d5f24
parentd5095bece86f2acc030bfa28fb4d75399fd2aadc (diff)
2005-03-15 Carlos Garnacho Parro <carlosg@gnome.org>
* network.pl.in: leave only wireless-* and remove wireless_* (for handled wi-fi options, the rest will remain untouched)
-rw-r--r--ChangeLog5
-rw-r--r--network.pl.in7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f45e1ee..c9d7125 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-15 Carlos Garnacho Parro <carlosg@gnome.org>
+
+ * network.pl.in: leave only wireless-* and remove wireless_* (for
+ handled wi-fi options, the rest will remain untouched)
+
2005-03-07 Carlos Garnacho Parro <carlosg@gnome.org>
* Release 1.2.0
diff --git a/network.pl.in b/network.pl.in
index 8957b5d..01375c6 100644
--- a/network.pl.in
+++ b/network.pl.in
@@ -5997,8 +5997,11 @@ sub gst_network_get_interface_replace_table
[ "address", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "address" ],
[ "netmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
[ "gateway", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
- [ "essid", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless_essid" ],
- [ "key", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless_key" ],
+ [ "essid", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless-essid" ],
+ [ "key", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless-key" ],
+ # ugly hack for deleting undesired options (due to syntax duality)
+ [ "essid", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless_essid", "" ],
+ [ "key", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless_key", "" ],
[ "section", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "provider" ],
[ "remote_address", \&gst_network_debian_replace_remote_address, [INTERFACES, IFACE]],
# Modem stuff