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

core/rfkill: cleanup arguments for "rfkill-changed" signal

Browse source 
The signal parameters are G_TYPE_UINT. We should not assume that our
enums are a compatible integer type.

In practice of course they always were. Let's just be clear about when
we have an integer and when we have an enum.
This commit is contained in:
Thomas Haller 2022-02-02 12:04:27 +01:00
parent aa15ec6090
commit 26e9deb831
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/nm-manager.c
View file

@ -3802,11 +3802,13 @@ platform_query_devices(NMManager *self)
}
static void
rfkill_manager_rfkill_changed_cb(NMRfkillManager *rfkill_mgr,
NMRfkillType rtype,
NMRfkillState udev_state,
gpointer user_data)
rfkill_manager_rfkill_changed_cb(NMRfkillManager *rfkill_mgr,
/* NMRfkillType */ guint rtype,
/* NMRfkillState */ guint udev_state,
gpointer user_data)
{
nm_assert(rtype < NM_RFKILL_TYPE_MAX);
_rfkill_update(NM_MANAGER(user_data), rtype);
}

10
src/core/nm-rfkill-manager.c
View file

@ -242,7 +242,11 @@ recheck_killswitches(NMRfkillManager *self)
nm_rfkill_state_to_string(poll_states[i]));
priv->rfkill_states[i] = poll_states[i];
g_signal_emit(self, signals[RFKILL_CHANGED], 0, i, priv->rfkill_states[i]);
g_signal_emit(self,
signals[RFKILL_CHANGED],
0,
(guint) i,
(guint) priv->rfkill_states[i]);
}
}
}
@ -435,6 +439,6 @@ nm_rfkill_manager_class_init(NMRfkillManagerClass *klass)
NULL,
G_TYPE_NONE,
2,
G_TYPE_UINT,
G_TYPE_UINT);
G_TYPE_UINT /* NMRfkillType */,
G_TYPE_UINT /* NMRfkillState */);
}