colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-08-28 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/NetworkManagerSystem.h
	  src/nm-device.c
	  src/nm-device.h
	  src/nm-hal-manager.c
	  src/NetworkManager.c
	  src/nm-device-802-11-wireless.c
	  src/nm-hal-manager.h
	  src/nm-device-802-3-ethernet.c
	  src/vpn-manager/nm-vpn-service.h
	  src/vpn-manager/nm-vpn-manager.c
	  src/vpn-manager/nm-vpn-manager.h
	  src/vpn-manager/nm-vpn-service.c
	  src/nm-device-802-11-wireless.h
	  src/NetworkManagerMain.h
	  src/nm-device-802-3-ethernet.h
	  src/backends/NetworkManagerGentoo.c
	  src/backends/NetworkManagerPaldo.c
	  src/backends/NetworkManagerFrugalware.c
	  src/backends/NetworkManagerRedHat.c
	  src/backends/NetworkManagerSlackware.c
	  src/backends/NetworkManagerGeneric.c
	  src/backends/NetworkManagerArch.c
	  src/backends/NetworkManagerSuSE.c
	  src/backends/NetworkManagerGeneric.h
	  src/backends/NetworkManagerDebian.c
		- Kill NMData



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2742 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-08-28 15:54:55 +00:00
parent 0f1310cda0
commit 55c2fef46e
26 changed files with 68 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nm-device.c
View File

@@ -68,7 +68,6 @@ struct _NMDevicePrivate
gboolean link_active;
guint32 ip4_address;
struct in6_addr ip6_address;
NMData * app_data;
NMActRequest * act_request;
guint act_source_id;
@@ -121,7 +120,6 @@ nm_device_init (NMDevice * self)
self->priv->link_active = FALSE;
self->priv->ip4_address = 0;
memset (&self->priv->ip6_address, 0, sizeof (struct in6_addr));
self->priv->app_data = NULL;
self->priv->act_source_id = 0;
@@ -171,7 +169,7 @@ constructor (GType type,
}
/* Grab IP config data for this device from the system configuration files */
priv->system_config_data = nm_system_device_get_system_config (dev, priv->app_data);
priv->system_config_data = nm_system_device_get_system_config (dev);
/* Allow distributions to flag devices as disabled */
if (nm_system_device_get_disabled (dev)) {
@@ -341,19 +339,6 @@ real_get_type_capabilities (NMDevice *self)
}
/*
* nm_device_get_app_data
*
*/
struct NMData *
nm_device_get_app_data (NMDevice *self)
{
g_return_val_if_fail (self != NULL, FALSE);
return self->priv->app_data;
}
/*
* nm_device_get_act_request
*
@@ -1481,9 +1466,6 @@ set_property (GObject *object, guint prop_id,
case NM_DEVICE_INTERFACE_PROP_DRIVER:
priv->driver = g_strdup (g_value_get_string (value));
break;
case NM_DEVICE_INTERFACE_PROP_APP_DATA:
priv->app_data = g_value_get_pointer (value);
break;
case NM_DEVICE_INTERFACE_PROP_CAPABILITIES:
priv->capabilities = g_value_get_uint (value);
break;
@@ -1515,9 +1497,6 @@ get_property (GObject *object, guint prop_id,
case NM_DEVICE_INTERFACE_PROP_DRIVER:
g_value_set_string (value, priv->driver);
break;
case NM_DEVICE_INTERFACE_PROP_APP_DATA:
g_value_set_pointer (value, priv->app_data);
break;
case NM_DEVICE_INTERFACE_PROP_CAPABILITIES:
g_value_set_uint (value, priv->capabilities);
break;
@@ -1598,10 +1577,6 @@ nm_device_class_init (NMDeviceClass *klass)
NM_DEVICE_INTERFACE_PROP_STATE,
NM_DEVICE_INTERFACE_STATE);
g_object_class_override_property (object_class,
NM_DEVICE_INTERFACE_PROP_APP_DATA,
NM_DEVICE_INTERFACE_APP_DATA);
g_object_class_override_property (object_class,
NM_DEVICE_INTERFACE_PROP_DEVICE_TYPE,
NM_DEVICE_INTERFACE_DEVICE_TYPE);