diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2011-02-15 17:34:11 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2011-02-15 17:34:11 +0100 |
| commit | d6905a8d66eb09cec6136b25b208e69fb9fe4f54 (patch) | |
| tree | 3ba62ae3bb282946b671d2bafdab36149eb0e17d /libnm-glib/nm-dhcp6-config.c | |
| parent | ec115ed4421fb9101bf923eb76cbeb3d2ebf5021 (diff) | |
| download | NetworkManager-d6905a8d66eb09cec6136b25b208e69fb9fe4f54.tar.gz | |
libnm-glib: add GError parameter to _nm_object_get_... functions
It allows us to get the error back and have control over printing
the error.
Diffstat (limited to 'libnm-glib/nm-dhcp6-config.c')
| -rw-r--r-- | libnm-glib/nm-dhcp6-config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c index dbcf4c682e..8b85595c05 100644 --- a/libnm-glib/nm-dhcp6-config.c +++ b/libnm-glib/nm-dhcp6-config.c @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 - 2010 Red Hat, Inc. + * Copyright (C) 2008 - 2011 Red Hat, Inc. * Copyright (C) 2008 Novell, Inc. */ @@ -218,7 +218,8 @@ nm_dhcp6_config_get_options (NMDHCP6Config *config) if (!_nm_object_get_property (NM_OBJECT (config), NM_DBUS_INTERFACE_DHCP6_CONFIG, "Options", - &value)) + &value, + NULL)) goto out; demarshal_dhcp6_options (NM_OBJECT (config), NULL, &value, &priv->options); |