[empathy] Handle new NM 0.9 states (#644412)
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Handle new NM 0.9 states (#644412)
- Date: Tue, 22 Mar 2011 09:05:03 +0000 (UTC)
commit 1b68d34282947697e1c173456bdb35700dc0f19e
Author: Dan Williams <dcbw redhat com>
Date: Tue Mar 22 10:04:24 2011 +0100
Handle new NM 0.9 states (#644412)
libempathy/empathy-connectivity.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index 42d5fcc..ebd72b0 100644
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -87,6 +87,11 @@ connectivity_change_state (EmpathyConnectivity *connectivity,
}
#ifdef HAVE_NM
+
+#if !defined(NM_CHECK_VERSION)
+#define NM_CHECK_VERSION(x,y,z) 0
+#endif
+
static void
connectivity_nm_state_change_cb (NMClient *client,
const GParamSpec *pspec,
@@ -103,6 +108,9 @@ connectivity_nm_state_change_cb (NMClient *client,
state = nm_client_get_state (priv->nm_client);
new_nm_connected = !(state == NM_STATE_CONNECTING
+#if NM_CHECK_VERSION(0,8,992)
+ || state == NM_STATE_DISCONNECTING
+#endif
|| state == NM_STATE_DISCONNECTED);
DEBUG ("New NetworkManager network state %d (connected: %s)", state,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]