[network-manager-applet/NETWORKMANAGER_APPLET_0_7] core: don't require wireless-tools' wireless.h

[Dan Williams <dcbw src gnome org>]

commit 6c42699db56850bade494bfc737e3fa97740b859
Author: Dan Williams <dcbw redhat com>
Date:   Fri Apr 23 10:12:52 2010 -0700

    core: don't require wireless-tools' wireless.h
    
    We only needed it for some defines that aren't going to change
    anyway, and then only for upgrades from NM 0.6.  So just suck
    the defines in and don't require people to install wireless-tools
    devel packages.

 src/Makefile.am                   |    1 -
 src/applet-device-wifi.c          |    1 -
 src/applet.c                      |    1 -
 src/gconf-helpers/gconf-upgrade.c |   17 ++++++++++++++++-
 src/wireless-helper.h             |   33 ---------------------------------
 5 files changed, 16 insertions(+), 37 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index d85c5f5..f54f256 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,6 @@ nm_applet_CPPFLAGS = \
 
 nm_applet_SOURCES =			\
 	main.c				\
-	wireless-helper.h \
 	applet.c				\
 	applet.h				\
 	applet-dbus-manager.c	\
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 36cad32..50d4f03 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -27,7 +27,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netinet/ether.h>
-#include "wireless-helper.h"
 #include <ctype.h>
 
 #include <glib/gi18n.h>
diff --git a/src/applet.c b/src/applet.c
index 19c4390..1c2958e 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -36,7 +36,6 @@
 #include <strings.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include "wireless-helper.h"
 #include <unistd.h>
 #include <sys/socket.h>
 
diff --git a/src/gconf-helpers/gconf-upgrade.c b/src/gconf-helpers/gconf-upgrade.c
index 9c87fbd..233aaa2 100644
--- a/src/gconf-helpers/gconf-upgrade.c
+++ b/src/gconf-helpers/gconf-upgrade.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <string.h>
-#include "wireless-helper.h"
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <errno.h>
@@ -45,6 +44,22 @@
 
 #include "nm-connection.h"
 
+/* Old wireless.h defs */
+
+/* IW_AUTH_80211_AUTH_ALG values (bit field) */
+#define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001
+#define IW_AUTH_ALG_SHARED_KEY  0x00000002
+
+/* IW_AUTH_WPA_VERSION values (bit field) */
+#define IW_AUTH_WPA_VERSION_WPA  0x00000002
+#define IW_AUTH_WPA_VERSION_WPA2 0x00000004
+
+/* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */
+#define IW_AUTH_CIPHER_WEP40  0x00000002
+#define IW_AUTH_CIPHER_TKIP   0x00000004
+#define IW_AUTH_CIPHER_CCMP   0x00000008
+#define IW_AUTH_CIPHER_WEP104 0x00000010
+
 /* NM 0.6 compat defines */
 
 #define NM_AUTH_TYPE_WPA_PSK_AUTO 0x00000000