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

2008-03-12 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-device.c
		- (nm_device_set_ip4_config): don't send property notifications when
			the ip4 config is set to NULL; it causes a PropertyChanged signal
			which dbus-glib can't parse because the value is NULL, which isn't
			a legal object path.  Setting the IP4 config to NULL is only
			valid when deactivating a device anyway, so the device state change
			will alert listeners that the ip4 config is invalid.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3431 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-03-12 17:08:59 +00:00
parent a5a8aa0801
commit 7896d4552d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2008-03-12 Dan Williams <dcbw@redhat.com>
* src/nm-device.c
- (nm_device_set_ip4_config): don't send property notifications when
the ip4 config is set to NULL; it causes a PropertyChanged signal
which dbus-glib can't parse because the value is NULL, which isn't
a legal object path. Setting the IP4 config to NULL is only
valid when deactivating a device anyway, so the device state change
will alert listeners that the ip4 config is invalid.
2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-12 Dan Williams <dcbw@redhat.com>
* src/nm-properties-changed-signal.c * src/nm-properties-changed-signal.c

5
src/nm-device.c
View File

@@ -1385,11 +1385,8 @@ nm_device_set_ip4_config (NMDevice *self, NMIP4Config *config)
priv->ip4_config = NULL; priv->ip4_config = NULL;
} }
if (!config) { if (!config)
if (nm_device_get_state (self) == NM_DEVICE_STATE_ACTIVATED)
g_object_notify (G_OBJECT (self), NM_DEVICE_INTERFACE_IP4_CONFIG);
return TRUE; return TRUE;
}
priv->ip4_config = g_object_ref (config); priv->ip4_config = g_object_ref (config);