This code was broken when it landed with commit
fcc441622ae2632b9b36f352621cfd3baf34dc85 ; it was then later
updated with 2318b3c5252403a52973eae70c32ff715c7994e7

But the assertion is just clearly wrong - if we're going to clear the
previously queued state transition anyways, let's stop warning about
it.
---
 src/devices/nm-device.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


>From b485ce2c58e7d474392e8987fb834762beecc3ed Mon Sep 17 00:00:00 2001
From: Colin Walters <[email protected]>
Date: Tue, 18 Jun 2013 16:44:18 -0400
Subject: [PATCH] nm-device: Remove bogus warning

This code was broken when it landed with commit
fcc441622ae2632b9b36f352621cfd3baf34dc85 ; it was then later
updated with 2318b3c5252403a52973eae70c32ff715c7994e7

But the assertion is just clearly wrong - if we're going to clear the
previously queued state transition anyways, let's stop warning about
it.
---
 src/devices/nm-device.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 0d741c6..dedc1e4 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -5587,7 +5587,6 @@ nm_device_queue_state (NMDevice *self,
 
 	/* We should only ever have one delayed state transition at a time */
 	if (priv->queued_state.id) {
-		g_warn_if_fail (priv->queued_state.id == 0);
 		nm_device_queued_state_clear (self);
 	}
 
-- 
1.7.1

_______________________________________________
networkmanager-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/networkmanager-list

Reply via email to