Blob Blame History Raw
From 3deb396641e2e28a6637d3f57af27aebfd7882a8 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Mon, 7 Mar 2011 22:41:28 -0600
Subject: [PATCH] Update for NetworkManager 0.9

Fix up the defines a bit for additional NM 0.9 states.
---
 src/ka-dialog.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/ka-dialog.c b/src/ka-dialog.c
index 5b11621..a681a88 100644
--- a/src/ka-dialog.c
+++ b/src/ka-dialog.c
@@ -44,6 +44,10 @@
 
 #ifdef ENABLE_NETWORK_MANAGER
 #include <nm-client.h>
+
+#if !defined(NM_CHECK_VERSION)
+#define NM_CHECK_VERSION(x,y,z) 0
+#endif
 #endif
 
 #ifdef HAVE_HX509_ERR_H
@@ -471,11 +475,20 @@ ka_nm_client_state_changed_cb (NMClient * client,
         KA_DEBUG ("Network state: %d", state);
         /* do nothing */
         break;
+#if NM_CHECK_VERSION(0,8,992)
+    case NM_STATE_DISCONNECTING:
+#endif
     case NM_STATE_DISCONNECTED:
         KA_DEBUG ("Network disconnected");
         *online = FALSE;
         break;
+#if NM_CHECK_VERSION(0,8,992)
+    case NM_STATE_CONNECTED_LOCAL:
+    case NM_STATE_CONNECTED_SITE:
+    case NM_STATE_CONNECTED_GLOBAL:
+#else
     case NM_STATE_CONNECTED:
+#endif
         KA_DEBUG ("Network connected");
         *online = TRUE;
         break;
-- 
1.7.4.1