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

2007-02-16 Tambet Ingo <tambet@ximian.com>

Browse Source 
* introspection/nm-ip4-config.xml: Implement.

	* libnm-glib/libnm-glib-test.c: Use new DBUS API in tests.

	* libnm-glib/nm-ip4-config.c:
	* libnm-glib/nm-ip4-config.c: Implement.

	* src/nm-ap-security[-*]: Remove circular dependencies between APs and AP
	securities. APs reference security.

	* src/nm-device-802-11-wireless.c: Implement missing properties that need to
	be exported over DBUS.

	* src/nm-device-802-3-ethernet.c: Ditto.

	* src/NetworkManagerAP.c:
	* src/NetworkManagerAP.h:
		- Convert to GObject, export over DBUS.

	* src/nm-ip4-config.h:
	* src/nm-ip4-config.h:
		- Convert to GObject, export over DBUS.




git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2322 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2007-02-16 11:23:49 +00:00
committed by Tambet Ingo
parent 333f468271
commit c40051389c
60 changed files with 1607 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/nm-device.c
View File

@@ -1396,16 +1396,17 @@ nm_device_get_ip4_config (NMDevice *self)
void
nm_device_set_ip4_config (NMDevice *self, NMIP4Config *config)
{
NMIP4Config *old_config;
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
g_return_if_fail (self != NULL);
g_return_if_fail (NM_IS_DEVICE (self));
if (priv->ip4_config) {
g_object_unref (priv->ip4_config);
priv->ip4_config = NULL;
}
old_config = self->priv->ip4_config;
if (config)
nm_ip4_config_ref (config);
self->priv->ip4_config = config;
if (old_config)
nm_ip4_config_unref (old_config);
priv->ip4_config = g_object_ref (config);
}
@@ -1611,11 +1612,7 @@ nm_device_dispose (GObject *object)
*/
nm_system_device_free_system_config (self, self->priv->system_config_data);
if (self->priv->ip4_config)
{
nm_ip4_config_unref (self->priv->ip4_config);
self->priv->ip4_config = NULL;
}
nm_device_set_ip4_config (self, NULL);
if (self->priv->act_request)
{
@@ -1703,6 +1700,9 @@ get_property (GObject *object, guint prop_id,
case NM_DEVICE_INTERFACE_PROP_IP4_ADDRESS:
g_value_set_uint (value, priv->ip4_address);
break;
case NM_DEVICE_INTERFACE_PROP_IP4_CONFIG:
g_value_set_object (value, priv->ip4_config);
break;
case NM_DEVICE_INTERFACE_PROP_STATE:
g_value_set_uint (value, priv->state);
break;
@@ -1763,6 +1763,10 @@ nm_device_class_init (NMDeviceClass *klass)
NM_DEVICE_INTERFACE_PROP_IP4_ADDRESS,
NM_DEVICE_INTERFACE_IP4_ADDRESS);
g_object_class_override_property (object_class,
NM_DEVICE_INTERFACE_PROP_IP4_CONFIG,
NM_DEVICE_INTERFACE_IP4_CONFIG);
g_object_class_override_property (object_class,
NM_DEVICE_INTERFACE_PROP_STATE,
NM_DEVICE_INTERFACE_STATE);