From c6dc7a7ea7a8f4629f1ac8385e3d35ec39ce5633 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 1 Nov 2021 11:24:14 +0100 Subject: [PATCH] Revert "core: make Device emit StateChanged a bit later" Thomas thinks this is a bad idea and probably is right: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1000#note_1122853 This reverts commit c75b7dd8935cd713a65df366176909de2aa2f05f. --- src/core/devices/nm-device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 7251d73c18..fc11e458ed 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -16705,15 +16705,6 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason, _notify(self, PROP_STATE); _notify(self, PROP_STATE_REASON); - g_signal_emit(self, - signals[STATE_CHANGED], - 0, - (guint) state, - (guint) old_state, - (guint) reason); - - /* Only tell the clients of the change once we dealt with the state - * change internally. That is, policy finished the DNS update and such. */ nm_dbus_object_emit_signal(NM_DBUS_OBJECT(self), &interface_info_device, &signal_info_state_changed, @@ -16721,6 +16712,12 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason, (guint32) state, (guint32) old_state, (guint32) reason); + g_signal_emit(self, + signals[STATE_CHANGED], + 0, + (guint) state, + (guint) old_state, + (guint) reason); /* Post-process the event after internal notification */