fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 17:00:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device/trival: rename NMIwdManagerPrivate.nm_manager field to "manager"

Browse source 
Similar cases of such a field are named "manager". Also,
internal names shall not have an "nm" prefix, contrary
to names in a header file, which shall have such a prefix.
This commit is contained in:
Thomas Haller 2018-03-29 09:02:02 +02:00
parent 8de522fad0
commit 21b262f268
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/devices/wifi/nm-iwd-manager.c
View file

@ -39,7 +39,7 @@ typedef struct {
} KnownNetworkData;
typedef struct {
NMManager *nm_manager;
NMManager *manager;
GCancellable *cancellable;
gboolean running;
GDBusObjectManager *object_manager;
@ -138,7 +138,7 @@ psk_agent_dbus_method_cb (GDBusConnection *connection,
goto return_error;
}
device = nm_manager_get_device_by_ifindex (priv->nm_manager, ifindex);
device = nm_manager_get_device_by_ifindex (priv->manager, ifindex);
if (!NM_IS_DEVICE_IWD (device)) {
_LOGE ("IWD device named %s is not a Wifi device in IWD Agent request",
ifname);
@ -291,7 +291,7 @@ set_device_dbus_object (NMIwdManager *self, GDBusInterface *interface,
return;
}
device = nm_manager_get_device_by_ifindex (priv->nm_manager, ifindex);
device = nm_manager_get_device_by_ifindex (priv->manager, ifindex);
if (!NM_IS_DEVICE_IWD (device)) {
_LOGE ("IWD device named %s is not a Wifi device", ifname);
return;
@ -468,7 +468,7 @@ name_owner_changed (GObject *object, GParamSpec *pspec, gpointer user_data)
priv->running = false;
nm_manager_for_each_device (priv->nm_manager, device, tmp_lst) {
nm_manager_for_each_device (priv->manager, device, tmp_lst) {
if (NM_IS_DEVICE_IWD (device)) {
nm_device_iwd_set_dbus_object (NM_DEVICE_IWD (device),
NULL);
@ -637,8 +637,8 @@ nm_iwd_manager_init (NMIwdManager *self)
{
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
priv->nm_manager = g_object_ref (nm_manager_get ());
g_signal_connect (priv->nm_manager, NM_MANAGER_DEVICE_ADDED,
priv->manager = g_object_ref (nm_manager_get ());
g_signal_connect (priv->manager, NM_MANAGER_DEVICE_ADDED,
G_CALLBACK (device_added), self);
priv->cancellable = g_cancellable_new ();
@ -677,9 +677,9 @@ dispose (GObject *object)
g_slist_free_full (priv->known_networks, (GDestroyNotify) known_network_free);
priv->known_networks = NULL;
if (priv->nm_manager) {
g_signal_handlers_disconnect_by_data (priv->nm_manager, self);
g_clear_object (&priv->nm_manager);
if (priv->manager) {
g_signal_handlers_disconnect_by_data (priv->manager, self);
g_clear_object (&priv->manager);
}
G_OBJECT_CLASS (nm_iwd_manager_parent_class)->dispose (object);