network-manager-applet r602 - in trunk: . src src/gconf-helpers src/utils

[dcbw svn gnome org]

Author: dcbw
Date: Tue Mar 18 16:12:19 2008
New Revision: 602
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=602&view=rev

Log:
2008-03-18  Dan Williams  <dcbw redhat com>

	* configure.ac
		- Convert check for iwlib into just check for wireless.h

	* src/wireless-helper.h
		- Stuff that's needed to include wireless.h

	* src/ap-menu-item.c
	  src/applet-device-wireless.c
	  src/applet.c
	  src/gconf-helpers/gconf-upgrade.c
	  src/utils/utils.c
		- Add missing includes, don't include iwlib.h



Added:
   trunk/src/wireless-helper.h
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/ap-menu-item.c
   trunk/src/applet-device-wireless.c
   trunk/src/applet.c
   trunk/src/gconf-helpers/gconf-upgrade.c
   trunk/src/utils/utils.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 18 16:12:19 2008
@@ -109,8 +109,15 @@
 fi
 AC_SUBST(DBUS_CFLAGS)
 
-AC_MSG_CHECKING([for wireless-tools >= 28pre9])
-AC_TRY_COMPILE([#include <iwlib.h>],
+AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
+AC_TRY_COMPILE([#ifndef __user
+                #define __user
+                #endif
+                #include <sys/types.h>
+                #include <linux/types.h>
+                #include <sys/socket.h>
+                #include <net/if.h>
+                #include <wireless.h>],
                [#ifndef IWEVGENIE
                 #error "not found"
                 #endif],
@@ -120,8 +127,6 @@
 if test "$ac_have_iwevgenie" = no; then
 	AC_MSG_ERROR(wireless-tools >= 28pre9 not installed or not functional)
 fi
-IWLIB=-liw
-AC_SUBST(IWLIB)
 
 AC_ARG_WITH(nss, AC_HELP_STRING([--with-nss], [Use NSS library for certificate and key operations]), ac_nss=$withval, ac_nss=auto)
 if test x"$ac_nss" != xno; then

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Mar 18 16:12:19 2008
@@ -24,6 +24,7 @@
 
 nm_applet_SOURCES =			\
 	main.c				\
+	wireless-helper.h \
 	applet.c				\
 	applet.h				\
 	applet-marshal-main.c	\

Modified: trunk/src/ap-menu-item.c
==============================================================================
--- trunk/src/ap-menu-item.c	(original)
+++ trunk/src/ap-menu-item.c	Tue Mar 18 16:12:19 2008
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <glib/gi18n.h>
 #include <string.h>
-#include <iwlib.h>
+#include "wireless-helper.h"
 
 #include <nm-utils.h>
 #include "ap-menu-item.h"

Modified: trunk/src/applet-device-wireless.c
==============================================================================
--- trunk/src/applet-device-wireless.c	(original)
+++ trunk/src/applet-device-wireless.c	Tue Mar 18 16:12:19 2008
@@ -26,7 +26,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netinet/ether.h>
-#include <iwlib.h>
+#include "wireless-helper.h"
+#include <ctype.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtkwidget.h>

Modified: trunk/src/applet.c
==============================================================================
--- trunk/src/applet.c	(original)
+++ trunk/src/applet.c	Tue Mar 18 16:12:19 2008
@@ -35,9 +35,8 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <iwlib.h>
-#include <wireless.h>
-
+#include "wireless-helper.h"
+#include <unistd.h>
 #include <sys/socket.h>
 
 #include <NetworkManagerVPN.h>

Modified: trunk/src/gconf-helpers/gconf-upgrade.c
==============================================================================
--- trunk/src/gconf-helpers/gconf-upgrade.c	(original)
+++ trunk/src/gconf-helpers/gconf-upgrade.c	Tue Mar 18 16:12:19 2008
@@ -25,8 +25,8 @@
 #endif
 
 #include <string.h>
-#include <iwlib.h>
-#include <wireless.h>
+#include "wireless-helper.h"
+#include <stdlib.h>
 
 #include <gnome-keyring.h>
 #include <nm-setting-connection.h>
@@ -545,7 +545,7 @@
 	else if (!strcmp (service_name, "org.freedesktop.NetworkManager.openvpn"))
 		s_vpn_props = nm_gconf_0_6_openvpn_settings (vpn_data);
 	else {
-		printf ("unmatched service name %s\n", service_name);
+		g_warning ("unmatched service name %s\n", service_name);
 		s_vpn_props = NULL;
 	}
 

Modified: trunk/src/utils/utils.c
==============================================================================
--- trunk/src/utils/utils.c	(original)
+++ trunk/src/utils/utils.c	Tue Mar 18 16:12:19 2008
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <netinet/ether.h>
 #include <glib.h>
-#include <iwlib.h>
+#include "wireless-helper.h"
 
 #include <nm-device-802-3-ethernet.h>
 #include <nm-device-802-11-wireless.h>

Added: trunk/src/wireless-helper.h
==============================================================================
--- (empty file)
+++ trunk/src/wireless-helper.h	Tue Mar 18 16:12:19 2008
@@ -0,0 +1,11 @@
+/* Hacks necessary to #include wireless.h; yay for WEXT */
+
+#ifndef __user
+#define __user
+#endif
+#include <sys/types.h>
+#include <linux/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <wireless.h>
+