From f023431aa7870145d134aa4e4cabf100aba3dccc Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 2 Jan 2015 19:32:58 +0100 Subject: [PATCH] libnm: make NMDhcp6Config inherit from NMDhcpConfig Otherwise it does not register the "options" property and an assertion fails when the user prints connection that has DHCPv6 options: $ LIBNM_GLIB_DEBUG=properties-changed nmcli c show yolo ... libnm-Message: Property 'options' unhandled. ... (process:13522): libnm-CRITICAL **: nm_dhcp_config_get_options: assertion 'NM_IS_DHCP_CONFIG (config)' failed (cherry picked from commit 4615d74de0d885266d0fca5ddfeeab3afe969cb2) --- libnm/nm-dhcp6-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnm/nm-dhcp6-config.c b/libnm/nm-dhcp6-config.c index 0bd924c402..3b2e81f84c 100644 --- a/libnm/nm-dhcp6-config.c +++ b/libnm/nm-dhcp6-config.c @@ -23,7 +23,7 @@ #include "nm-dhcp6-config.h" #include "nm-object-private.h" -G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, NM_TYPE_OBJECT) +G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, NM_TYPE_DHCP_CONFIG) static void nm_dhcp6_config_init (NMDhcp6Config *config)