summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-10-19 17:30:10 -0400
committerDan Winship <danw@gnome.org>2014-11-07 07:49:40 -0500
commit3f30c6f1c2f9ce76b24fada0e75fd3cf733ca4bc (patch)
treef413fc1880cdeee48d5891d06b3d474142448ee3 /examples
parent39709fdc2ecaf42e431410f9ad425a9fb5c57812 (diff)
downloadNetworkManager-3f30c6f1c2f9ce76b24fada0e75fd3cf733ca4bc.tar.gz
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes
Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
Diffstat (limited to 'examples')
-rw-r--r--examples/C/glib/add-connection-gdbus.c2
-rw-r--r--examples/C/glib/add-connection-libnm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/C/glib/add-connection-gdbus.c b/examples/C/glib/add-connection-gdbus.c
index a7874fc51f..7a4d593945 100644
--- a/examples/C/glib/add-connection-gdbus.c
+++ b/examples/C/glib/add-connection-gdbus.c
@@ -86,7 +86,7 @@ add_connection (GDBusProxy *proxy, const char *con_name)
/* Build up the 'ipv4' Setting */
g_variant_builder_init (&setting_builder, G_VARIANT_TYPE ("a{sv}"));
g_variant_builder_add (&setting_builder, "{sv}",
- NM_SETTING_IP4_CONFIG_METHOD,
+ NM_SETTING_IP_CONFIG_METHOD,
g_variant_new_string (NM_SETTING_IP4_CONFIG_METHOD_AUTO));
g_variant_builder_add (&connection_builder, "{sa{sv}}",
NM_SETTING_IP4_CONFIG_SETTING_NAME,
diff --git a/examples/C/glib/add-connection-libnm.c b/examples/C/glib/add-connection-libnm.c
index 1288e79c51..f206340e0c 100644
--- a/examples/C/glib/add-connection-libnm.c
+++ b/examples/C/glib/add-connection-libnm.c
@@ -86,7 +86,7 @@ add_connection (NMClient *client, GMainLoop *loop, const char *con_name)
/* Build up the 'ipv4' Setting */
s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
g_object_set (G_OBJECT (s_ip4),
- NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+ NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
NULL);
nm_connection_add_setting (connection, NM_SETTING (s_ip4));