diff options
| author | Dan Winship <danw@gnome.org> | 2014-11-07 10:55:58 -0500 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-11-07 11:09:35 -0500 |
| commit | 99d0fe3006c1435a7f11011392a106b50e45a4bb (patch) | |
| tree | 8f7e4db8c30e0fadb1b51ace19fa3a7df0c0a9b4 /include | |
| parent | 2cfd1647d3723baa42ea48f50f0c8a97c3d96d2f (diff) | |
| download | NetworkManager-99d0fe3006c1435a7f11011392a106b50e45a4bb.tar.gz | |
core: fix new NMIP4Config and NMIP6Config properties
The AddressData and RouteData marshalling code were still using the
types from an earlier version of the branch. Fix that.
Diffstat (limited to 'include')
| -rw-r--r-- | include/nm-dbus-glib-types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/nm-dbus-glib-types.h b/include/nm-dbus-glib-types.h index 1b41c9ff18..ad11ab6812 100644 --- a/include/nm-dbus-glib-types.h +++ b/include/nm-dbus-glib-types.h @@ -37,9 +37,9 @@ #define DBUS_TYPE_G_IP6_ROUTE (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, G_TYPE_INVALID)) #define DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ROUTE)) -#define DBUS_TYPE_NM_IP_ADDRESS (dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, DBUS_TYPE_G_MAP_OF_STRING, G_TYPE_INVALID)) +#define DBUS_TYPE_NM_IP_ADDRESS DBUS_TYPE_G_MAP_OF_VARIANT #define DBUS_TYPE_NM_IP_ADDRESSES (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_NM_IP_ADDRESS)) -#define DBUS_TYPE_NM_IP_ROUTE (dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, DBUS_TYPE_G_MAP_OF_STRING, G_TYPE_INVALID)) +#define DBUS_TYPE_NM_IP_ROUTE DBUS_TYPE_G_MAP_OF_VARIANT #define DBUS_TYPE_NM_IP_ROUTES (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_NM_IP_ROUTE)) #endif /* __NM_DBUS_GLIB_TYPES_H__ */ |