settings: rename NMSettingsPluginInterface.init() to initialize()

The virtual function init() naturally leads to calling the wrapper
function nm_settings_plugin_init(). However, such ${TYPE}_init() functions
are generated by G_DEFINE_TYPE().

Rename to avoid the naming conflict, which will matter next, when the
interface will be converted to a regular GObject class.

Note that while these are settings plugin, there is no public
or stable API which we need to preserve.

4 files changed, 9 insertions, 9 deletions

diff --git a/src/settings/nm-settings-plugin.c b/src/settings/nm-settings-plugin.c
index f6dd2cfbf0..212311387b 100644
--- a/src/settings/nm-settings-plugin.c
+++ b/src/settings/nm-settings-plugin.c
@@ -65,12 +65,12 @@ nm_settings_plugin_default_init (NMSettingsPluginInterface *g_iface)
 }
 
 void
-nm_settings_plugin_init (NMSettingsPlugin *config)
+nm_settings_plugin_initialize (NMSettingsPlugin *config)
 {
 	g_return_if_fail (config != NULL);
 
-	if (NM_SETTINGS_PLUGIN_GET_INTERFACE (config)->init)
-		NM_SETTINGS_PLUGIN_GET_INTERFACE (config)->init (config);
+	if (NM_SETTINGS_PLUGIN_GET_INTERFACE (config)->initialize)
+		NM_SETTINGS_PLUGIN_GET_INTERFACE (config)->initialize (config);
 }
 
 GSList *
diff --git a/src/settings/nm-settings-plugin.h b/src/settings/nm-settings-plugin.h
index 6fba25e7ab..933615cf20 100644
--- a/src/settings/nm-settings-plugin.h
+++ b/src/settings/nm-settings-plugin.h
@@ -44,7 +44,7 @@ typedef struct {
 	GTypeInterface g_iface;
 
 	/* Called when the plugin is loaded to initialize it */
-	void     (*init) (NMSettingsPlugin *config);
+	void (*initialize) (NMSettingsPlugin *config);
 
 	/* Returns a GSList of NMSettingsConnection objects that represent
 	 * connections the plugin knows about.  The returned list is freed by the
@@ -113,7 +113,7 @@ typedef struct {
 
 GType nm_settings_plugin_get_type (void);
 
-void nm_settings_plugin_init (NMSettingsPlugin *config);
+void nm_settings_plugin_initialize (NMSettingsPlugin *config);
 
 GSList *nm_settings_plugin_get_connections (NMSettingsPlugin *config);
 
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 6ddc9a94ab..8c6d67e5ab 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -625,8 +625,8 @@ add_plugin (NMSettings *self, NMSettingsPlugin *plugin)
 	}
 
 	priv->plugins = g_slist_append (priv->plugins, g_object_ref (plugin));
-	nm_settings_plugin_init (plugin);
 
+	nm_settings_plugin_initialize (plugin);
 
 	path = g_object_get_qdata (G_OBJECT (plugin), plugin_module_path_quark ());
 
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index 0cad156457..2138db24e4 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
@@ -306,7 +306,7 @@ _udev_device_unref (gpointer ptr)
 }
 
 static void
-init (NMSettingsPlugin *config)
+initialize (NMSettingsPlugin *config)
 {
 	SettingsPluginIfupdown *self = SETTINGS_PLUGIN_IFUPDOWN (config);
 	SettingsPluginIfupdownPrivate *priv = SETTINGS_PLUGIN_IFUPDOWN_GET_PRIVATE (self);
@@ -497,8 +497,8 @@ settings_plugin_ifupdown_class_init (SettingsPluginIfupdownClass *req_class)
 static void
 settings_plugin_interface_init (NMSettingsPluginInterface *plugin_iface)
 {
-	plugin_iface->init = init;
-	plugin_iface->get_connections = get_connections;
+	plugin_iface->initialize          = initialize;
+	plugin_iface->get_connections     = get_connections;
 	plugin_iface->get_unmanaged_specs = get_unmanaged_specs;
 }