Merge commit 'danw-ipv6/ipv6'

Conflicts: src/nm-manager.c
2009-08-04 14:18:05 -04:00
parent a77655df06 fc8e609784
commit e9c4a16ea3
28 changed files with 2250 additions and 507 deletions
--- a/src/nm-device-interface.c
+++ b/src/nm-device-interface.c
@@ -124,6 +124,14 @@ nm_device_interface_init (gpointer g_iface)
 							  DBUS_TYPE_G_OBJECT_PATH,
 							  G_PARAM_READWRITE));

+	g_object_interface_install_property
+		(g_iface,
+		 g_param_spec_boxed (NM_DEVICE_INTERFACE_IP6_CONFIG,
+							  "IP6 Config",
+							  "IP6 Config",
+							  DBUS_TYPE_G_OBJECT_PATH,
+							  G_PARAM_READWRITE));
+
 	g_object_interface_install_property
 		(g_iface,
 		 g_param_spec_uint (NM_DEVICE_INTERFACE_STATE,