|
 |
c4f8abc |
From 3deb396641e2e28a6637d3f57af27aebfd7882a8 Mon Sep 17 00:00:00 2001
|
|
|
c4f8abc |
From: Dan Williams <dcbw@redhat.com>
|
|
|
c4f8abc |
Date: Mon, 7 Mar 2011 22:41:28 -0600
|
|
|
c4f8abc |
Subject: [PATCH] Update for NetworkManager 0.9
|
|
|
c4f8abc |
|
|
|
c4f8abc |
Fix up the defines a bit for additional NM 0.9 states.
|
|
|
c4f8abc |
---
|
|
|
c4f8abc |
src/ka-dialog.c | 13 +++++++++++++
|
|
|
c4f8abc |
1 files changed, 13 insertions(+), 0 deletions(-)
|
|
|
c4f8abc |
|
|
|
c4f8abc |
diff --git a/src/ka-dialog.c b/src/ka-dialog.c
|
|
|
c4f8abc |
index 5b11621..a681a88 100644
|
|
|
c4f8abc |
--- a/src/ka-dialog.c
|
|
|
c4f8abc |
+++ b/src/ka-dialog.c
|
|
|
c4f8abc |
@@ -44,6 +44,10 @@
|
|
|
c4f8abc |
|
|
|
c4f8abc |
#ifdef ENABLE_NETWORK_MANAGER
|
|
|
c4f8abc |
#include <nm-client.h>
|
|
|
c4f8abc |
+
|
|
|
c4f8abc |
+#if !defined(NM_CHECK_VERSION)
|
|
|
c4f8abc |
+#define NM_CHECK_VERSION(x,y,z) 0
|
|
|
c4f8abc |
+#endif
|
|
|
c4f8abc |
#endif
|
|
|
c4f8abc |
|
|
|
c4f8abc |
#ifdef HAVE_HX509_ERR_H
|
|
|
c4f8abc |
@@ -471,11 +475,20 @@ ka_nm_client_state_changed_cb (NMClient * client,
|
|
|
c4f8abc |
KA_DEBUG ("Network state: %d", state);
|
|
|
c4f8abc |
/* do nothing */
|
|
|
c4f8abc |
break;
|
|
|
c4f8abc |
+#if NM_CHECK_VERSION(0,8,992)
|
|
|
c4f8abc |
+ case NM_STATE_DISCONNECTING:
|
|
|
c4f8abc |
+#endif
|
|
|
c4f8abc |
case NM_STATE_DISCONNECTED:
|
|
|
c4f8abc |
KA_DEBUG ("Network disconnected");
|
|
|
c4f8abc |
*online = FALSE;
|
|
|
c4f8abc |
break;
|
|
|
c4f8abc |
+#if NM_CHECK_VERSION(0,8,992)
|
|
|
c4f8abc |
+ case NM_STATE_CONNECTED_LOCAL:
|
|
|
c4f8abc |
+ case NM_STATE_CONNECTED_SITE:
|
|
|
c4f8abc |
+ case NM_STATE_CONNECTED_GLOBAL:
|
|
|
c4f8abc |
+#else
|
|
|
c4f8abc |
case NM_STATE_CONNECTED:
|
|
|
c4f8abc |
+#endif
|
|
|
c4f8abc |
KA_DEBUG ("Network connected");
|
|
|
c4f8abc |
*online = TRUE;
|
|
|
c4f8abc |
break;
|
|
|
c4f8abc |
--
|
|
|
c4f8abc |
1.7.4.1
|
|
|
c4f8abc |
|