From d4f5c40abe8fb167c17cf31e78fc9b752a59c815 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 21 Jan 2013 17:09:39 -0600 Subject: [PATCH] core: emit NMDeviceWired carrier change after logging it Less confusing in the logs to see the change logged before listeners have a chance to emit other log messages that may depend on the new carrier state. --- src/nm-device-wired.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nm-device-wired.c b/src/nm-device-wired.c index 8d2fb11680..e441c43bb4 100644 --- a/src/nm-device-wired.c +++ b/src/nm-device-wired.c @@ -185,7 +185,6 @@ set_carrier (NMDeviceWired *self, g_return_if_fail (caps & NM_DEVICE_CAP_CARRIER_DETECT); priv->carrier = carrier; - g_object_notify (G_OBJECT (self), "carrier"); state = nm_device_get_state (NM_DEVICE (self)); if (state >= NM_DEVICE_STATE_UNAVAILABLE) { @@ -197,6 +196,8 @@ set_carrier (NMDeviceWired *self, defer_action ? ", deferring action for 4 seconds" : ""); } + g_object_notify (G_OBJECT (self), "carrier"); + if (defer_action) priv->carrier_action_defer_id = g_timeout_add_seconds (4, carrier_action_defer_cb, self); else