colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Thomas Haller
2018-08-24 14:11:58 +02:00
parent 122bb485ee
commit 194e7f8df6
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings/nm-settings-plugin.c
View File

@@ -65,12 +65,12 @@ nm_settings_plugin_default_init (NMSettingsPluginInterface *g_iface)
} }
void void
nm_settings_plugin_init (NMSettingsPlugin *config) nm_settings_plugin_initialize (NMSettingsPlugin *config)
{ {
g_return_if_fail (config != NULL); g_return_if_fail (config != NULL);
if (NM_SETTINGS_PLUGIN_GET_INTERFACE (config)->init) if (NM_SETTINGS_PLUGIN_GET_INTERFACE (config)->initialize)
NM_SETTINGS_PLUGIN_GET_INTERFACE (config)->init (config); NM_SETTINGS_PLUGIN_GET_INTERFACE (config)->initialize (config);
} }
GSList * GSList *

4
src/settings/nm-settings-plugin.h
View File

@@ -44,7 +44,7 @@ typedef struct {
GTypeInterface g_iface; GTypeInterface g_iface;
/* Called when the plugin is loaded to initialize it */ /* 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 /* Returns a GSList of NMSettingsConnection objects that represent
* connections the plugin knows about. The returned list is freed by the * 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); 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); GSList *nm_settings_plugin_get_connections (NMSettingsPlugin *config);

2
src/settings/nm-settings.c
View File

@@ -625,8 +625,8 @@ add_plugin (NMSettings *self, NMSettingsPlugin *plugin)
} }
priv->plugins = g_slist_append (priv->plugins, g_object_ref (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 ()); path = g_object_get_qdata (G_OBJECT (plugin), plugin_module_path_quark ());

4
src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
View File

@@ -306,7 +306,7 @@ _udev_device_unref (gpointer ptr)
} }
static void static void
init (NMSettingsPlugin *config) initialize (NMSettingsPlugin *config)
{ {
SettingsPluginIfupdown *self = SETTINGS_PLUGIN_IFUPDOWN (config); SettingsPluginIfupdown *self = SETTINGS_PLUGIN_IFUPDOWN (config);
SettingsPluginIfupdownPrivate *priv = SETTINGS_PLUGIN_IFUPDOWN_GET_PRIVATE (self); SettingsPluginIfupdownPrivate *priv = SETTINGS_PLUGIN_IFUPDOWN_GET_PRIVATE (self);
@@ -497,7 +497,7 @@ settings_plugin_ifupdown_class_init (SettingsPluginIfupdownClass *req_class)
static void static void
settings_plugin_interface_init (NMSettingsPluginInterface *plugin_iface) settings_plugin_interface_init (NMSettingsPluginInterface *plugin_iface)
{ {
plugin_iface->init = init; plugin_iface->initialize = initialize;
plugin_iface->get_connections = get_connections; plugin_iface->get_connections = get_connections;
plugin_iface->get_unmanaged_specs = get_unmanaged_specs; plugin_iface->get_unmanaged_specs = get_unmanaged_specs;
} }