diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-08-06 22:23:48 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-08-06 22:23:48 +0000 |
| commit | 2c31b5499b8fc0e8512349892c52a5522874b000 (patch) | |
| tree | e3fe4003fc933e7c138e149ffb5a690a89fb7f54 /libnm-util/nm-setting-vpn.c | |
| parent | 2f3820c6241cb8c400dc9a50aab5f08de1167480 (diff) | |
| download | NetworkManager-2c31b5499b8fc0e8512349892c52a5522874b000.tar.gz | |
2008-08-06 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-ip4-config.c
libnm-glib/nm-ip4-config.h
- Add 'routes' property
* libnm-util/nm-setting-vpn.c
libnm-util/nm-setting-vpn.h
- Remove 'routes' property
* libnm-util/nm-setting-ip4-config.c
libnm-util/nm-setting-ip4-config.h
- 'ignore-dhcp-dns' renamed to 'ignore-auto-dns'
- Add 'ignore-auto-routes' property
- 'routes' exposed over D-Bus is now an array of array of uint (4) to
accomodate route metrics
- 'routes' exposed in C is now a list of NMSettingIP4Route structures
* libnm-util/nm-utils.c
libnm-util/nm-utils.h
- Add helpers for marshalling IP4 routes
* src/NetworkManagerUtils.c
- (nm_utils_merge_ip4_config): handle property renames and new route
structure
* src/NetworkManagerSystem.c
- (nm_system_device_set_ip4_route, nm_system_device_set_from_ip4_config,
nm_system_vpn_device_set_from_ip4_config): respect route metrics
* src/dhcp-manager/nm-dhcp-manager.c
- (nm_dhcp_manager_get_ip4_config): handle new route structure
* system-settings/plugins/ifcfg-fedora/reader.c
system-settings/plugins/ifcfg-fedora/writer.c
- Handle routes separately from addresses now that routes have a different
format
* introspection/nm-ip4-config.xml
src/nm-ip4-config.c
src/nm-ip4-config.h
- Rename internal routing functions
- 'static-routes' renamed to 'routes'
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3898 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'libnm-util/nm-setting-vpn.c')
| -rw-r--r-- | libnm-util/nm-setting-vpn.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index 4c4b54d4da..9a8258b847 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -70,7 +70,6 @@ enum { PROP_0, PROP_SERVICE_TYPE, PROP_USER_NAME, - PROP_ROUTES, LAST_PROP }; @@ -127,7 +126,6 @@ finalize (GObject *object) g_free (self->service_type); g_free (self->user_name); - nm_utils_slist_free (self->routes, g_free); G_OBJECT_CLASS (nm_setting_vpn_parent_class)->finalize (object); } @@ -147,10 +145,6 @@ set_property (GObject *object, guint prop_id, g_free (setting->user_name); setting->user_name = g_value_dup_string (value); break; - case PROP_ROUTES: - nm_utils_slist_free (setting->routes, g_free); - setting->routes = g_value_dup_boxed (value); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -170,9 +164,6 @@ get_property (GObject *object, guint prop_id, case PROP_USER_NAME: g_value_set_string (value, setting->user_name); break; - case PROP_ROUTES: - g_value_set_boxed (value, setting->routes); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -207,12 +198,4 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) "User name", NULL, G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); - - g_object_class_install_property - (object_class, PROP_ROUTES, - nm_param_spec_specialized (NM_SETTING_VPN_ROUTES, - "Routes", - "Routes", - DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); } |