diff options
| author | Dan Winship <danw@gnome.org> | 2014-08-25 15:25:27 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-09-04 09:21:05 -0400 |
| commit | 98959d5432abfbc1ff77f9b3952ead019cba936b (patch) | |
| tree | 319ed1dc4b7a04017dd3fe2288ade310c1ad3fc4 /libnm/NetworkManager.h | |
| parent | 356fb7d77eef522767312a9a9fd8e2d2a2f77fd4 (diff) | |
| download | NetworkManager-98959d5432abfbc1ff77f9b3952ead019cba936b.tar.gz | |
libnm: fix NMIP4Config/NMIP6Config addresses/routes properties
The docs for NMIP4Config:addresses and NMIP4Config:routes claimed that
they were GPtrArrays of NMIP4Address/NMIP4Route, but get_property()
was actually trying to set them the D-Bus representation type, and it
was failing anyway because it used g_value_set_boxed() on a parameter
that was declared GParamSpecPointer. Fix it to use a GPtrArray-valued
property, and set it to the right thing.
NMIP6Config did the right thing with its :addresses and :routes
properties, but was using custom types (NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY and
NM_TYPE_IP6_ROUTE_OBJECT_ARRAY). Make it use G_TYPE_PTR_ARRAY instead.
nm-types.c, nm-types.h, and nm-types-private.h are now empty, and so
can be dropped.
Diffstat (limited to 'libnm/NetworkManager.h')
| -rw-r--r-- | libnm/NetworkManager.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h index f473fea1cb..d7414101ce 100644 --- a/libnm/NetworkManager.h +++ b/libnm/NetworkManager.h @@ -80,7 +80,6 @@ #include <nm-setting-wireless.h> #include <nm-setting.h> #include <nm-simple-connection.h> -#include <nm-types.h> #include <nm-utils.h> #include <nm-version.h> #include <nm-vpn-connection.h> |